Update to 20021109.

overall:
- Allow a regular expression or glob pattern against origins as
  pkgname glob pattern.  For example, the following commands work as
  expected now:
	pkg_glob 'lang/*'
	portupgrade lang/ruby
	pkg_info ':(japanese|chinese|korean)/'

- Use install(1) instead of cp(1) and chmod(1) to install modified
  data files such as +CONTENTS.

pkgdb(1):
- Add a new option --autofix, which is a shorthand of --auto --fix
  (-aF).

portupgrade(1):
- Allow specifying a directory after -L.

- Auto-fix dependencies before creating a package.

  PR:		ports/41383
  Submitted by:	Vivek Khera <khera@kciLink.com>

pkgtools.conf(5):
- Add a new configuration variable ALT_PKGDEP, which defines
  alternative dependencies, used by pkgdb -F/-aF.  This makes yet
  another step forward to eliminate the need for manual pkgdb -F's.

4 files changed, 8 insertions, 12 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index aececc5..599d511 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20021106
-PORTREVISION=	1
+PORTVERSION=	20021109
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +19,8 @@ DISTVERSION=	20021101
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20021103.diff.bz2 \
-		pkgtools-20021103-${PORTVERSION}.diff.bz2
+		pkgtools-20021103-20021106.diff.bz2 \
+		pkgtools-20021106-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -66,9 +66,6 @@ PKG_CREATE_OK!=	/usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE}
 IGNORE=	pkg_create does not support -b.  Please update /usr/sbin/pkg_* to those of the latest RELENG_4
 .endif
 
-post-patch:
-	${RUBY} -i -pe "gsub(/('\/bin\/)cp(', '-f', tmpfile, file)/, '\1mv\2')" ${WRKSRC}/lib/pkgtools.rb
-
 post-install:
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 504ae41..a68b90e 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,4 @@
 MD5 (pkgtools-20021101.tar.bz2) = 56d5eb15e5cf03233e91c518af7c4bb8
 MD5 (pkgtools-20021101-20021103.diff.bz2) = 223d19090ae98ff54838a7472f766bed
 MD5 (pkgtools-20021103-20021106.diff.bz2) = d9e878d0bade89a59d20c891de5bb8d9
+MD5 (pkgtools-20021106-20021109.diff.bz2) = f983a3efd722f88df91bce036aa40f9d
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index aececc5..599d511 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20021106
-PORTREVISION=	1
+PORTVERSION=	20021109
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +19,8 @@ DISTVERSION=	20021101
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20021103.diff.bz2 \
-		pkgtools-20021103-${PORTVERSION}.diff.bz2
+		pkgtools-20021103-20021106.diff.bz2 \
+		pkgtools-20021106-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -66,9 +66,6 @@ PKG_CREATE_OK!=	/usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE}
 IGNORE=	pkg_create does not support -b.  Please update /usr/sbin/pkg_* to those of the latest RELENG_4
 .endif
 
-post-patch:
-	${RUBY} -i -pe "gsub(/('\/bin\/)cp(', '-f', tmpfile, file)/, '\1mv\2')" ${WRKSRC}/lib/pkgtools.rb
-
 post-install:
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 504ae41..a68b90e 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,3 +1,4 @@
 MD5 (pkgtools-20021101.tar.bz2) = 56d5eb15e5cf03233e91c518af7c4bb8
 MD5 (pkgtools-20021101-20021103.diff.bz2) = 223d19090ae98ff54838a7472f766bed
 MD5 (pkgtools-20021103-20021106.diff.bz2) = d9e878d0bade89a59d20c891de5bb8d9
+MD5 (pkgtools-20021106-20021109.diff.bz2) = f983a3efd722f88df91bce036aa40f9d