2 files changed, 23 insertions, 22 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 7f660bfd28e3..7c153140e252 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,24 +6,25 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	9999
-PORTEPOCH=	2
+PORTVERSION=	20120429

+PORTEPOCH=	3

 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://github.com/pkgtools/pkgtools/tarball/
+MASTER_SITES=	http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/ \

+		http://www.shatow.net/freebsd/

 PKGNAMESUFFIX=	-devel
-DISTNAME=	pkgtools-${DISTVERSION}
+DISTNAME=	pkgtools-pkgtools-${GITVERSION}

 
 MAINTAINER=	bryan@shatow.net
 COMMENT=	FreeBSD ports/packages management tool (devel version)
 
 LICENSE=	BSD
 
-FETCH_DEPENDS=	git:${PORTSDIR}/devel/git
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 
 CONFLICTS_INSTALL=	portupgrade-[0-9]*
 
-MANUAL_PACKAGE_BUILD=	troubles with distfile cache on pointyhat
+FETCH_ARGS=	-Fpr

+GITVERSION=	0449e52

 
 USE_RUBY=	yes
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
@@ -44,8 +45,6 @@ MLINKS=		pkgdb.1 pkg_which.1 \
 		portupgrade.1 portinstall.1 \
 		portsdb.1 ports_glob.1
 MANCOMPRESSED=	maybe
-NO_CHECKSUM=	yes
-GIT_REPO_URL=	http://github.com/pkgtools/pkgtools.git
 
 EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
@@ -55,20 +54,6 @@ INSTALL_TARGET=		install
 INSTALL_TARGET+=	install-doc
 .endif
 
-do-fetch:
-	@${MKDIR} ${_DISTDIR}/portupgrade
-	@(head=`git ls-remote -h ${GIT_REPO_URL} | \
-	    ${GREP} heads/master | ${AWK} '{print $$1}'`; \
-	    if [ ! -f "${_DISTDIR}/portupgrade/pkgtools-$${head}.tar.gz" ]; then \
-	    ${SETENV} ${FETCH_ENV} ${FETCH_BINARY} -m -o \
-	    "${_DISTDIR}/portupgrade/pkgtools-$${head}.tar.gz" ${MASTER_SITES}master \
-	    && ${LN} -sf "${_DISTDIR}/portupgrade/pkgtools-$${head}.tar.gz" \
-	    "${_DISTDIR}/portupgrade/latest"; fi)
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-	@tar -C ${WRKSRC}/ --strip-components 1 -xf ${_DISTDIR}/portupgrade/latest
-
 post-patch:	.SILENT
 	${REINPLACE_CMD} '/PREFIX/s:\(=[[:space:]]*\)\(.*/usr/local\):\1ENV["LOCALBASE"] || \2:' \
 		${WRKSRC}/lib/pkgdb.rb ${WRKSRC}/lib/pkgtools.rb
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
new file mode 100644
index 000000000000..905bf417f0f7
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -0,0 +1,16 @@
+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-0449e52.tar.gz) = 2256a41090e448359fb59a766aa4dd4706d89322ebce1d965e23170d7d7ef568

+SIZE (pkgtools-pkgtools-0449e52.tar.gz) = 99819

+SHA256 (pkgtools-pkgtools-dd66990.tar.gz) = 25ab5854ede4cbc8beeec89f043d118d3ab3ae17bdf364616520ddcbe9ad8e10

+SIZE (pkgtools-pkgtools-dd66990.tar.gz) = 101286