Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jul 2017 12:14:14 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444939 - in head/devel/gitolite: . files
Message-ID:  <201707031214.v63CEEWR081286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Jul  3 12:14:14 2017
New Revision: 444939
URL: https://svnweb.freebsd.org/changeset/ports/444939

Log:
  Update to 3.6.7 and take maintainership.
  
  Remove extra WWW line, only the first one is ever used.
  
  Sponsored by:	Absolight

Modified:
  head/devel/gitolite/Makefile   (contents, props changed)
  head/devel/gitolite/distinfo   (contents, props changed)
  head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split   (contents, props changed)
  head/devel/gitolite/pkg-descr   (contents, props changed)

Modified: head/devel/gitolite/Makefile
==============================================================================
--- head/devel/gitolite/Makefile	Mon Jul  3 11:26:14 2017	(r444938)
+++ head/devel/gitolite/Makefile	Mon Jul  3 12:14:14 2017	(r444939)
@@ -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}

Modified: head/devel/gitolite/distinfo
==============================================================================
--- head/devel/gitolite/distinfo	Mon Jul  3 11:26:14 2017	(r444938)
+++ head/devel/gitolite/distinfo	Mon Jul  3 12:14:14 2017	(r444939)
@@ -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

Modified: head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split
==============================================================================
--- head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split	Mon Jul  3 11:26:14 2017	(r444938)
+++ head/devel/gitolite/files/patch-src_triggers_post-compile_ssh-authkeys-split	Mon Jul  3 12:14:14 2017	(r444939)
@@ -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

Modified: head/devel/gitolite/pkg-descr
==============================================================================
--- head/devel/gitolite/pkg-descr	Mon Jul  3 11:26:14 2017	(r444938)
+++ head/devel/gitolite/pkg-descr	Mon Jul  3 12:14:14 2017	(r444939)
@@ -12,4 +12,3 @@ repository. It can also restrict who can push to what 
 very important in a corporate environment.
 
 WWW: https://github.com/sitaramc/gitolite
-WWW: http://milki.github.com/gitolite



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707031214.v63CEEWR081286>