Update to 20030308.

portupgrade(1):
  - -A/-B: Remove ;'s and spaces at the beginning of each command line
    to stop sh(1) from issuing a syntax error.

  - -A/-B: Omit running null commands.

  - Run AFTERINSTALL commands after restoring a failed upgrade also.

  - Fix a run time error caused by any?.

pkgtools.conf(5):
  - Introduce BEFOREDEINSTALL.

  - Deprecate rc_file() and rc_files(), and provide
    enabled_rc_scripts() and disabled_rc_scripts() instead.

  - Provide cmd_start_rc(), cmd_stop_rc(), and cmd_enable_rc() in
    addition to cmd_restart_rc() and cmd_disable_rc().

  - Update examples.

pkg_deinstall(1):
  - Run BEFOREDEINSTALL commands before deinstalling a package.

8 files changed, 16 insertions, 8 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index a0ea7dffc70e..7a1166af61a3 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030228
+PORTVERSION=	20030308
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -19,7 +19,8 @@ DISTVERSION=	20030123
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
-		pkgtools-20030217-${PORTVERSION}.diff.bz2
+		pkgtools-20030217-20030228.diff.bz2 \
+		pkgtools-20030228-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 8ceb5c996873..a1d25c98d3ce 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,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
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index a0ea7dffc70e..7a1166af61a3 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030228
+PORTVERSION=	20030308
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -19,7 +19,8 @@ DISTVERSION=	20030123
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
-		pkgtools-20030217-${PORTVERSION}.diff.bz2
+		pkgtools-20030217-20030228.diff.bz2 \
+		pkgtools-20030228-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 8ceb5c996873..a1d25c98d3ce 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,3 +1,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
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index a0ea7dffc70e..7a1166af61a3 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030228
+PORTVERSION=	20030308
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -19,7 +19,8 @@ DISTVERSION=	20030123
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
-		pkgtools-20030217-${PORTVERSION}.diff.bz2
+		pkgtools-20030217-20030228.diff.bz2 \
+		pkgtools-20030228-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 8ceb5c996873..a1d25c98d3ce 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1,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
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index a0ea7dffc70e..7a1166af61a3 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20030228
+PORTVERSION=	20030308
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -19,7 +19,8 @@ DISTVERSION=	20030123
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${DISTNAME}-20030217.diff.bz2 \
-		pkgtools-20030217-${PORTVERSION}.diff.bz2
+		pkgtools-20030217-20030228.diff.bz2 \
+		pkgtools-20030228-${PORTVERSION}.diff.bz2
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 8ceb5c996873..a1d25c98d3ce 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,3 +1,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