From now on I use release dates for this port's version numbers, and

this is version 20010606.

A new tool pkgdepfix is added.  It allows you to interactively fix
/var/db/pkg's @pkgdep / +REQUIRED_BY discrepancies.  Run this
periodically to let portupgrade properly trace dependencies.

10 files changed, 34 insertions, 24 deletions

diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 22757dfe348b..5a2464dd1a8e 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	1.42
+PORTVERSION=	20010606
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20010602
+DISTNAME=	pkgtools-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
 
@@ -22,9 +22,6 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-do-patch:
-	${GREP} -Frl priviledge ${WRKSRC} | xargs ${RUBY} -i -pe 'gsub /priviledge/, "privilege"'
-
 do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index d9a7e655b940..ec47e1600d8d 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010602.tar.gz) = 7c90ae7886a07330aed07989296d719e
+MD5 (pkgtools-20010606.tar.gz) = 81ed4e367486a4a2c8c82fba953ad6de
diff --git a/sysutils/portupgrade-devel/pkg-comment b/sysutils/portupgrade-devel/pkg-comment
index 1b8e6ad82bc0..df4e30a5b644 100644
--- a/sysutils/portupgrade-devel/pkg-comment
+++ b/sysutils/portupgrade-devel/pkg-comment
@@ -1 +1 @@
-A tool to upgrade installed packages via the port
+Very powerful FreeBSD ports upgrading tool with more utilities
diff --git a/sysutils/portupgrade-devel/pkg-descr b/sysutils/portupgrade-devel/pkg-descr
index f648ab0cdf40..c835f8ce92c1 100644
--- a/sysutils/portupgrade-devel/pkg-descr
+++ b/sysutils/portupgrade-devel/pkg-descr
@@ -1,9 +1,16 @@
-Portupgrade is a tool to upgrade installed packages via the port.
+Portupgrade is a very powerful tool to upgrade installed packages via
+the port.  It upgrades ports without reinstalling dependent packages
+by directly modifying the package info recorded in the files under
+/var/db/pkg.
 
-It upgrades ports without reinstalling dependent packages by directly
-modifying the package info recorded in the files under /var/db/pkg.
+This package also includes:
 
-You may want to use portversion which is a replacement of
-pkg_version(8) optimized and cooperative with portupgrade.
+portversion:
+	This is a replacement of pkg_version(8), which runs faster
+	than pkg_version and is cooperative with portupgrade.
+
+pkgdepfix:
+	This is an interactive tool to fix /var/db/pkg's @pkgdep /
+	+REQUIRED_BY discrepancies.
 
 Author: Akinori MUSHA <knu@FreeBSD.org>
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 71d71bc49a7a..2abe5f70039b 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -1,3 +1,4 @@
+sbin/pkgdepfix
 sbin/portupgrade
 sbin/portversion
 %%RUBY_SITELIBDIR%%/pkg.rb
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 22757dfe348b..5a2464dd1a8e 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	1.42
+PORTVERSION=	20010606
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20010602
+DISTNAME=	pkgtools-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
 
@@ -22,9 +22,6 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-do-patch:
-	${GREP} -Frl priviledge ${WRKSRC} | xargs ${RUBY} -i -pe 'gsub /priviledge/, "privilege"'
-
 do-install:
 	cd ${WRKSRC} && ${RUBY} install.rb
 	${MKDIR} ${PREFIX}/share/zsh/site-functions
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index d9a7e655b940..ec47e1600d8d 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010602.tar.gz) = 7c90ae7886a07330aed07989296d719e
+MD5 (pkgtools-20010606.tar.gz) = 81ed4e367486a4a2c8c82fba953ad6de
diff --git a/sysutils/portupgrade/pkg-comment b/sysutils/portupgrade/pkg-comment
index 1b8e6ad82bc0..df4e30a5b644 100644
--- a/sysutils/portupgrade/pkg-comment
+++ b/sysutils/portupgrade/pkg-comment
@@ -1 +1 @@
-A tool to upgrade installed packages via the port
+Very powerful FreeBSD ports upgrading tool with more utilities
diff --git a/sysutils/portupgrade/pkg-descr b/sysutils/portupgrade/pkg-descr
index f648ab0cdf40..c835f8ce92c1 100644
--- a/sysutils/portupgrade/pkg-descr
+++ b/sysutils/portupgrade/pkg-descr
@@ -1,9 +1,16 @@
-Portupgrade is a tool to upgrade installed packages via the port.
+Portupgrade is a very powerful tool to upgrade installed packages via
+the port.  It upgrades ports without reinstalling dependent packages
+by directly modifying the package info recorded in the files under
+/var/db/pkg.
 
-It upgrades ports without reinstalling dependent packages by directly
-modifying the package info recorded in the files under /var/db/pkg.
+This package also includes:
 
-You may want to use portversion which is a replacement of
-pkg_version(8) optimized and cooperative with portupgrade.
+portversion:
+	This is a replacement of pkg_version(8), which runs faster
+	than pkg_version and is cooperative with portupgrade.
+
+pkgdepfix:
+	This is an interactive tool to fix /var/db/pkg's @pkgdep /
+	+REQUIRED_BY discrepancies.
 
 Author: Akinori MUSHA <knu@FreeBSD.org>
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 71d71bc49a7a..2abe5f70039b 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -1,3 +1,4 @@
+sbin/pkgdepfix
 sbin/portupgrade
 sbin/portversion
 %%RUBY_SITELIBDIR%%/pkg.rb