Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Nov 2016 20:49:50 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427459 - in head/devel/cgit: . files
Message-ID:  <201611302049.uAUKnokA028380@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Wed Nov 30 20:49:50 2016
New Revision: 427459
URL: https://svnweb.freebsd.org/changeset/ports/427459

Log:
  Update included git to 2.11.0 (and bump PORTREVISION for it). Also,
  enable verbose build, use OPTIONS helpers, and update the suggested
  Apache config block.

Modified:
  head/devel/cgit/Makefile
  head/devel/cgit/distinfo
  head/devel/cgit/files/pkg-message.in

Modified: head/devel/cgit/Makefile
==============================================================================
--- head/devel/cgit/Makefile	Wed Nov 30 20:37:56 2016	(r427458)
+++ head/devel/cgit/Makefile	Wed Nov 30 20:49:50 2016	(r427459)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cgit
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		https://www.kernel.org/pub/software/scm/git/:git
@@ -14,7 +15,7 @@ COMMENT=	Fast, lightweight web frontend 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GIT_VERSION=	2.10.2
+GIT_VERSION=	2.11.0
 USES=		cpe gmake iconv shebangfix ssl tar:xz
 CPE_VENDOR=	lars_hjemli
 SHEBANG_FILES=	filters/html-converters/rst2html
@@ -22,7 +23,7 @@ SHEBANG_FILES=	filters/html-converters/r
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MAKE_ARGS+=	CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \
-		prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1
+		prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 V=1
 
 SUB_FILES=	pkg-message
 
@@ -41,8 +42,10 @@ post-patch:
 		${WRKSRC}/git/Makefile
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	@${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi
 
 .include <bsd.port.mk>

Modified: head/devel/cgit/distinfo
==============================================================================
--- head/devel/cgit/distinfo	Wed Nov 30 20:37:56 2016	(r427458)
+++ head/devel/cgit/distinfo	Wed Nov 30 20:49:50 2016	(r427459)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1479922408
+TIMESTAMP = 1480538696
 SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890
 SIZE (cgit-1.1.tar.xz) = 86268
-SHA256 (git-2.10.2.tar.xz) = 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671
-SIZE (git-2.10.2.tar.xz) = 4106108
+SHA256 (git-2.11.0.tar.xz) = 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b
+SIZE (git-2.11.0.tar.xz) = 4197984

Modified: head/devel/cgit/files/pkg-message.in
==============================================================================
--- head/devel/cgit/files/pkg-message.in	Wed Nov 30 20:37:56 2016	(r427458)
+++ head/devel/cgit/files/pkg-message.in	Wed Nov 30 20:49:50 2016	(r427459)
@@ -1,13 +1,12 @@
 ---------------------------------------------------
 cgit has been successfully installed.
 
-You probably want to add a 'Directory' section for cgit, along the lines of:
+To enable cgit in Apache, use something like the following:
 
   <Directory "%%WWWDIR%%/">
       AllowOverride None
       Options +ExecCGI
-      Order allow,deny
-      Allow from all
+      Require all granted 
   </Directory>
 
 Documentation and sample configuration can be found



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