Date: Sun, 27 Oct 2013 16:53:40 GMT From: Kevin Zheng <kevinz5000@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183369: [maintainer-update] Add STAGE support for www/cgit Message-ID: <201310271653.r9RGreuo022444@oldred.freebsd.org> Resent-Message-ID: <201310271700.r9RH00Cn033949@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183369
>Category: ports
>Synopsis: [maintainer-update] Add STAGE support for www/cgit
>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 Oct 27 17:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Kevin Zheng
>Release: 9.2-RELEASE
>Organization:
>Environment:
FreeBSD sigma.local 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Give www/cgit STAGE support. The empty directory in "/var/cache/cgit" is required, but I'm not sure that this patch deals with it properly.
Tested to work on Redports.
>How-To-Repeat:
>Fix:
Apply the attached patch.
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 331780)
+++ Makefile (working copy)
@@ -29,7 +29,6 @@
SUB_LIST+= PORTNAME=${PORTNAME}
PLIST_SUB+= PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-NO_STAGE= yes
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
@@ -52,10 +51,9 @@
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}/
+ @${MKDIR} ${STAGEDIR}/${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${STAGEDIR}/${DOCSDIR}/
.endif
.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist (revision 331780)
+++ pkg-plist (working copy)
@@ -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,11 +11,11 @@
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%%
-@unexec rmdir /var/cache/%%PORTNAME%% 2>/dev/null || true
+@dirrmtry /var/cache/%%PORTNAME%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310271653.r9RGreuo022444>