diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index d88f1a6fe14f..de8c0e7be5c3 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020227
+PORTVERSION=	20020321
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20020204
+DISTNAME=	pkgtools-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	pkgtools-20020204-20020218.diff.bz2 \
-		pkgtools-20020218-20020220.diff.bz2 \
-		pkgtools-20020220-20020220.1.diff.bz2 \
-		pkgtools-20020220.1-20020225.diff.bz2 \
-		pkgtools-20020225-20020225.1.diff.bz2 \
-		pkgtools-20020225.1-20020227.diff.bz2
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	${MASTER_SITES}
+#PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
+#PATCHFILES=	${DISTNAME}.yyyymmdd.diff.bz2 \
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 22c49d777716..177e0dbce2c1 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,7 +1 @@
-MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
-MD5 (pkgtools-20020204-20020218.diff.bz2) = 9bc76b3db39868f32b48c0e2001d619d
-MD5 (pkgtools-20020218-20020220.diff.bz2) = ccad37c3420e31c823316361d3a53002
-MD5 (pkgtools-20020220-20020220.1.diff.bz2) = 230f8b137d1b966ed2940ab9567e43fd
-MD5 (pkgtools-20020220.1-20020225.diff.bz2) = 3f2ca161800ae991b676b4c197e44c78
-MD5 (pkgtools-20020225-20020225.1.diff.bz2) = ecfad3dd423a09bb6edffb8e2cb9bdc2
-MD5 (pkgtools-20020225.1-20020227.diff.bz2) = 6ebd730125f8bcd159e5b8f099b83383
+MD5 (pkgtools-20020321.tar.bz2) = 810d99baf59a13f542d5a78edd07ce91
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 182e78432786..ad7a0657cd33 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -21,11 +21,11 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkginfo.rb
 %%RUBY_SITELIBDIR%%/pkgmisc.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
+%%RUBY_SITELIBDIR%%/pkgtsort.rb
 %%RUBY_SITELIBDIR%%/pkgversion.rb
 %%RUBY_SITELIBDIR%%/portinfo.rb
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
-%%RUBY_SITELIBDIR%%/tsort.rb
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index d88f1a6fe14f..de8c0e7be5c3 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020227
+PORTVERSION=	20020321
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20020204
+DISTNAME=	pkgtools-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	pkgtools-20020204-20020218.diff.bz2 \
-		pkgtools-20020218-20020220.diff.bz2 \
-		pkgtools-20020220-20020220.1.diff.bz2 \
-		pkgtools-20020220.1-20020225.diff.bz2 \
-		pkgtools-20020225-20020225.1.diff.bz2 \
-		pkgtools-20020225.1-20020227.diff.bz2
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	${MASTER_SITES}
+#PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
+#PATCHFILES=	${DISTNAME}.yyyymmdd.diff.bz2 \
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index 22c49d777716..177e0dbce2c1 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,7 +1 @@
-MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
-MD5 (pkgtools-20020204-20020218.diff.bz2) = 9bc76b3db39868f32b48c0e2001d619d
-MD5 (pkgtools-20020218-20020220.diff.bz2) = ccad37c3420e31c823316361d3a53002
-MD5 (pkgtools-20020220-20020220.1.diff.bz2) = 230f8b137d1b966ed2940ab9567e43fd
-MD5 (pkgtools-20020220.1-20020225.diff.bz2) = 3f2ca161800ae991b676b4c197e44c78
-MD5 (pkgtools-20020225-20020225.1.diff.bz2) = ecfad3dd423a09bb6edffb8e2cb9bdc2
-MD5 (pkgtools-20020225.1-20020227.diff.bz2) = 6ebd730125f8bcd159e5b8f099b83383
+MD5 (pkgtools-20020321.tar.bz2) = 810d99baf59a13f542d5a78edd07ce91
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 182e78432786..ad7a0657cd33 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -21,11 +21,11 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkginfo.rb
 %%RUBY_SITELIBDIR%%/pkgmisc.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
