From owner-svn-ports-all@FreeBSD.ORG Mon Jun 2 22:41:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BC17202; Mon, 2 Jun 2014 22:41:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BADD2CE3; Mon, 2 Jun 2014 22:41:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s52MfC2o066825; Mon, 2 Jun 2014 22:41:12 GMT (envelope-from milki@svn.freebsd.org) Received: (from milki@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s52MfC1w066824; Mon, 2 Jun 2014 22:41:12 GMT (envelope-from milki@svn.freebsd.org) Message-Id: <201406022241.s52MfC1w066824@svn.freebsd.org> From: Jonathan Chu Date: Mon, 2 Jun 2014 22:41:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356257 - head/devel/gitolite2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jun 2014 22:41:12 -0000 Author: milki Date: Mon Jun 2 22:41:11 2014 New Revision: 356257 URL: http://svnweb.freebsd.org/changeset/ports/356257 QAT: https://qat.redports.org/buildarchive/r356257/ Log: Add stagedir support to devel/gitolite2 - stagedir support - milki local distfiles - USES=shebangfix Approved by: swills (mentor) Modified: head/devel/gitolite2/Makefile Modified: head/devel/gitolite2/Makefile ============================================================================== --- head/devel/gitolite2/Makefile Mon Jun 2 22:37:02 2014 (r356256) +++ head/devel/gitolite2/Makefile Mon Jun 2 22:41:11 2014 (r356257) @@ -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 .if ${PORT_OPTIONS:MGITUSER} @@ -53,14 +68,6 @@ exec ${PREFIX}/libexec/gitolite/gl-setup 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