Index: head/ports-mgmt/portupgrade/Makefile
===================================================================
--- head/ports-mgmt/portupgrade/Makefile	(revision 437320)
+++ head/ports-mgmt/portupgrade/Makefile	(revision 437321)
@@ -1,51 +1,50 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.4.14
+PORTVERSION=	2.4.15
 PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	LOCAL/bdrewery/pkgtools/ \
-		http://mirror.shatow.net/freebsd/pkgtools/ \
+MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
+		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
-DISTNAME=	pkgtools-${PORTVERSION}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	DOCS
 
 CONFLICTS_INSTALL=	portupgrade-devel-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 DIST_SUBDIR=	${PORTNAME}
 USES=		uidfix
 USE_RUBY=	yes
 
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}" \
 		RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
 
 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
 
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
 .include <bsd.port.post.mk>
Index: head/ports-mgmt/portupgrade/distinfo
===================================================================
--- head/ports-mgmt/portupgrade/distinfo	(revision 437320)
+++ head/ports-mgmt/portupgrade/distinfo	(revision 437321)
@@ -1,2 +1,3 @@
-SHA256 (portupgrade/pkgtools-2.4.14_GH0.tar.gz) = 7df55c5ddf043eff095c87b98fe70b80373a8fbc06fa34ab45a270119ff2aef3
-SIZE (portupgrade/pkgtools-2.4.14_GH0.tar.gz) = 108092
+TIMESTAMP = 1490893255
+SHA256 (portupgrade/freebsd-portupgrade-2.4.15_GH0.tar.gz) = 988183017f891f053e6abce27556a9dc4ba3a513d03399f51d76cf3b0ea9849f
+SIZE (portupgrade/freebsd-portupgrade-2.4.15_GH0.tar.gz) = 108122
Index: head/ports-mgmt/portupgrade-devel/Makefile
===================================================================
--- head/ports-mgmt/portupgrade-devel/Makefile	(revision 437320)
+++ head/ports-mgmt/portupgrade-devel/Makefile	(revision 437321)
@@ -1,58 +1,58 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	portupgrade
-PORTVERSION=	20150514
-PORTREVISION=	3
+PORTVERSION=	20170330
+PORTREVISION=	0
 PORTEPOCH=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		LOCAL/bdrewery/${PORTNAME}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	FreeBSD ports/packages management tool (devel version)
 
 LICENSE=	BSD3CLAUSE
 
 CONFLICTS_INSTALL=	portupgrade-[0-9]*
 
 USES=		uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	2.4.13-7-g47dfa22
+GH_TAGNAME=	2.4.15
 
 DIST_SUBDIR=	${PORTNAME}
 USE_RUBY=	yes
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}" \
 		RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
 
 EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 INSTALL_TARGET=		install
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET+=	install-doc
 .endif
 
 # For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
 
 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:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
 .include <bsd.port.post.mk>
Index: head/ports-mgmt/portupgrade-devel/distinfo
===================================================================
--- head/ports-mgmt/portupgrade-devel/distinfo	(revision 437320)
+++ head/ports-mgmt/portupgrade-devel/distinfo	(revision 437321)
@@ -1,2 +1,3 @@
-SHA256 (portupgrade/freebsd-portupgrade-20150514-2.4.13-7-g47dfa22_GH0.tar.gz) = abba172b14a2da6355d5c025e92a0d84f16c52fb91a720e86334eeadcdb3d577
-SIZE (portupgrade/freebsd-portupgrade-20150514-2.4.13-7-g47dfa22_GH0.tar.gz) = 108105
+TIMESTAMP = 1490893146
+SHA256 (portupgrade/freebsd-portupgrade-20170330-2.4.15_GH0.tar.gz) = 988183017f891f053e6abce27556a9dc4ba3a513d03399f51d76cf3b0ea9849f
+SIZE (portupgrade/freebsd-portupgrade-20170330-2.4.15_GH0.tar.gz) = 108122