diff options
| -rw-r--r-- | devel/gitolite/Makefile | 13 | ||||
| -rw-r--r-- | devel/gitolite/distinfo | 4 | ||||
| -rw-r--r-- | devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split | 17 | ||||
| -rw-r--r-- | devel/gitolite/pkg-plist | 6 |
4 files changed, 29 insertions, 11 deletions
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile index 720bd84da518..fa45f03ff813 100644 --- a/devel/gitolite/Makefile +++ b/devel/gitolite/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ PORTNAME= gitolite -PORTVERSION= 3.6.1 -PORTREVISION= 1 +PORTVERSION= 3.6.4 +DISTVERSIONPREFIX=v PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= GH \ - LOCAL/milki \ - LOCAL/tdb +MASTER_SITES= GH MAINTAINER= ports@FreeBSD.org COMMENT= Access control layer on top of git @@ -20,7 +18,6 @@ RUN_DEPENDS= git>=0:${PORTSDIR}/devel/git \ USE_GITHUB= yes GH_ACCOUNT= sitaramc -GH_TAGNAME= 3455375 CONFLICTS= gitolite-[^3]* @@ -45,7 +42,7 @@ post-patch: -exec ${REINPLACE_CMD} -Ee 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} \; do-build: - echo "v${PORTVERSION}-0-g${GH_TAGNAME}" > ${WRKSRC}/src/VERSION + echo "${GH_TAGNAME}" > ${WRKSRC}/src/VERSION ${MKDIR} ${WRKSRC}/lib ${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/ ${RMDIR} ${WRKSRC}/src/lib @@ -63,7 +60,7 @@ do-install: do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo index 4fe5f74697e8..ce64019d8862 100644 --- a/devel/gitolite/distinfo +++ b/devel/gitolite/distinfo @@ -1,2 +1,2 @@ -SHA256 (sitaramc-gitolite-3.6.1-3455375_GH0.tar.gz) = 007d7f171a1985b01689619ec60434dfaf355c5415a51e139de199cc11012df5 -SIZE (sitaramc-gitolite-3.6.1-3455375_GH0.tar.gz) = 165504 +SHA256 (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 15b19181dcc00233e4d031f07d769cf930e93963a925a71d684748068f38dd63 +SIZE (sitaramc-gitolite-v3.6.4_GH0.tar.gz) = 180619 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 new file mode 100644 index 000000000000..277e8830fe71 --- /dev/null +++ b/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split @@ -0,0 +1,17 @@ +--- src/triggers/post-compile/ssh-authkeys-split.orig 2015-11-01 12:01:20 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 + +@@ -60,7 +60,7 @@ do + while read line + do + echo "$line" > $SKD/$base@$seq.pub +- (( seq++ )) ++ seq=$(( $seq + 1 )) + done < $k + + # now delete the original file diff --git a/devel/gitolite/pkg-plist b/devel/gitolite/pkg-plist index 5440b8fe2016..8fccd918bbf7 100644 --- a/devel/gitolite/pkg-plist +++ b/devel/gitolite/pkg-plist @@ -23,6 +23,7 @@ bin/gitolite %%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 @@ -30,6 +31,7 @@ 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 @@ -37,6 +39,7 @@ libexec/gitolite/VREF/refex-expr libexec/gitolite/check-g2-compat libexec/gitolite/commands/D libexec/gitolite/commands/access +libexec/gitolite/commands/config libexec/gitolite/commands/create libexec/gitolite/commands/creator libexec/gitolite/commands/desc @@ -50,6 +53,7 @@ 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 @@ -86,4 +90,4 @@ libexec/gitolite/triggers/repo-specific-hooks libexec/gitolite/triggers/set-default-roles libexec/gitolite/triggers/upstream %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/README.markdown |