1 files changed, 25 insertions, 21 deletions

diff --git a/devel/gitolite2/Makefile b/devel/gitolite2/Makefile
index 6be0bc999842..6c69040d5fd8 100644
--- a/devel/gitolite2/Makefile
+++ b/devel/gitolite2/Makefile
@@ -5,6 +5,7 @@ PORTVERSION=	2.3.1
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GH \
+		LOCAL/milki \
 		LOCAL/tdb
 PKGNAMESUFFIX=	2
 DISTNAME=	g-${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
@@ -23,7 +24,22 @@ GH_TAGNAME=	${GH_COMMIT}
 
 CONFLICTS=	gitolite-[^2]*
 
-USES=		perl5
+USES=		perl5	shebangfix
+SHEBANG_FILES=	hooks/common/update \
+	src/gl-admin-push \
+	src/gl-auth-command \
+	src/gl-compile-conf \
+	src/gl-conf-convert \
+	src/gl-dryrun \
+	src/gl-install \
+	src/gl-mirror-push \
+	src/gl-mirror-shell \
+	src/gl-query-rc \
+	src/gl-setup \
+	src/gl-setup-authkeys \
+	src/gl-time \
+	src/gl-tool \
+	src/sshkeys-lint
 
 SUB_FILES=	pkg-message
 
@@ -31,7 +47,6 @@ OPTIONS_DEFINE=	GITUSER
 
 GITUSER_DESC=	Create git user as gitolite provider
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGITUSER}
@@ -53,14 +68,6 @@ exec ${PREFIX}/libexec/gitolite/gl-setup \"\$$@\"\n
 post-patch:
 	@${ECHO} -e "${GLAUTHCOMMAND}" > ${WRKDIR}/auth-command
 	@${ECHO} -e "${GLSETUP}" > ${WRKDIR}/setup
-.for FILE in gl-admin-push gl-auth-command gl-compile-conf gl-conf-convert gl-mirror-push gl-mirror-shell gl-query-rc gl-setup gl-setup-authkeys gl-time gl-tool sshkeys-lint
-	@${REINPLACE_CMD} \
-		-Ee '1s|#!/usr/bin/perl|#!${PERL}|' \
-		${WRKSRC}/src/${FILE}
-.endfor
-	@${REINPLACE_CMD} \
-		-Ee '1s|#!/usr/bin/perl|#!${PERL}|' \
-		${WRKSRC}/hooks/common/update
 
 do-build:
 	echo "v${PORTVERSION}-0-g${GH_COMMIT}" > ${WRKSRC}/conf/VERSION
@@ -80,16 +87,13 @@ post-build:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 do-install:
-	${MKDIR} ${PREFIX}/libexec/gitolite
-	${INSTALL_SCRIPT} ${WRKSRC}/src/* ${PREFIX}/libexec/gitolite/
-	${MKDIR} ${DATADIR}/conf
-	${INSTALL_DATA} ${WRKSRC}/conf/* ${DATADIR}/conf
-	${MKDIR} ${DATADIR}/hooks
-	(cd ${WRKSRC}/hooks && ${COPYTREE_BIN} \* ${DATADIR}/hooks)
-	${INSTALL_SCRIPT} ${WRKDIR}/auth-command ${PREFIX}/bin/gl-auth-command
-	${INSTALL_SCRIPT} ${WRKDIR}/setup ${PREFIX}/bin/gl-setup
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gitolite
+	${INSTALL_SCRIPT} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/libexec/gitolite/
+	${MKDIR} ${STAGEDIR}${DATADIR}/conf
+	${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${DATADIR}/conf
+	${MKDIR} ${STAGEDIR}${DATADIR}/hooks
+	(cd ${WRKSRC}/hooks && ${COPYTREE_BIN} \* ${STAGEDIR}${DATADIR}/hooks)
+	${INSTALL_SCRIPT} ${WRKDIR}/auth-command ${STAGEDIR}${PREFIX}/bin/gl-auth-command
+	${INSTALL_SCRIPT} ${WRKDIR}/setup ${STAGEDIR}${PREFIX}/bin/gl-setup
 
 .include <bsd.port.mk>