Date: Sun, 27 Oct 2013 20:39:56 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331804 - head/devel/cgit Message-ID: <201310272039.r9RKdu00022652@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sun Oct 27 20:39:56 2013 New Revision: 331804 URL: http://svnweb.freebsd.org/changeset/ports/331804 Log: devel/cgit: allow staging - Allow staging [1] (based on) - Add DOCS option - Remove useless options.mk PR: ports/183369 Submitted by: Kevin Zheng <kevinz5000 gmail.com> (maintainer) Modified: head/devel/cgit/Makefile head/devel/cgit/pkg-plist Modified: head/devel/cgit/Makefile ============================================================================== --- head/devel/cgit/Makefile Sun Oct 27 20:27:20 2013 (r331803) +++ head/devel/cgit/Makefile Sun Oct 27 20:39:56 2013 (r331804) @@ -29,8 +29,8 @@ SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} PLIST_SUB+= PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -NO_STAGE= yes -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS + .include <bsd.port.pre.mk> post-extract: @@ -50,12 +50,7 @@ post-patch: .endif post-install: - @${MKDIR} /var/cache/${PORTNAME} - @${CHOWN} ${WWWOWN}:${WWWGRP} /var/cache/${PORTNAME} - @${CAT} ${PKGMESSAGE} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${DOCSDIR}/ -.endif + @${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${STAGEDIR}/${DOCSDIR}/ .include <bsd.port.post.mk> Modified: head/devel/cgit/pkg-plist ============================================================================== --- head/devel/cgit/pkg-plist Sun Oct 27 20:27:20 2013 (r331803) +++ head/devel/cgit/pkg-plist Sun Oct 27 20:39:56 2013 (r331804) @@ -1,8 +1,6 @@ %%WWWDIR%%/cgit.cgi %%WWWDIR%%/cgit.css %%WWWDIR%%/cgit.png -%%PORTDOCS%%%%DOCSDIR%%/cgitrc.5.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% lib/cgit/filters/about-formatting.sh lib/cgit/filters/commit-links.sh lib/cgit/filters/html-converters/man2html @@ -13,6 +11,8 @@ lib/cgit/filters/html-converters/rst2htm 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 @@ -20,4 +20,3 @@ lib/cgit/filters/syntax-highlighting.sh @dirrm %%WWWDIR%% @exec mkdir -p /var/cache/%%PORTNAME%% @exec chown %%WWWOWN%%:%%WWWGRP%% /var/cache/%%PORTNAME%% -@unexec rmdir /var/cache/%%PORTNAME%% 2>/dev/null || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310272039.r9RKdu00022652>