8 files changed, 16 insertions, 16 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index e46b5f6566cc..69e8feda2a0a 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	1.16
+PORTVERSION=	1.18
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20010321
+DISTNAME=	pkgtools-20010322
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 37c2e56ddc17..64e48809b530 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010321.tar.gz) = eb803ab39734811712115c6a6feb18c6
+MD5 (pkgtools-20010322.tar.gz) = 1b6ad574874b488e326e97454a4194d2
diff --git a/ports-mgmt/portupgrade-devel/pkg-descr b/ports-mgmt/portupgrade-devel/pkg-descr
index 10d2151606f8..cefdcf4b544a 100644
--- a/ports-mgmt/portupgrade-devel/pkg-descr
+++ b/ports-mgmt/portupgrade-devel/pkg-descr
@@ -6,18 +6,16 @@ modifying the package info recorded in the files under /var/db/pkg.
 The procedures it takes is shown as follows:
 
     1.  Build the corresponding port of the given 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 port
-
     6.  Restore the +REQUIRED_BY list
 
 The usage can be shown by running it without arguments or with a -h.
 
+Portversion, which provides better comparison algorithm and
+functionality than pkg_version(1), is also included.
+
 Author:	Akinori MUSHA <knu@FreeBSD.org>
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 8423e512f464..3be08857fb2d 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -1,4 +1,5 @@
 sbin/portupgrade
+sbin/portversion
 %%RUBY_SITELIBDIR%%/pkg.rb
 %%RUBY_SITELIBDIR%%/pkgdb.rb
 %%RUBY_SITELIBDIR%%/pkginfo.rb
@@ -7,6 +8,7 @@ sbin/portupgrade
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
 share/zsh/site-functions/_portupgrade
+share/zsh/site-functions/_portversion
 @unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index e46b5f6566cc..69e8feda2a0a 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	1.16
+PORTVERSION=	1.18
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20010321
+DISTNAME=	pkgtools-20010322
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 37c2e56ddc17..64e48809b530 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1 +1 @@
-MD5 (pkgtools-20010321.tar.gz) = eb803ab39734811712115c6a6feb18c6
+MD5 (pkgtools-20010322.tar.gz) = 1b6ad574874b488e326e97454a4194d2
diff --git a/ports-mgmt/portupgrade/pkg-descr b/ports-mgmt/portupgrade/pkg-descr
index 10d2151606f8..cefdcf4b544a 100644
--- a/ports-mgmt/portupgrade/pkg-descr
+++ b/ports-mgmt/portupgrade/pkg-descr
@@ -6,18 +6,16 @@ modifying the package info recorded in the files under /var/db/pkg.
 The procedures it takes is shown as follows:
 
     1.  Build the corresponding port of the given 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 port
-
     6.  Restore the +REQUIRED_BY list
 
 The usage can be shown by running it without arguments or with a -h.
 
+Portversion, which provides better comparison algorithm and
+functionality than pkg_version(1), is also included.
+
 Author:	Akinori MUSHA <knu@FreeBSD.org>
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 8423e512f464..3be08857fb2d 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -1,4 +1,5 @@
 sbin/portupgrade
+sbin/portversion
 %%RUBY_SITELIBDIR%%/pkg.rb
 %%RUBY_SITELIBDIR%%/pkgdb.rb
 %%RUBY_SITELIBDIR%%/pkginfo.rb
@@ -7,6 +8,7 @@ sbin/portupgrade
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
 share/zsh/site-functions/_portupgrade
+share/zsh/site-functions/_portversion
 @unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade