svn commit: r333780 - head/devel/gitolite2

[Steve Wills]

Author: swills
Date: Thu Nov 14 17:59:11 2013
New Revision: 333780
URL: http://svnweb.freebsd.org/changeset/ports/333780

Log:
  - Update to 2.3.1_1
  - Fix package name collision
  - Use github master site
  
  PR:		ports/183382
  Submitted by:	milki <milki at rescomp.berkeley.edu> (maintainer)

Modified:
  head/devel/gitolite2/Makefile
  head/devel/gitolite2/distinfo   (contents, props changed)
  head/devel/gitolite2/pkg-plist   (contents, props changed)

Modified: head/devel/gitolite2/Makefile
==============================================================================
--- head/devel/gitolite2/Makefile	Thu Nov 14 17:46:39 2013	(r333779)
+++ head/devel/gitolite2/Makefile	Thu Nov 14 17:59:11 2013	(r333780)
@@ -2,10 +2,12 @@
 
 PORTNAME=	gitolite
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://milki.github.io/${PORTNAME}/ \
+MASTER_SITES=	GH \
 		LOCAL/tdb
 PKGNAMESUFFIX=	2
+DISTNAME=	g-${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
 MAINTAINER=	milki at rescomp.berkeley.edu
 COMMENT=	An access control layer on top of git
@@ -14,7 +16,11 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
 
-LATEST_LINK=	gitolite2
+USE_GITHUB=	yes
+GH_ACCOUNT=	sitaramc
+GH_COMMIT=	912a8bd
+GH_TAGNAME=	${GH_COMMIT}
+
 CONFLICTS=	gitolite-[^2]*
 
 USES=		perl5
@@ -57,6 +63,7 @@ post-patch:
 		${WRKSRC}/hooks/common/update
 
 do-build:
+	echo "v${PORTVERSION}-0-g${GH_COMMIT}" > ${WRKSRC}/conf/VERSION
 	-@${RM} ${WRKSRC}/src/gl-system-install
 	@${REINPLACE_CMD} \
 		-E 's%^GL_PACKAGE_CONF=.*%GL_PACKAGE_CONF=${DATADIR}/conf;%' \

Modified: head/devel/gitolite2/distinfo
==============================================================================
--- head/devel/gitolite2/distinfo	Thu Nov 14 17:46:39 2013	(r333779)
+++ head/devel/gitolite2/distinfo	Thu Nov 14 17:59:11 2013	(r333780)
@@ -1,2 +1,2 @@
-SHA256 (gitolite-2.3.1.tar.gz) = 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82
-SIZE (gitolite-2.3.1.tar.gz) = 255807
+SHA256 (g-sitaramc-gitolite-2.3.1-912a8bd.tar.gz) = 41e0bde3ea3eb76ec18ccc8c74fd7b915683334ced75fbd467ead42ea761650d
+SIZE (g-sitaramc-gitolite-2.3.1-912a8bd.tar.gz) = 255662

Modified: head/devel/gitolite2/pkg-plist
==============================================================================
--- head/devel/gitolite2/pkg-plist	Thu Nov 14 17:46:39 2013	(r333779)
+++ head/devel/gitolite2/pkg-plist	Thu Nov 14 17:59:11 2013	(r333780)
@@ -31,4 +31,3 @@ libexec/gitolite/sshkeys-lint
 @dirrm %%DATADIR%%/hooks
 @dirrm %%DATADIR%%
 @dirrm libexec/gitolite
-%%GITUSER%%@dirrmtry git