+%%RUBY_SITELIBDIR%%/pkgtsort.rb
 %%RUBY_SITELIBDIR%%/pkgversion.rb
 %%RUBY_SITELIBDIR%%/portinfo.rb
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
-%%RUBY_SITELIBDIR%%/tsort.rb
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index d88f1a6fe14f..de8c0e7be5c3 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020227
+PORTVERSION=	20020321
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20020204
+DISTNAME=	pkgtools-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	pkgtools-20020204-20020218.diff.bz2 \
-		pkgtools-20020218-20020220.diff.bz2 \
-		pkgtools-20020220-20020220.1.diff.bz2 \
-		pkgtools-20020220.1-20020225.diff.bz2 \
-		pkgtools-20020225-20020225.1.diff.bz2 \
-		pkgtools-20020225.1-20020227.diff.bz2
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	${MASTER_SITES}
+#PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
+#PATCHFILES=	${DISTNAME}.yyyymmdd.diff.bz2 \
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 22c49d777716..177e0dbce2c1 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,7 +1 @@
-MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
-MD5 (pkgtools-20020204-20020218.diff.bz2) = 9bc76b3db39868f32b48c0e2001d619d
-MD5 (pkgtools-20020218-20020220.diff.bz2) = ccad37c3420e31c823316361d3a53002
-MD5 (pkgtools-20020220-20020220.1.diff.bz2) = 230f8b137d1b966ed2940ab9567e43fd
-MD5 (pkgtools-20020220.1-20020225.diff.bz2) = 3f2ca161800ae991b676b4c197e44c78
-MD5 (pkgtools-20020225-20020225.1.diff.bz2) = ecfad3dd423a09bb6edffb8e2cb9bdc2
-MD5 (pkgtools-20020225.1-20020227.diff.bz2) = 6ebd730125f8bcd159e5b8f099b83383
+MD5 (pkgtools-20020321.tar.bz2) = 810d99baf59a13f542d5a78edd07ce91
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 182e78432786..ad7a0657cd33 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -21,11 +21,11 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkginfo.rb
 %%RUBY_SITELIBDIR%%/pkgmisc.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
+%%RUBY_SITELIBDIR%%/pkgtsort.rb
 %%RUBY_SITELIBDIR%%/pkgversion.rb
 %%RUBY_SITELIBDIR%%/portinfo.rb
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
-%%RUBY_SITELIBDIR%%/tsort.rb
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index d88f1a6fe14f..de8c0e7be5c3 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20020227
+PORTVERSION=	20020321
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
 MASTER_SITE_SUBDIR=	knu
-DISTNAME=	pkgtools-20020204
+DISTNAME=	pkgtools-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	pkgtools-20020204-20020218.diff.bz2 \
-		pkgtools-20020218-20020220.diff.bz2 \
-		pkgtools-20020220-20020220.1.diff.bz2 \
-		pkgtools-20020220.1-20020225.diff.bz2 \
-		pkgtools-20020225-20020225.1.diff.bz2 \
-		pkgtools-20020225.1-20020227.diff.bz2
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	${MASTER_SITES}
+#PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
+#PATCHFILES=	${DISTNAME}.yyyymmdd.diff.bz2 \
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	knu@FreeBSD.org
 
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index 22c49d777716..177e0dbce2c1 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,7 +1 @@
-MD5 (pkgtools-20020204.tar.bz2) = 7bf7db180578c8e87871520ef9ff79b9
-MD5 (pkgtools-20020204-20020218.diff.bz2) = 9bc76b3db39868f32b48c0e2001d619d
-MD5 (pkgtools-20020218-20020220.diff.bz2) = ccad37c3420e31c823316361d3a53002
-MD5 (pkgtools-20020220-20020220.1.diff.bz2) = 230f8b137d1b966ed2940ab9567e43fd
-MD5 (pkgtools-20020220.1-20020225.diff.bz2) = 3f2ca161800ae991b676b4c197e44c78
-MD5 (pkgtools-20020225-20020225.1.diff.bz2) = ecfad3dd423a09bb6edffb8e2cb9bdc2
-MD5 (pkgtools-20020225.1-20020227.diff.bz2) = 6ebd730125f8bcd159e5b8f099b83383
+MD5 (pkgtools-20020321.tar.bz2) = 810d99baf59a13f542d5a78edd07ce91
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 182e78432786..ad7a0657cd33 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -21,11 +21,11 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/pkginfo.rb
 %%RUBY_SITELIBDIR%%/pkgmisc.rb
 %%RUBY_SITELIBDIR%%/pkgtools.rb
+%%RUBY_SITELIBDIR%%/pkgtsort.rb
 %%RUBY_SITELIBDIR%%/pkgversion.rb
 %%RUBY_SITELIBDIR%%/portinfo.rb
 %%RUBY_SITELIBDIR%%/ports.rb
 %%RUBY_SITELIBDIR%%/portsdb.rb
-%%RUBY_SITELIBDIR%%/tsort.rb
 @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 etc/pkgtools.conf.sample
 @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf