svn commit: r320240 - head/ports-mgmt/portmaster

[Bryan Drewery]

Author: bdrewery
Date: Sat Jun  8 11:28:13 2013
New Revision: 320240
URL: http://svnweb.freebsd.org/changeset/ports/320240

Log:
  - Remove temporary WRKSRC hack
  - Rename distfile and fix checksum errors. These errors
    were due to renaming the upstream account, which changed
    which directory the distfile untarred in.
  - Shuffle MASTER_SITES so that FreeBSD.org and other more
    reliable mirrors come before github

Modified:
  head/ports-mgmt/portmaster/Makefile
  head/ports-mgmt/portmaster/distinfo

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Sat Jun  8 06:57:50 2013	(r320239)
+++ head/ports-mgmt/portmaster/Makefile	Sat Jun  8 11:28:13 2013	(r320240)
@@ -3,10 +3,10 @@
 PORTNAME=	portmaster
 PORTVERSION=	3.16
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	GH \
-		LOCAL/bdrewery/${PORTNAME}/ \
-  		http://mirror.shatow.net/freebsd/portmaster/
-DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
+MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
+  		http://mirror.shatow.net/freebsd/portmaster/ \
+		GH
+DISTNAME=	g-${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
 MAINTAINER=	bdrewery at FreeBSD.org
 COMMENT=	Manage your ports without external databases or languages
@@ -18,8 +18,6 @@ GH_ACCOUNT=	freebsd
 GH_COMMIT=	2a29846
 GH_TAGNAME=	${GH_COMMIT}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_PROJECT}-${GH_COMMIT}
-
 OPTIONS_DEFINE=	BASH ZSH
 
 PLIST_FILES=	sbin/portmaster etc/portmaster.rc.sample

Modified: head/ports-mgmt/portmaster/distinfo
==============================================================================
--- head/ports-mgmt/portmaster/distinfo	Sat Jun  8 06:57:50 2013	(r320239)
+++ head/ports-mgmt/portmaster/distinfo	Sat Jun  8 11:28:13 2013	(r320240)
@@ -1,2 +1,2 @@
-SHA256 (freebsd-portmaster-3.16-2a29846.tar.gz) = 0e8dbaaa286348c98c8429c8e934b6d6bffe6c7325095a54d56692325194ba6a
-SIZE (freebsd-portmaster-3.16-2a29846.tar.gz) = 44506
+SHA256 (g-freebsd-portmaster-3.16-2a29846.tar.gz) = 760719f1678c810abd447329b5ad4b451afcbecfa2e4d8452d25dc0fc5034844
+SIZE (g-freebsd-portmaster-3.16-2a29846.tar.gz) = 44499