Update portupgrade to 1.31 and portversion to 1.7.

* Fix the Makefile/PKGNAME error detection.
  [Reported by:	Tadayuki OKADA <tadayuki@mediaone.net>]

* Implement -y/--yield which yields root priledges where needed.

* Implement -Y/--yield-command which specifies the command to yield
  root priledges. (default: sudo)

6 files changed, 12 insertions, 30 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 13ff9e98219a..a4fbfa670d10 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	1.29
+PORTVERSION=	1.31
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20010530d
+DISTNAME=	pkgtools-20010531
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 8a4b5d82bf55..8f970b09c28a 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010530d.tar.gz) = 8f0bb6b84ded3f35552440917ae7833d
+MD5 (pkgtools-20010531.tar.gz) = 440b75639e940b82f879ce2c045043ea
diff --git a/ports-mgmt/portupgrade-devel/pkg-descr b/ports-mgmt/portupgrade-devel/pkg-descr
index b887c8f95abe..f648ab0cdf40 100644
--- a/ports-mgmt/portupgrade-devel/pkg-descr
+++ b/ports-mgmt/portupgrade-devel/pkg-descr
@@ -3,16 +3,7 @@ Portupgrade is a 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.
 
-The procedures it takes is shown as follows:
+You may want to use portversion which is a replacement of
+pkg_version(8) optimized and cooperative with portupgrade.
 
-    1.  Build the corresponding port of the given installed package
-    2.  Fix the dependency info of the ones which depends on the given
-        package
-    3.  Save the +REQUIRED_BY list of the given package
-    4.  Uninstall the given package forcibly if -u is specified
-    5.  Install the new version via the port (built in <1>)
-    6.  Restore the +REQUIRED_BY list (saved in <3>)
-
-The usage can be shown by running it without arguments or with a -h.
-
-Author:	Akinori MUSHA <knu@FreeBSD.org>
+Author: Akinori MUSHA <knu@FreeBSD.org>
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 13ff9e98219a..a4fbfa670d10 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	1.29
+PORTVERSION=	1.31
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20010530d
+DISTNAME=	pkgtools-20010531
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 8a4b5d82bf55..8f970b09c28a 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010530d.tar.gz) = 8f0bb6b84ded3f35552440917ae7833d
+MD5 (pkgtools-20010531.tar.gz) = 440b75639e940b82f879ce2c045043ea
diff --git a/ports-mgmt/portupgrade/pkg-descr b/ports-mgmt/portupgrade/pkg-descr
index b887c8f95abe..f648ab0cdf40 100644
--- a/ports-mgmt/portupgrade/pkg-descr
+++ b/ports-mgmt/portupgrade/pkg-descr
@@ -3,16 +3,7 @@ Portupgrade is a 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.
 
-The procedures it takes is shown as follows:
+You may want to use portversion which is a replacement of
+pkg_version(8) optimized and cooperative with portupgrade.
 
-    1.  Build the corresponding port of the given installed package
-    2.  Fix the dependency info of the ones which depends on the given
-        package
-    3.  Save the +REQUIRED_BY list of the given package
-    4.  Uninstall the given package forcibly if -u is specified
-    5.  Install the new version via the port (built in <1>)
-    6.  Restore the +REQUIRED_BY list (saved in <3>)
-
-The usage can be shown by running it without arguments or with a -h.
-
-Author:	Akinori MUSHA <knu@FreeBSD.org>
+Author: Akinori MUSHA <knu@FreeBSD.org>