Index: head/ports-mgmt/portupgrade-devel/Makefile
===================================================================
--- head/ports-mgmt/portupgrade-devel/Makefile	(revision 304277)
+++ head/ports-mgmt/portupgrade-devel/Makefile	(revision 304278)
@@ -1,82 +1,85 @@
 # New ports collection makefile for:	portupgrade
 # Date created:		18 March 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	portupgrade
 PORTVERSION=	20120827
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/ \
+MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/pkgtools/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	pkgtools-pkgtools-${GITVERSION}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	FreeBSD ports/packages management tool (devel version)
 
 LICENSE=	BSD
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 
 CONFLICTS_INSTALL=	portupgrade-[0-9]*
 
-FETCH_ARGS=	-Fpr
-GITVERSION=	595d51a
+USE_GITHUB=	yes
+GH_ACCOUNT=	pkgtools
+GH_PROJECT=	pkgtools
+GH_COMMIT=	595d51a
+GH_TAGNAME=	${GH_COMMIT}
 
 DIST_SUBDIR=	${PORTNAME}
 USE_RUBY=	yes
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 USE_STAGE=	yes
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}" RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
 MAN1=		pkg_deinstall.1 \
 		pkg_fetch.1 \
 		pkg_glob.1 \
 		pkg_sort.1 \
 		pkgdb.1 \
 		pkgdu.1 \
 		portcvsweb.1 \
 		portsclean.1 \
 		portsdb.1 \
 		portupgrade.1 \
 		portversion.1
 MAN5=		pkgtools.conf.5
 MLINKS=		pkgdb.1 pkg_which.1 \
 		portupgrade.1 portinstall.1 \
 		portsdb.1 ports_glob.1
 MANCOMPRESSED=	maybe
 
 EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
 .include <bsd.port.pre.mk>
 
 INSTALL_TARGET=		install
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET+=	install-doc
 .endif
 
 # Need to install working script(1)
 .if ${OSVERSION} < 801000
 PLIST_SUB+=	SCRIPT=""
 MAKE_ENV+=	NEED_COMPAT_SCRIPT=yes
 .else
 PLIST_SUB+=	SCRIPT="@comment "
 .endif
 
 regression-test: patch
 	cd ${WRKSRC} && ${MAKE} test
 
 post-patch:	.SILENT
 	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 \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
 	fi
 	${MKDIR} ${PREFIX}/lib/compat/pkg
 
 .include <bsd.port.post.mk>
Index: head/ports-mgmt/portupgrade-devel/distinfo
===================================================================
--- head/ports-mgmt/portupgrade-devel/distinfo	(revision 304277)
+++ head/ports-mgmt/portupgrade-devel/distinfo	(revision 304278)
@@ -1,2 +1,2 @@
-SHA256 (portupgrade/pkgtools-pkgtools-595d51a.tar.gz) = 2583fc442ee7f5a24f2d33720b4f60f6c5c8b10195357df0847f99792aa4228c
-SIZE (portupgrade/pkgtools-pkgtools-595d51a.tar.gz) = 104762
+SHA256 (portupgrade/portupgrade-20120827.tar.gz) = 2583fc442ee7f5a24f2d33720b4f60f6c5c8b10195357df0847f99792aa4228c
+SIZE (portupgrade/portupgrade-20120827.tar.gz) = 104762
Index: head/ports-mgmt/portupgrade-devel/pkg-plist
===================================================================
--- head/ports-mgmt/portupgrade-devel/pkg-plist	(revision 304277)
+++ head/ports-mgmt/portupgrade-devel/pkg-plist	(revision 304278)
@@ -1,53 +1,53 @@
 @exec /bin/mkdir -p %D/lib/compat/pkg
 @dirrmtry lib/compat/pkg
 @dirrmtry lib/compat
 sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
 sbin/pkg_sort
 sbin/pkg_which
 sbin/pkgdb
 sbin/pkgdu
 sbin/portcvsweb
 sbin/portinstall
 sbin/ports_glob
 sbin/portsclean
 sbin/portsdb
 sbin/portupgrade
 sbin/portversion
-@exec /bin/mkdir -p %%RUBY_SITELIBDIR%%/pkgtools
+@exec /bin/mkdir -p %D/%%RUBY_SITELIBDIR%%/pkgtools
 %%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
 @dirrm %%RUBY_SITELIBDIR%%/pkgtools
 @dirrmtry %%RUBY_SITELIBDIR%%
 @dirrmtry lib/ruby/site_ruby
 @dirrmtry lib/ruby
 %%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null
 %%SCRIPT%%libexec/pkgtools/script
 %%SCRIPT%%@dirrm libexec/pkgtools
 @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
 etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
 @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
 @dirrmtry share/zsh
 %%EXAMPLESDIR%%/bash/complete.sample
 %%EXAMPLESDIR%%/tcsh/complete.sample
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 @dirrm %%EXAMPLESDIR%%/bash
 @dirrm %%EXAMPLESDIR%%/tcsh
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%