Update to 20030422. This is a maintenance release.

portsdb(1):
- Fix portsdb -U's COMMENT support.

  Submitted by:	Frerich Raabe <frerich.raabe@gmx.de>

portsclean(1):
- Fix a silly typo and unbreak portsclean -P.

  Submitted by:	Olivier Tharan <olive@oban.frmug.org>

pkgtools.conf(5):
- Set OS_PKGBRANCH to "<n>-stable" for PRERELEASE, RC, ALPHA, BETA,
  etc.

- Apply grammar fixes and rephrase a paragraph.

  PR:	ports/49042, ports/49041
  Submitted by:	Chris Pepper <pepper@rockefeller.edu>

overall:
- Appease ruby 1.8 which now complains about closed streams.

8 files changed, 8 insertions, 38 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index ed11e96ca534..984dce23de09 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030308
-PORTREVISION=	2
+PORTVERSION=	20030422
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -21,7 +20,8 @@ PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
 		pkgtools-20030217-20030228.diff.bz2 \
-		pkgtools-20030228-${PORTVERSION}.diff.bz2
+		pkgtools-20030228-20030308.diff.bz2 \
+		pkgtools-20030308-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index a1d25c98d3ce..c389f0c6b78a 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -2,3 +2,4 @@ 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
diff --git a/ports-mgmt/portupgrade-devel/files/patch-pkg_fetch b/ports-mgmt/portupgrade-devel/files/patch-pkg_fetch
deleted file mode 100644
index 898d4641bc72..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-pkg_fetch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/pkg_fetch.orig	Fri Mar 28 18:50:21 2003
-+++ bin/pkg_fetch	Fri Mar 28 18:50:33 2003
-@@ -251,7 +251,7 @@
- 
-   begin
-     FileUtils.mv(temp_path, save_path)
--  rescue
-+  rescue => e
-     warning_message "Failed to save the dowloaded tarball as #{save_path}"
-     raise e
-   end
diff --git a/ports-mgmt/portupgrade-devel/files/patch-pkgtools.conf b/ports-mgmt/portupgrade-devel/files/patch-pkgtools.conf
deleted file mode 100644
index eaa21a2364a4..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-pkgtools.conf
+++ /dev/null
@@ -1,5 +0,0 @@
---- etc/pkgtools.conf.orig	Sun Mar 23 17:13:03 2003
-+++ etc/pkgtools.conf	Sun Mar 23 17:13:17 2003
-@@ -252 +252 @@
--   be used as B values, instead of pkgname glob patterns.  <:delete>
-+  # be used as B values, instead of pkgname glob patterns.  <:delete>
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index ed11e96ca534..984dce23de09 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030308
-PORTREVISION=	2
+PORTVERSION=	20030422
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -21,7 +20,8 @@ PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
 		pkgtools-20030217-20030228.diff.bz2 \
-		pkgtools-20030228-${PORTVERSION}.diff.bz2
+		pkgtools-20030228-20030308.diff.bz2 \
+		pkgtools-20030308-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index a1d25c98d3ce..c389f0c6b78a 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -2,3 +2,4 @@ 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
diff --git a/ports-mgmt/portupgrade/files/patch-pkg_fetch b/ports-mgmt/portupgrade/files/patch-pkg_fetch
deleted file mode 100644
index 898d4641bc72..000000000000
--- a/ports-mgmt/portupgrade/files/patch-pkg_fetch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/pkg_fetch.orig	Fri Mar 28 18:50:21 2003
-+++ bin/pkg_fetch	Fri Mar 28 18:50:33 2003
-@@ -251,7 +251,7 @@
- 
-   begin
-     FileUtils.mv(temp_path, save_path)
--  rescue
-+  rescue => e
-     warning_message "Failed to save the dowloaded tarball as #{save_path}"
-     raise e
-   end
diff --git a/ports-mgmt/portupgrade/files/patch-pkgtools.conf b/ports-mgmt/portupgrade/files/patch-pkgtools.conf
deleted file mode 100644
index eaa21a2364a4..000000000000
--- a/ports-mgmt/portupgrade/files/patch-pkgtools.conf
+++ /dev/null
@@ -1,5 +0,0 @@
---- etc/pkgtools.conf.orig	Sun Mar 23 17:13:03 2003
-+++ etc/pkgtools.conf	Sun Mar 23 17:13:17 2003
-@@ -252 +252 @@
--   be used as B values, instead of pkgname glob patterns.  <:delete>
-+  # be used as B values, instead of pkgname glob patterns.  <:delete>