Index: head/devel/gitolite/Makefile =================================================================== --- head/devel/gitolite/Makefile (revision 474494) +++ head/devel/gitolite/Makefile (revision 474495) @@ -1,65 +1,69 @@ # $FreeBSD$ PORTNAME= gitolite DISTVERSIONPREFIX=v -DISTVERSION= 3.6.7 -PORTREVISION= 1 +DISTVERSION= 3.6.8 PORTEPOCH= 1 CATEGORIES= devel MAINTAINER= mat@FreeBSD.org COMMENT= Access control layer on top of git LICENSE= GPLv2 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]* CPE_VENDOR= sitaram_chamarty NO_ARCH= yes SHEBANG_REGEX= .* 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: echo "${GH_TAGNAME}" > ${WRKSRC}/src/VERSION ${MKDIR} ${WRKSRC}/lib ${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/ ${RMDIR} ${WRKSRC}/src/lib ${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/ ${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/ + ${FIND} ${WRKSRC} '(' -name '*.bak' -o -name '*.orig' ')' -delete -post-build: - ${FIND} ${WRKSRC} -name "*.bak" -delete - ${FIND} ${WRKSRC} -name "*.orig" -delete - do-install: (cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite) (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/) ${RLN} -s ${STAGEDIR}${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${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 Index: head/devel/gitolite/distinfo =================================================================== --- head/devel/gitolite/distinfo (revision 474494) +++ head/devel/gitolite/distinfo (revision 474495) @@ -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 Index: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split =================================================================== --- head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split (revision 474494) +++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split (revision 474495) @@ -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 Index: head/devel/gitolite/pkg-plist =================================================================== --- head/devel/gitolite/pkg-plist (revision 474494) +++ head/devel/gitolite/pkg-plist (revision 474495) @@ -1,95 +1,112 @@ bin/gitolite %%SITE_PERL%%/Gitolite/Cache.pm %%SITE_PERL%%/Gitolite/Common.pm %%SITE_PERL%%/Gitolite/Conf.pm %%SITE_PERL%%/Gitolite/Conf/Explode.pm %%SITE_PERL%%/Gitolite/Conf/Load.pm %%SITE_PERL%%/Gitolite/Conf/Store.pm %%SITE_PERL%%/Gitolite/Conf/Sugar.pm %%SITE_PERL%%/Gitolite/Easy.pm %%SITE_PERL%%/Gitolite/Hooks/PostUpdate.pm %%SITE_PERL%%/Gitolite/Hooks/Update.pm %%SITE_PERL%%/Gitolite/Rc.pm %%SITE_PERL%%/Gitolite/Setup.pm %%SITE_PERL%%/Gitolite/Test.pm %%SITE_PERL%%/Gitolite/Test/Tsh.pm %%SITE_PERL%%/Gitolite/Triggers.pm %%SITE_PERL%%/Gitolite/Triggers/Alias.pm %%SITE_PERL%%/Gitolite/Triggers/AutoCreate.pm %%SITE_PERL%%/Gitolite/Triggers/CpuTime.pm %%SITE_PERL%%/Gitolite/Triggers/Kindergarten.pm %%SITE_PERL%%/Gitolite/Triggers/Mirroring.pm %%SITE_PERL%%/Gitolite/Triggers/Motd.pm %%SITE_PERL%%/Gitolite/Triggers/RefexExpr.pm %%SITE_PERL%%/Gitolite/Triggers/RepoUmask.pm %%SITE_PERL%%/Gitolite/Triggers/Shell.pm %%SITE_PERL%%/Gitolite/Triggers/TProxy.pm %%SITE_PERL%%/Gitolite/Triggers/Writable.pm libexec/gitolite/VERSION libexec/gitolite/VREF/COUNT libexec/gitolite/VREF/EMAIL-CHECK libexec/gitolite/VREF/FILETYPE libexec/gitolite/VREF/MAX_NEWBIN_SIZE libexec/gitolite/VREF/MERGE-CHECK libexec/gitolite/VREF/NAME_NC libexec/gitolite/VREF/VOTES libexec/gitolite/VREF/lock libexec/gitolite/VREF/partial-copy libexec/gitolite/VREF/refex-expr 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 libexec/gitolite/commands/desc libexec/gitolite/commands/fork libexec/gitolite/commands/git-annex-shell libexec/gitolite/commands/git-config libexec/gitolite/commands/help libexec/gitolite/commands/htpasswd libexec/gitolite/commands/info libexec/gitolite/commands/list-dangling-repos libexec/gitolite/commands/lock libexec/gitolite/commands/mirror libexec/gitolite/commands/motd libexec/gitolite/commands/option libexec/gitolite/commands/owns libexec/gitolite/commands/perms libexec/gitolite/commands/print-default-rc libexec/gitolite/commands/push libexec/gitolite/commands/readme libexec/gitolite/commands/rsync libexec/gitolite/commands/sshkeys-lint libexec/gitolite/commands/sskm libexec/gitolite/commands/sudo libexec/gitolite/commands/svnserve libexec/gitolite/commands/symbolic-ref libexec/gitolite/commands/who-pushed libexec/gitolite/commands/writable libexec/gitolite/convert-gitosis-conf libexec/gitolite/gitolite libexec/gitolite/gitolite-shell libexec/gitolite/syntactic-sugar/continuation-lines libexec/gitolite/syntactic-sugar/keysubdirs-as-groups libexec/gitolite/syntactic-sugar/macros libexec/gitolite/syntactic-sugar/refex-expr libexec/gitolite/triggers/bg libexec/gitolite/triggers/expand-deny-messages libexec/gitolite/triggers/partial-copy libexec/gitolite/triggers/post-compile/create-with-reference libexec/gitolite/triggers/post-compile/ssh-authkeys libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users libexec/gitolite/triggers/post-compile/ssh-authkeys-split libexec/gitolite/triggers/post-compile/update-description-file libexec/gitolite/triggers/post-compile/update-git-configs libexec/gitolite/triggers/post-compile/update-git-daemon-access-list libexec/gitolite/triggers/post-compile/update-gitweb-access-list libexec/gitolite/triggers/post-compile/update-gitweb-daemon-from-options libexec/gitolite/triggers/renice libexec/gitolite/triggers/repo-specific-hooks 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