Update to cgit 1.1, and update the included git to 2.10.2. While here,

simplify the plist and the pkg-message by assuming that the project
isn't going to change its name. Also, tweak the COMMENT and pkg-descr.

And lastly, take maintainership. Many thanks to Kevin for all his work
in looking after this port for nearly three-and-a-half years!

PR:		214791
Approved by:	outgoing maintainer (Kevin Zheng)

5 files changed, 30 insertions, 33 deletions

diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index 06fb3b2c92d8..0ff0c0836a34 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -1,21 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	cgit
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		https://www.kernel.org/pub/software/scm/git/:git
 DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
-		git-${GIT_VERSION}.tar.gz:git
+		git-${GIT_VERSION}${EXTRACT_SUFX}:git
 
-MAINTAINER=	kevinz5000@gmail.com
-COMMENT=	Hyperfast web frontend for Git repositories
+MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	Fast, lightweight web frontend for Git repositories
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PROJECTHOST=	git-core
-GIT_VERSION=	2.9.2
+GIT_VERSION=	2.10.2
 USES=		cpe gmake iconv shebangfix ssl tar:xz
 CPE_VENDOR=	lars_hjemli
 SHEBANG_FILES=	filters/html-converters/rst2html
@@ -26,8 +25,6 @@ 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
 
 SUB_FILES=	pkg-message
-SUB_LIST+=	PORTNAME=${PORTNAME}
-PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 PORTDOCS=	${PORTNAME}rc.5.txt
 
diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo
index 513e7098ec46..4aef6f94debd 100644
--- a/devel/cgit/distinfo
+++ b/devel/cgit/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1468856093
-SHA256 (cgit-1.0.tar.xz) = a89754610922f122468c791888ed6309a81fa0f3ae948d118284b673cb40704d
-SIZE (cgit-1.0.tar.xz) = 85924
-SHA256 (git-2.9.2.tar.gz) = 3cb09a3917c2d8150fc1708f3019cf99a8f0feee6cd61bba3797e3b2a85be9dc
-SIZE (git-2.9.2.tar.gz) = 5910696
+TIMESTAMP = 1479922408
+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
diff --git a/devel/cgit/files/pkg-message.in b/devel/cgit/files/pkg-message.in
index e2ee2a244dcd..9c3ab0761d21 100644
--- a/devel/cgit/files/pkg-message.in
+++ b/devel/cgit/files/pkg-message.in
@@ -1,5 +1,5 @@
 ---------------------------------------------------
-%%PORTNAME%% has been successfully installed.
+cgit has been successfully installed.
 
 You probably want to add a 'Directory' section for cgit, along the lines of:
 
diff --git a/devel/cgit/pkg-descr b/devel/cgit/pkg-descr
index 98926d524099..f705814c8abe 100644
--- a/devel/cgit/pkg-descr
+++ b/devel/cgit/pkg-descr
@@ -1,4 +1,4 @@
-Cgit is an attempt to create a fast web interface for the git scm, using
-a builtin cache to decrease server io-pressure.
+cgit is a fast web interface for the Git SCM, using a built-in cache to
+decrease server I/O pressure.
 
 WWW: http://git.zx2c4.com/cgit/about/
diff --git a/devel/cgit/pkg-plist b/devel/cgit/pkg-plist
index 0a8d031c60b1..106b25a97c3f 100644
--- a/devel/cgit/pkg-plist
+++ b/devel/cgit/pkg-plist
@@ -1,19 +1,19 @@
-lib/%%PORTNAME%%/filters/about-formatting.sh
-lib/%%PORTNAME%%/filters/commit-links.sh
-lib/%%PORTNAME%%/filters/email-gravatar.lua
-lib/%%PORTNAME%%/filters/email-gravatar.py
-lib/%%PORTNAME%%/filters/email-libravatar.lua
-lib/%%PORTNAME%%/filters/gentoo-ldap-authentication.lua
-lib/%%PORTNAME%%/filters/html-converters/man2html
-lib/%%PORTNAME%%/filters/html-converters/md2html
-lib/%%PORTNAME%%/filters/html-converters/rst2html
-lib/%%PORTNAME%%/filters/html-converters/txt2html
-lib/%%PORTNAME%%/filters/owner-example.lua
-lib/%%PORTNAME%%/filters/simple-authentication.lua
-lib/%%PORTNAME%%/filters/syntax-highlighting.py
-lib/%%PORTNAME%%/filters/syntax-highlighting.sh
-%%WWWDIR%%/%%PORTNAME%%.cgi
-%%WWWDIR%%/%%PORTNAME%%.css
-%%WWWDIR%%/%%PORTNAME%%.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/email-libravatar.lua
+lib/cgit/filters/gentoo-ldap-authentication.lua
+lib/cgit/filters/html-converters/man2html
+lib/cgit/filters/html-converters/md2html
+lib/cgit/filters/html-converters/rst2html
+lib/cgit/filters/html-converters/txt2html
+lib/cgit/filters/owner-example.lua
+lib/cgit/filters/simple-authentication.lua
+lib/cgit/filters/syntax-highlighting.py
+lib/cgit/filters/syntax-highlighting.sh
+%%WWWDIR%%/cgit.cgi
+%%WWWDIR%%/cgit.css
+%%WWWDIR%%/cgit.png
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/robots.txt