diff options
| -rw-r--r-- | devel/gitolite/Makefile | 20 | ||||
| -rw-r--r-- | devel/gitolite/distinfo | 6 | ||||
| -rw-r--r-- | devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split | 10 | ||||
| -rw-r--r-- | devel/gitolite/pkg-descr | 1 |
4 files changed, 12 insertions, 25 deletions
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile index a87bc67433bf..c15099d9b672 100644 --- a/devel/gitolite/Makefile +++ b/devel/gitolite/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ PORTNAME= gitolite -PORTVERSION= 3.6.6 DISTVERSIONPREFIX=v +DISTVERSION= 3.6.7 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= GH -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mat@FreeBSD.org COMMENT= Access control layer on top of git LICENSE= GPLv2 @@ -16,15 +15,18 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= git>=0:devel/git \ p5-JSON>=0:converters/p5-JSON +USES= cpe perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= sitaramc CONFLICTS= gitolite-[^3]* -USES= cpe perl5 CPE_VENDOR= sitaram_chamarty NO_ARCH= yes +SHEBANG_REGEX= .* +bash_CMD= /bin/sh + SUB_FILES= pkg-message OPTIONS_DEFINE= GITUSER DOCS @@ -33,14 +35,6 @@ OPTIONS_SUB= yes GITUSER_DESC= Create git user as gitolite provider GITUSER_VARS= USERS=git GROUPS=git -post-patch: - @${FIND} ${WRKSRC} \ - -exec ${GREP} -qs \#\!/usr/bin/perl {} \; \ - -exec ${REINPLACE_CMD} -Ee 's|#!/usr/bin/perl|#!${PERL}|' {} \; - @${FIND} ${WRKSRC} \ - -exec ${GREP} -qs \#\!/bin/bash {} \; \ - -exec ${REINPLACE_CMD} -Ee 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} \; - do-build: echo "${GH_TAGNAME}" > ${WRKSRC}/src/VERSION ${MKDIR} ${WRKSRC}/lib @@ -56,7 +50,7 @@ post-build: do-install: (cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite) (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/) - ${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite + ${RLN} -s ${STAGEDIR}${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo index 614b0ad32827..47de404336d9 100644 --- a/devel/gitolite/distinfo +++ b/devel/gitolite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473435815 -SHA256 (sitaramc-gitolite-v3.6.6_GH0.tar.gz) = 6971db70cf1393bf864cab569adbbd2a71f777f095d13447079a2463901b031f -SIZE (sitaramc-gitolite-v3.6.6_GH0.tar.gz) = 183469 +TIMESTAMP = 1499082012 +SHA256 (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = f75d15bb438986b77bd8aeda7839dcd3624ae9d09dbfce245c00b906de8dbdc5 +SIZE (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = 186298 diff --git a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split index 6afcda2ac10f..3a367d644072 100644 --- a/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split +++ b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split @@ -1,12 +1,6 @@ ---- src/triggers/post-compile/ssh-authkeys-split.orig 2016-02-20 12:48:57 UTC +--- src/triggers/post-compile/ssh-authkeys-split.orig 2017-07-02 14:01:25 UTC +++ src/triggers/post-compile/ssh-authkeys-split -@@ -1,4 +1,4 @@ --#!/usr/local/bin/bash -+#!/bin/sh - - # split multi-key files into separate keys like ssh-authkeys likes - -@@ -64,7 +64,7 @@ do +@@ -66,7 +66,7 @@ do echo 1>&2 "ssh-authkeys-split: bad line $seq in keydir/$k" rm -f $f fi diff --git a/devel/gitolite/pkg-descr b/devel/gitolite/pkg-descr index 7f4fa4147a11..89a4b8eb40e1 100644 --- a/devel/gitolite/pkg-descr +++ b/devel/gitolite/pkg-descr @@ -12,4 +12,3 @@ repository. It can also restrict who can push to what branch or tag, which is very important in a corporate environment. WWW: https://github.com/sitaramc/gitolite -WWW: http://milki.github.com/gitolite |