diff -u /usr/ports/ports-mgmt/portupgrade-devel/Makefile ./Makefile
--- /usr/ports/ports-mgmt/portupgrade-devel/Makefile	2012-05-02 10:50:24.000000000 -0500
+++ ./Makefile	2012-05-11 22:46:08.000000000 -0500
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	20120501
+PORTVERSION=	20120511
 PORTEPOCH=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/ \
@@ -24,7 +24,7 @@
 CONFLICTS_INSTALL=	portupgrade-[0-9]*
 
 FETCH_ARGS=	-Fpr
-GITVERSION=	d0d4b68
+GITVERSION=	2048f18
 
 USE_RUBY=	yes
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
@@ -55,8 +55,8 @@
 .endif
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} '/PREFIX/s:\(=[[:space:]]*\)\(.*/usr/local\):\1ENV["LOCALBASE"] || \2:' \
-		${WRKSRC}/lib/pkgdb.rb ${WRKSRC}/lib/pkgtools.rb
+	REVISION=`readlink "${_DISTDIR}/portupgrade/latest" | ${SED} -E -e 's,.*pkgtools-(.*).tar.gz,\1,g'` && ${SED} -E -e "s,%%DATE%%,${PORTVERSION},g;s,%%REVISION%%,$${REVISION},g" \
+	    ${WRKSRC}/lib/pkgtools/revision.rb.in > ${WRKSRC}/lib/pkgtools/revision.rb
 
 post-install:
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
diff -u /usr/ports/ports-mgmt/portupgrade-devel/distinfo ./distinfo
--- /usr/ports/ports-mgmt/portupgrade-devel/distinfo	2012-05-02 10:50:24.000000000 -0500
+++ ./distinfo	2012-05-11 22:22:28.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (pkgtools-pkgtools-d0d4b68.tar.gz) = 329579b6234837382bad45ab475d2250618e6829fc6d8a268a15534424e5b90f
-SIZE (pkgtools-pkgtools-d0d4b68.tar.gz) = 99849
+SHA256 (pkgtools-pkgtools-2048f18.tar.gz) = 150727d88517f9fc2ecef1171103f8484dbf541b8adc7b7deab0bd90defe3b02
+SIZE (pkgtools-pkgtools-2048f18.tar.gz) = 101236
diff -u /usr/ports/ports-mgmt/portupgrade-devel/pkg-plist ./pkg-plist
--- /usr/ports/ports-mgmt/portupgrade-devel/pkg-plist	2012-05-02 10:50:24.000000000 -0500
+++ ./pkg-plist	2012-05-11 17:12:08.000000000 -0500
@@ -15,17 +15,23 @@
 sbin/portsdb
 sbin/portupgrade
 sbin/portversion
-%%RUBY_SITELIBDIR%%/pkg.rb
-%%RUBY_SITELIBDIR%%/pkgdb.rb
-%%RUBY_SITELIBDIR%%/pkgdbtools.rb
-%%RUBY_SITELIBDIR%%/pkginfo.rb
-%%RUBY_SITELIBDIR%%/pkgmisc.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkg.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkgdb.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkgdbtools.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkginfo.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkgmisc.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkgtools.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkgtsort.rb
+%%RUBY_SITELIBDIR%%/pkgtools/pkgversion.rb
+%%RUBY_SITELIBDIR%%/pkgtools/portinfo.rb
+%%RUBY_SITELIBDIR%%/pkgtools/ports.rb
+%%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb
+%%RUBY_SITELIBDIR%%/pkgtools/revision.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
+@dirrm %%RUBY_SITELIBDIR%%/pkgtools
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
 @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