Date: Sun, 2 Mar 2014 23:31:41 GMT From: Kevin Zheng <kevinz5000@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187211: [maintainer-update] Update devel/cgit to 0.10.1 Message-ID: <201403022331.s22NVfxF099223@cgiserv.freebsd.org> Resent-Message-ID: <201403022340.s22Ne0ZM071808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187211 >Category: ports >Synopsis: [maintainer-update] Update devel/cgit to 0.10.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 02 23:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Kevin Zheng >Release: 10.0-RELEASE >Organization: >Environment: FreeBSD epsilon.local 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update devel/cgit to 0.10.1. While here, - Update COMMENT - Add LICENSE_FILE - Bump to upstream recommended Git version (1.9.0) - Clean up unnecessary use of pre/post inclusion - Remove old patches - Respect DOCS option - Update pkg-message 0.10.1 brings inline Lua filter support, but don't enable it in this port yet because I haven't gotten a chance to mess around with it. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index 19c621f..39e1bce 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,20 +9,23 @@ 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 +LICENSE_FILE= ${WRKSRC}/COPYING PROJECTHOST= git-core -GIT_VERSION= 1.8.2.3 +GIT_VERSION= 1.9.0 USE_BZIP2= yes USES= gmake iconv shebangfix 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 \ + NO_GETTEXT=1 NO_LUA=1 prefix=${PREFIX} SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} @@ -31,26 +33,23 @@ PLIST_SUB+= PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - 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 + -e '/OLD_ICONV = YesPlease/d' \ + ${WRKSRC}/git/config.mak.uname .endif +.include <bsd.port.options.mk> + post-install: +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${STAGEDIR}/${DOCSDIR}/ +.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo index 57160a9..642fd67 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 ac77ea9..e2ee2a2 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 08b67be..7bb8490 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/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/syntax-highlighting.py -lib/cgit/filters/syntax-highlighting.sh -%%PORTDOCS%%%%DOCSDIR%%/cgitrc.5.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@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%% +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/html-converters/man2html +lib/%%PORTNAME%%/filters/html-converters/md2html +lib/%%PORTNAME%%/filters/html-converters/resources/markdown.pl +lib/%%PORTNAME%%/filters/html-converters/resources/rst-template.txt +lib/%%PORTNAME%%/filters/html-converters/rst2html +lib/%%PORTNAME%%/filters/html-converters/txt2html +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 +%%WWWDIR%%/favicon.ico +%%WWWDIR%%/robots.txt +@dirrmtry %%WWWDIR%% +@dirrmtry lib/%%PORTNAME%%/filters/html-converters/resources +@dirrmtry lib/%%PORTNAME%%/filters/html-converters +@dirrmtry lib/%%PORTNAME%%/filters +@dirrmtry lib/%%PORTNAME%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403022331.s22NVfxF099223>