Update to 20030427. New tarball.

portsdb(1):
- COMMENTFILE is deprecated.  Weird.  I thought I committed these
  changes long long ago.

  Submitted by:	Jean-Yves Lefort <jylefort@brutele.be>.

8 files changed, 8 insertions, 90 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index b24066881b77..b747b0fcd7ae 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,23 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030422
-PORTREVISION=	1
+PORTVERSION=	20030427
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	20030123
+DISTVERSION=	20030427
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
-		pkgtools-20030217-20030228.diff.bz2 \
-		pkgtools-20030228-20030308.diff.bz2 \
-		pkgtools-20030308-${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 c389f0c6b78a..e05773142773 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,5 +1 @@
-MD5 (pkgtools-20030123.tar.bz2) = 2558438bfb4a1dbd6b20d9c10b54edfc
-MD5 (pkgtools-20030123-20030217.diff.bz2) = 49875bb501e17827d6a2b66f212bcacd
-MD5 (pkgtools-20030217-20030228.diff.bz2) = 8752821d4687039a0dd91eb861330a4c
-MD5 (pkgtools-20030228-20030308.diff.bz2) = d61353d8f07fac28b1fb96e75e12d1df
-MD5 (pkgtools-20030308-20030422.diff.bz2) = 8625815b3b737825a7875bb712cb5261
+MD5 (pkgtools-20030427.tar.bz2) = 8692b4965c5bf9ed1d7303b368e7b0c5
diff --git a/sysutils/portupgrade-devel/files/patch-pkgtools.rb b/sysutils/portupgrade-devel/files/patch-pkgtools.rb
deleted file mode 100644
index 6d3d53d37083..000000000000
--- a/sysutils/portupgrade-devel/files/patch-pkgtools.rb
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/pkgtools.rb.orig	Tue Apr 22 14:35:20 2003
-+++ lib/pkgtools.rb	Tue Apr 22 17:57:25 2003
-@@ -604,8 +604,9 @@
-     neworigin ||= $pkgdb.origin(newdep)
-   end
- 
-+  lines = []
-+
-   File.open(file) do |f|
--    lines = []
-     pkgdeps = Set.new
- 
-     deporigin = nil	# what to do with the next DEPORIGIN
diff --git a/sysutils/portupgrade-devel/files/patch-portsclean b/sysutils/portupgrade-devel/files/patch-portsclean
deleted file mode 100644
index 67447ed21f48..000000000000
--- a/sysutils/portupgrade-devel/files/patch-portsclean
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/portsclean.orig	Tue Apr 22 20:30:14 2003
-+++ bin/portsclean	Tue Apr 22 20:29:31 2003
-@@ -520,8 +520,6 @@
- 	end
-       end
-     end
--
--    r.close	# make sure to waitpid the process immediately
-   end
- 
-   IO.popen("find -H #{$packages_base} -type l -name '*.t[bg]z'") do |r|
-@@ -532,8 +530,6 @@
- 	delete_file(pkgfile)
-       end
-     end
--
--    r.close	# make sure to waitpid the process immediately
-   end
- end
- 
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index b24066881b77..b747b0fcd7ae 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,23 +6,19 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030422
-PORTREVISION=	1
+PORTVERSION=	20030427
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	knu
 DISTNAME=	pkgtools-${DISTVERSION}
 
-DISTVERSION=	20030123
+DISTVERSION=	20030427
 
 .if ${DISTVERSION} != ${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
-		pkgtools-20030217-20030228.diff.bz2 \
-		pkgtools-20030228-20030308.diff.bz2 \
-		pkgtools-20030308-${PORTVERSION}.diff.bz2
+PATCHFILES=	${DISTNAME}-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index c389f0c6b78a..e05773142773 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,5 +1 @@
-MD5 (pkgtools-20030123.tar.bz2) = 2558438bfb4a1dbd6b20d9c10b54edfc
-MD5 (pkgtools-20030123-20030217.diff.bz2) = 49875bb501e17827d6a2b66f212bcacd
-MD5 (pkgtools-20030217-20030228.diff.bz2) = 8752821d4687039a0dd91eb861330a4c
-MD5 (pkgtools-20030228-20030308.diff.bz2) = d61353d8f07fac28b1fb96e75e12d1df
-MD5 (pkgtools-20030308-20030422.diff.bz2) = 8625815b3b737825a7875bb712cb5261
+MD5 (pkgtools-20030427.tar.bz2) = 8692b4965c5bf9ed1d7303b368e7b0c5
diff --git a/sysutils/portupgrade/files/patch-pkgtools.rb b/sysutils/portupgrade/files/patch-pkgtools.rb
deleted file mode 100644
index 6d3d53d37083..000000000000
--- a/sysutils/portupgrade/files/patch-pkgtools.rb
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/pkgtools.rb.orig	Tue Apr 22 14:35:20 2003
-+++ lib/pkgtools.rb	Tue Apr 22 17:57:25 2003
-@@ -604,8 +604,9 @@
-     neworigin ||= $pkgdb.origin(newdep)
-   end
- 
-+  lines = []
-+
-   File.open(file) do |f|
--    lines = []
-     pkgdeps = Set.new
- 
-     deporigin = nil	# what to do with the next DEPORIGIN
diff --git a/sysutils/portupgrade/files/patch-portsclean b/sysutils/portupgrade/files/patch-portsclean
deleted file mode 100644
index 67447ed21f48..000000000000
--- a/sysutils/portupgrade/files/patch-portsclean
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/portsclean.orig	Tue Apr 22 20:30:14 2003
-+++ bin/portsclean	Tue Apr 22 20:29:31 2003
-@@ -520,8 +520,6 @@
- 	end
-       end
-     end
--
--    r.close	# make sure to waitpid the process immediately
-   end
- 
-   IO.popen("find -H #{$packages_base} -type l -name '*.t[bg]z'") do |r|
-@@ -532,8 +530,6 @@
- 	delete_file(pkgfile)
-       end
-     end
--
--    r.close	# make sure to waitpid the process immediately
-   end
- end
-