Update to 20040208. (Just repacked to roll up recent patches)

10 files changed, 10 insertions, 276 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 3a0202e5fa62..ce32de805ee8 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20040113
-PORTREVISION=	3
+PORTVERSION=	20040208
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	20030427
+DISTVERSION=	20040208
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-20030723.diff.bz2 \
-		pkgtools-20030723-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index b562808d4f68..3dcf0a9ea6fc 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (pkgtools-20030427.tar.bz2) = 8692b4965c5bf9ed1d7303b368e7b0c5
-MD5 (pkgtools-20030427-20030723.diff.bz2) = 94e9510c16744c04824d0843ae4b2488
-MD5 (pkgtools-20030723-20040113.diff.bz2) = 844f1c1a5473dbc433728841d5172e77
+MD5 (pkgtools-20040208.tar.bz2) = 7d8ba8b4b23049cb4c2a23b8403932e2
+SIZE (pkgtools-20040208.tar.bz2) = 98338
diff --git a/sysutils/portupgrade-devel/files/patch-make_index b/sysutils/portupgrade-devel/files/patch-make_index
deleted file mode 100644
index bc0bfb1215ce..000000000000
--- a/sysutils/portupgrade-devel/files/patch-make_index
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: bin/Makefile
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/Makefile,v
-retrieving revision 1.6
-diff -u -u -0 -r1.6 Makefile
---- bin/Makefile	26 Jan 2002 23:57:34 -0000	1.6
-+++ bin/Makefile	7 Feb 2004 08:49:02 -0000
-@@ -7,3 +7 @@
--SCRIPTS=	${BUILDDIR}/make_describe_pass1 \
--		${BUILDDIR}/make_describe_pass2 \
--		${BUILDDIR}/pkg_fetch \
-+SCRIPTS=	${BUILDDIR}/pkg_fetch \
-Index: bin/portupgrade
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/portupgrade,v
-retrieving revision 1.220
-diff -u -u -0 -r1.220 portupgrade
---- bin/portupgrade	23 Jul 2003 12:23:03 -0000	1.220
-+++ bin/portupgrade	22 Aug 2003 07:41:57 -0000
-@@ -174,0 +175 @@
-+  $new_force = false
-@@ -327,2 +328,7 @@
--		    "packages (default: #{MYNAME == 'portinstall' ? 'on' : 'off'})") {
--      |$new|
-+		    "packages; Specified twice, always install a new" << NEXTLINE <<
-+		    "one instead of upgrading (default: #{MYNAME == 'portinstall' ? 'on' : 'off'})") {
-+      if $new
-+	$new_force = true
-+      else
-+	$new = true
-+      end
-Index: lib/pkgdb.rb
-===================================================================
-RCS file: /home/cvs/pkgtools/lib/pkgdb.rb,v
-retrieving revision 1.112
-diff -u -u -0 -r1.112 pkgdb.rb
---- lib/pkgdb.rb	23 Jul 2003 12:23:05 -0000	1.112
-+++ lib/pkgdb.rb	7 Feb 2004 08:52:43 -0000
-@@ -45,2 +44,0 @@
--    :make_describe_pass1	=> "#{PREFIX}/sbin/make_describe_pass1",
--    :make_describe_pass2	=> "#{PREFIX}/sbin/make_describe_pass2",
-Index: lib/portsdb.rb
-===================================================================
-RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
-retrieving revision 1.78
-diff -u -u -0 -r1.78 portsdb.rb
---- lib/portsdb.rb	23 Jul 2003 12:23:05 -0000	1.78
-+++ lib/portsdb.rb	7 Feb 2004 08:52:26 -0000
-@@ -340,18 +340 @@
--    if true
--      system %`
--	#{PkgDB::command(:make_describe_pass1)} |
--	#{PkgDB::command(:make_describe_pass2)} |
--	(cd #{abs_ports_dir} && perl Tools/make_index) |
--	sed -e 's./.\001.g' |
--	sort -t '|' +1 -2 |
--	sed -e 's.\001./.g' > #{tmp}
--      `
--    else
--      system %`
--	cd #{abs_ports_dir} && (make describe ECHO_MSG='echo > /dev/null' 2> /dev/null |
--	perl Tools/make_index) |
--	sed -e 's./.\001.g' |
--	sort -t '|' +1 -2 |
--	sed -e 's.\001./.g' > #{tmp}
--      `
--    end
-+    system "cd #{abs_ports_dir} && make INDEXFILE=INDEX.tmp index && mv INDEX.tmp #{tmp}"
diff --git a/sysutils/portupgrade-devel/files/patch-pkgtools.rb b/sysutils/portupgrade-devel/files/patch-pkgtools.rb
deleted file mode 100644
index 3d7e68a52709..000000000000
--- a/sysutils/portupgrade-devel/files/patch-pkgtools.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: lib/pkgtools.rb
-===================================================================
-RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
-retrieving revision 1.116
-diff -u -r1.116 pkgtools.rb
---- lib/pkgtools.rb	19 Oct 2003 11:56:34 -0000	1.116
-+++ lib/pkgtools.rb	16 Jan 2004 12:11:11 -0000
-@@ -478,14 +478,20 @@
- alias system! sudo
- alias xsystem! xsudo
- 
--# script, xscript
--def __script(x, file, *args)
--  if file
--    __system(x, '/usr/bin/script', '-qa', file, *args)
-+def logged_command(file, args)
-+  if !file  
-+    args
-+  elsif STDIN.tty?
-+    ['/usr/bin/script', '-qa', file, *args]
-   else
--    __system(x, *args)
-+    ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))]
-   end
- end
-+
-+# script, xscript
-+def __script(x, file, *args)
-+  __system(x, *logged_command(file, args))
-+end
- def script(file, *args)
-   __script(false, file, *args)
- end
-@@ -495,11 +501,7 @@
- 
- # script!, xscript!
- def __script!(x, file, *args)
--  if file
--    __sudo(x, '/usr/bin/script', '-qa', file, *args)
--  else
--    __sudo(x, *args)
--  end
-+  __sudo(x, *logged_command(file, args))
- end
- def script!(file, *args)
-   __script!(false, file, *args)
diff --git a/sysutils/portupgrade-devel/files/patch-portupgrade b/sysutils/portupgrade-devel/files/patch-portupgrade
deleted file mode 100644
index f395fbc68868..000000000000
--- a/sysutils/portupgrade-devel/files/patch-portupgrade
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: bin/portupgrade
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/portupgrade,v
-retrieving revision 1.220
-diff -u -0 -r1.220 portupgrade
---- bin/portupgrade	23 Jul 2003 12:23:03 -0000	1.220
-+++ bin/portupgrade	8 Feb 2004 08:15:48 -0000
-@@ -1063 +1063 @@
--  teardown_proc2 = uninstall_pkg(oldpkgname, $uninstall_extra_flags)
-+  teardown_proc2 = uninstall_pkg(oldpkgname, logfile, $uninstall_extra_flags)
-@@ -1567 +1567 @@
--def uninstall_pkg(pkgname, extra_flags = '')
-+def uninstall_pkg(pkgname, logfile = nil, extra_flags = '')
-@@ -1624 +1624 @@
--	  script!(logfile, '/bin/sh', '-c', command)
-+	  script!(logfile, '/bin/sh', '-c', command) 
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 3a0202e5fa62..ce32de805ee8 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20040113
-PORTREVISION=	3
+PORTVERSION=	20040208
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	20030427
+DISTVERSION=	20040208
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-20030723.diff.bz2 \
-		pkgtools-20030723-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index b562808d4f68..3dcf0a9ea6fc 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,3 +1,2 @@
-MD5 (pkgtools-20030427.tar.bz2) = 8692b4965c5bf9ed1d7303b368e7b0c5
-MD5 (pkgtools-20030427-20030723.diff.bz2) = 94e9510c16744c04824d0843ae4b2488
-MD5 (pkgtools-20030723-20040113.diff.bz2) = 844f1c1a5473dbc433728841d5172e77
+MD5 (pkgtools-20040208.tar.bz2) = 7d8ba8b4b23049cb4c2a23b8403932e2
+SIZE (pkgtools-20040208.tar.bz2) = 98338
diff --git a/sysutils/portupgrade/files/patch-make_index b/sysutils/portupgrade/files/patch-make_index
deleted file mode 100644
index bc0bfb1215ce..000000000000
--- a/sysutils/portupgrade/files/patch-make_index
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: bin/Makefile
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/Makefile,v
-retrieving revision 1.6
-diff -u -u -0 -r1.6 Makefile
---- bin/Makefile	26 Jan 2002 23:57:34 -0000	1.6
-+++ bin/Makefile	7 Feb 2004 08:49:02 -0000
-@@ -7,3 +7 @@
--SCRIPTS=	${BUILDDIR}/make_describe_pass1 \
--		${BUILDDIR}/make_describe_pass2 \
--		${BUILDDIR}/pkg_fetch \
-+SCRIPTS=	${BUILDDIR}/pkg_fetch \
-Index: bin/portupgrade
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/portupgrade,v
-retrieving revision 1.220
-diff -u -u -0 -r1.220 portupgrade
---- bin/portupgrade	23 Jul 2003 12:23:03 -0000	1.220
-+++ bin/portupgrade	22 Aug 2003 07:41:57 -0000
-@@ -174,0 +175 @@
-+  $new_force = false
-@@ -327,2 +328,7 @@
--		    "packages (default: #{MYNAME == 'portinstall' ? 'on' : 'off'})") {
--      |$new|
-+		    "packages; Specified twice, always install a new" << NEXTLINE <<
-+		    "one instead of upgrading (default: #{MYNAME == 'portinstall' ? 'on' : 'off'})") {
-+      if $new
-+	$new_force = true
-+      else
-+	$new = true
-+      end
-Index: lib/pkgdb.rb
-===================================================================
-RCS file: /home/cvs/pkgtools/lib/pkgdb.rb,v
-retrieving revision 1.112
-diff -u -u -0 -r1.112 pkgdb.rb
---- lib/pkgdb.rb	23 Jul 2003 12:23:05 -0000	1.112
-+++ lib/pkgdb.rb	7 Feb 2004 08:52:43 -0000
-@@ -45,2 +44,0 @@
--    :make_describe_pass1	=> "#{PREFIX}/sbin/make_describe_pass1",
--    :make_describe_pass2	=> "#{PREFIX}/sbin/make_describe_pass2",
-Index: lib/portsdb.rb
-===================================================================
-RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
-retrieving revision 1.78
-diff -u -u -0 -r1.78 portsdb.rb
---- lib/portsdb.rb	23 Jul 2003 12:23:05 -0000	1.78
-+++ lib/portsdb.rb	7 Feb 2004 08:52:26 -0000
-@@ -340,18 +340 @@
--    if true
--      system %`
--	#{PkgDB::command(:make_describe_pass1)} |
--	#{PkgDB::command(:make_describe_pass2)} |
--	(cd #{abs_ports_dir} && perl Tools/make_index) |
--	sed -e 's./.\001.g' |
--	sort -t '|' +1 -2 |
--	sed -e 's.\001./.g' > #{tmp}
--      `
--    else
--      system %`
--	cd #{abs_ports_dir} && (make describe ECHO_MSG='echo > /dev/null' 2> /dev/null |
--	perl Tools/make_index) |
--	sed -e 's./.\001.g' |
--	sort -t '|' +1 -2 |
--	sed -e 's.\001./.g' > #{tmp}
--      `
--    end
-+    system "cd #{abs_ports_dir} && make INDEXFILE=INDEX.tmp index && mv INDEX.tmp #{tmp}"
diff --git a/sysutils/portupgrade/files/patch-pkgtools.rb b/sysutils/portupgrade/files/patch-pkgtools.rb
deleted file mode 100644
index 3d7e68a52709..000000000000
--- a/sysutils/portupgrade/files/patch-pkgtools.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: lib/pkgtools.rb
-===================================================================
-RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
-retrieving revision 1.116
-diff -u -r1.116 pkgtools.rb
---- lib/pkgtools.rb	19 Oct 2003 11:56:34 -0000	1.116
-+++ lib/pkgtools.rb	16 Jan 2004 12:11:11 -0000
-@@ -478,14 +478,20 @@
- alias system! sudo
- alias xsystem! xsudo
- 
--# script, xscript
--def __script(x, file, *args)
--  if file
--    __system(x, '/usr/bin/script', '-qa', file, *args)
-+def logged_command(file, args)
-+  if !file  
-+    args
-+  elsif STDIN.tty?
-+    ['/usr/bin/script', '-qa', file, *args]
-   else
--    __system(x, *args)
-+    ['/bin/sh', '-c', sprintf('%s >>%s 2>&1', shelljoin(*args), shelljoin(file))]
-   end
- end
-+
-+# script, xscript
-+def __script(x, file, *args)
-+  __system(x, *logged_command(file, args))
-+end
- def script(file, *args)
-   __script(false, file, *args)
- end
-@@ -495,11 +501,7 @@
- 
- # script!, xscript!
- def __script!(x, file, *args)
--  if file
--    __sudo(x, '/usr/bin/script', '-qa', file, *args)
--  else
--    __sudo(x, *args)
--  end
-+  __sudo(x, *logged_command(file, args))
- end
- def script!(file, *args)
-   __script!(false, file, *args)
diff --git a/sysutils/portupgrade/files/patch-portupgrade b/sysutils/portupgrade/files/patch-portupgrade
deleted file mode 100644
index f395fbc68868..000000000000
--- a/sysutils/portupgrade/files/patch-portupgrade
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: bin/portupgrade
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/portupgrade,v
-retrieving revision 1.220
-diff -u -0 -r1.220 portupgrade
---- bin/portupgrade	23 Jul 2003 12:23:03 -0000	1.220
-+++ bin/portupgrade	8 Feb 2004 08:15:48 -0000
-@@ -1063 +1063 @@
--  teardown_proc2 = uninstall_pkg(oldpkgname, $uninstall_extra_flags)
-+  teardown_proc2 = uninstall_pkg(oldpkgname, logfile, $uninstall_extra_flags)
-@@ -1567 +1567 @@
--def uninstall_pkg(pkgname, extra_flags = '')
-+def uninstall_pkg(pkgname, logfile = nil, extra_flags = '')
-@@ -1624 +1624 @@
--	  script!(logfile, '/bin/sh', '-c', command)
-+	  script!(logfile, '/bin/sh', '-c', command)