diff -ur portupgrade-old/Makefile portupgrade/Makefile
--- portupgrade-old/Makefile	2012-04-19 08:55:40.000000000 -0500
+++ portupgrade/Makefile	2012-04-19 09:01:08.000000000 -0500
@@ -10,20 +10,20 @@
 PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/
-DISTNAME=	pkgtools-pkgtools-${GITVERSION}
+MASTER_SITES=	SF/portupgrade/pkgtools/${PORTVERSION}/
+DISTNAME=	pkgtools-${PORTVERSION}
 
 MAINTAINER=	bryan@shatow.net
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 
+LICENSE=	BSD
+
 OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend" on \
 		BDB1 "Use Berkeley DB 1.85 as backend" off
 
 CONFLICTS_INSTALL=	portupgrade-devel-*
 
-FETCH_ARGS=	-Fpr
-GITVERSION=	b99f3ce
-
+USE_BZIP2=	yes
 USE_RUBY=	yes
 
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
@@ -67,7 +67,7 @@
 .endif
 
 # parsedate is needed for date globbing
-.if ${RUBY_DEFAULT_VER} == "1.9"
+.if ${RUBY_VER} == 1.9
 RUN_DEPENDS+=	${RUBY_SITELIBDIR}/parsedate.rb:${PORTSDIR}/devel/ruby-date2
 .endif
 
diff -ur portupgrade-old/distinfo portupgrade/distinfo
--- portupgrade-old/distinfo	2012-04-19 09:02:08.000000000 -0500
+++ portupgrade/distinfo	2012-04-19 09:01:17.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (pkgtools-pkgtools-b99f3ce.tar.gz) = bc60131071eb8b71493c1a0af756184ce4f5d535d971a60f7f1d02a4d0efb345
-SIZE (pkgtools-pkgtools-b99f3ce.tar.gz) = 98949
+SHA256 (pkgtools-2.4.9.3.tar.bz2) = 0d4a7345285e5c12215066ec805dddad4f07d32619e8e61f20f19e8851d6ce76
+SIZE (pkgtools-2.4.9.3.tar.bz2) = 79377