4 files changed, 27 insertions, 37 deletions

diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index 19c621f57e18..04f963757395 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cgit
-PORTVERSION=	0.9.2
-PORTREVISION=	3
+PORTVERSION=	0.10.1
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		GOOGLE_CODE:git
@@ -10,47 +9,38 @@ DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
 		git-${GIT_VERSION}.tar.gz:git
 
 MAINTAINER=	kevinz5000@gmail.com
-COMMENT=	Fast web frontend for Git repositories
+COMMENT=	Hyperfast web frontend for Git repositories
 
 LICENSE=	GPLv2
 
 PROJECTHOST=	git-core
-GIT_VERSION=	1.8.2.3
-USE_BZIP2=	yes
-USES=		gmake iconv shebangfix
+GIT_VERSION=	1.9.0
+USES=		gmake iconv shebangfix tar:bzip2
 SHEBANG_FILES=	filters/html-converters/resources/markdown.pl
-USE_OPENSSL=	yes
+
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ARGS+=	CGIT_SCRIPT_PATH=${WWWDIR} \
-		CGIT_CONFIG=${PREFIX}/etc/cgitrc NO_GETTEXT=1
 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
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME}
 PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-OPTIONS_DEFINE=	DOCS
+PORTDOCS=	${PORTNAME}rc.5.txt
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/git
 	@${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^CC =/d' -e '/^CFLAGS =/d' \
-		-e '/^LDFLAGS =/d' ${WRKSRC}/git/Makefile \
-		${WRKSRC}/git/Makefile
-	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
-		-e 's,-Igit,-I.,g' ${WRKSRC}/Makefile
-.if empty(ICONV_LIB)
-	@${REINPLACE_CMD} -e '/NEEDS_LIBICONV = YesPlease/d' \
-		-e '/OLD_ICONV = YesPlease/d' \
-		${WRKSRC}/git/config.mak.uname
-.endif
+	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/git/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${STAGEDIR}/${DOCSDIR}/
+	@${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo
index 57160a9fd748..642fd67eb891 100644
--- a/devel/cgit/distinfo
+++ b/devel/cgit/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cgit-0.9.2.tar.bz2) = 165dc09e1334416029c3dba0c957fe8e872abad85f459d4a040631dd4dab411a
-SIZE (cgit-0.9.2.tar.bz2) = 84881
-SHA256 (git-1.8.2.3.tar.gz) = ba8d42d47b0955b17905af0133b01ab8e3f28f0e39b9967ec446403c0b49991f
-SIZE (git-1.8.2.3.tar.gz) = 4405610
+SHA256 (cgit-0.10.1.tar.bz2) = 152a4317d25a8fa2632432bba6155b8d99ef7c9ca69dfcf49ca682fd4fbf7f1d
+SIZE (cgit-0.10.1.tar.bz2) = 94665
+SHA256 (git-1.9.0.tar.gz) = de3097fdc36d624ea6cf4bb853402fde781acdb860f12152c5eb879777389882
+SIZE (git-1.9.0.tar.gz) = 4839724
diff --git a/devel/cgit/files/pkg-message.in b/devel/cgit/files/pkg-message.in
index ac77ea940629..e2ee2a244dcd 100644
--- a/devel/cgit/files/pkg-message.in
+++ b/devel/cgit/files/pkg-message.in
@@ -1,12 +1,11 @@
 ---------------------------------------------------
 %%PORTNAME%% has been successfully installed.
 
-Now you need to change your webserver configuration
-as follows:
+You probably want to add a 'Directory' section for cgit, along the lines of:
 
   <Directory "%%WWWDIR%%/">
       AllowOverride None
-      Options ExecCGI
+      Options +ExecCGI
       Order allow,deny
       Allow from all
   </Directory>
diff --git a/devel/cgit/pkg-plist b/devel/cgit/pkg-plist
index 08b67beb365c..a03a093ad76e 100644
--- a/devel/cgit/pkg-plist
+++ b/devel/cgit/pkg-plist
@@ -1,22 +1,23 @@
-%%WWWDIR%%/cgit.cgi
-%%WWWDIR%%/cgit.css
-%%WWWDIR%%/cgit.png
 lib/cgit/filters/about-formatting.sh
 lib/cgit/filters/commit-links.sh
+lib/cgit/filters/email-gravatar.lua
+lib/cgit/filters/email-gravatar.py
 lib/cgit/filters/html-converters/man2html
 lib/cgit/filters/html-converters/md2html
 lib/cgit/filters/html-converters/resources/markdown.pl
 lib/cgit/filters/html-converters/resources/rst-template.txt
 lib/cgit/filters/html-converters/rst2html
 lib/cgit/filters/html-converters/txt2html
+lib/cgit/filters/simple-authentication.lua
 lib/cgit/filters/syntax-highlighting.py
 lib/cgit/filters/syntax-highlighting.sh
-%%PORTDOCS%%%%DOCSDIR%%/cgitrc.5.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%WWWDIR%%/cgit.cgi
+%%WWWDIR%%/cgit.css
+%%WWWDIR%%/cgit.png
+%%WWWDIR%%/favicon.ico
+%%WWWDIR%%/robots.txt
+@dirrm %%WWWDIR%%
 @dirrm lib/cgit/filters/html-converters/resources
 @dirrm lib/cgit/filters/html-converters
 @dirrm lib/cgit/filters
 @dirrm lib/cgit
-@dirrm %%WWWDIR%%
-@exec mkdir -p /var/cache/%%PORTNAME%%
-@exec chown %%WWWOWN%%:%%WWWGRP%% /var/cache/%%PORTNAME%%