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 | 18 | ||||
| -rw-r--r-- | devel/gitolite/pkg-plist | 17 |
4 files changed, 41 insertions, 20 deletions
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile index 76e2a6cfd58f..d508528b23aa 100644 --- a/devel/gitolite/Makefile +++ b/devel/gitolite/Makefile @@ -2,8 +2,7 @@ PORTNAME= gitolite DISTVERSIONPREFIX=v -DISTVERSION= 3.6.7 -PORTREVISION= 1 +DISTVERSION= 3.6.8 PORTEPOCH= 1 CATEGORIES= devel @@ -30,14 +29,17 @@ bash_CMD= /bin/sh SUB_FILES= pkg-message -OPTIONS_DEFINE= GITUSER DOCS +OPTIONS_DEFINE= GITUSER DOCS CONTRIB +OPTIONS_DEFAULT= CONTRIB OPTIONS_SUB= yes +CONTRIB_DESC= Install additionnal contrib files GITUSER_DESC= Create git user as gitolite provider + GITUSER_VARS= USERS=git GROUPS=git post-patch: - @${REINPLACE_CMD} -i '' -e 's,#!/usr/bin/perl,#!${PERL},' \ + @${REINPLACE_CMD} -e 's,#!/usr/bin/perl,#!${PERL},' \ ${WRKSRC}/src/lib/Gitolite/Hooks/*.pm do-build: @@ -47,10 +49,7 @@ do-build: ${RMDIR} ${WRKSRC}/src/lib ${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/ ${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/ - -post-build: - ${FIND} ${WRKSRC} -name "*.bak" -delete - ${FIND} ${WRKSRC} -name "*.orig" -delete + ${FIND} ${WRKSRC} '(' -name '*.bak' -o -name '*.orig' ')' -delete do-install: (cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite) @@ -62,4 +61,9 @@ do-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} +do-install-CONTRIB-on: + @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/share/vim + (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + ${MV} ${STAGEDIR}${DATADIR}/vim ${STAGEDIR}${PREFIX}/share/vim/vimfiles + .include <bsd.port.mk> diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo index 47de404336d9..39640adfa77a 100644 --- a/devel/gitolite/distinfo +++ b/devel/gitolite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499082012 -SHA256 (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = f75d15bb438986b77bd8aeda7839dcd3624ae9d09dbfce245c00b906de8dbdc5 -SIZE (sitaramc-gitolite-v3.6.7_GH0.tar.gz) = 186298 +TIMESTAMP = 1531381584 +SHA256 (sitaramc-gitolite-v3.6.8_GH0.tar.gz) = 4c5d66964b2881221915f1751ae5e64a89266f8943abf5efd457672374f03edf +SIZE (sitaramc-gitolite-v3.6.8_GH0.tar.gz) = 197551 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 3a367d644072..fca5efb02366 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,11 +1,11 @@ ---- src/triggers/post-compile/ssh-authkeys-split.orig 2017-07-02 14:01:25 UTC +--- src/triggers/post-compile/ssh-authkeys-split.orig 2018-07-12 07:50:58 UTC +++ src/triggers/post-compile/ssh-authkeys-split -@@ -66,7 +66,7 @@ do - echo 1>&2 "ssh-authkeys-split: bad line $seq in keydir/$k" - rm -f $f - fi +@@ -73,7 +73,7 @@ do + seq=0 + while read line + do - (( seq++ )) -+ seq=$(( $seq + 1 )) - done < $k - - # now delete the original file ++ seq=$(( $seq + 1 )) + [ -z "$line" ] && continue + f=$SKD/$base@$seq.pub + echo "$line" > $f diff --git a/devel/gitolite/pkg-plist b/devel/gitolite/pkg-plist index 3db4fee98f14..84a7cc671027 100644 --- a/devel/gitolite/pkg-plist +++ b/devel/gitolite/pkg-plist @@ -40,6 +40,7 @@ libexec/gitolite/check-g2-compat libexec/gitolite/commands/1plus1 libexec/gitolite/commands/D libexec/gitolite/commands/access +libexec/gitolite/commands/compile-template-data libexec/gitolite/commands/config libexec/gitolite/commands/create libexec/gitolite/commands/creator @@ -93,3 +94,19 @@ libexec/gitolite/triggers/set-default-roles libexec/gitolite/triggers/upstream %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/README.markdown +%%CONTRIB%%%%DATADIR%%/commands/compile-1 +%%CONTRIB%%%%DATADIR%%/commands/ukm +%%CONTRIB%%%%DATADIR%%/hooks/repo-specific/save-push-signatures +%%CONTRIB%%%%DATADIR%%/lib/Apache/gitolite.conf +%%CONTRIB%%%%DATADIR%%/lib/Gitolite/Triggers/RedmineUserAlias.pm +%%CONTRIB%%%%DATADIR%%/t/ukm.t +%%CONTRIB%%%%DATADIR%%/triggers/IP-check +%%CONTRIB%%%%DATADIR%%/triggers/file_mirror +%%CONTRIB%%%%DATADIR%%/utils/ad_groups.sh +%%CONTRIB%%%%DATADIR%%/utils/gitolite-local +%%CONTRIB%%%%DATADIR%%/utils/ipa_groups.pl +%%CONTRIB%%%%DATADIR%%/utils/ldap_groups.sh +%%CONTRIB%%%%DATADIR%%/utils/rc-format-v3.4 +%%CONTRIB%%%%DATADIR%%/utils/testconf +%%CONTRIB%%share/vim/vimfiles/indent/gitolite.vim +%%CONTRIB%%share/vim/vimfiles/syntax/gitolite.vim |