From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 27 17:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AD622495 for ; Sun, 27 Oct 2013 17:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8DEAE20CE for ; Sun, 27 Oct 2013 17:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RH00HU033950 for ; Sun, 27 Oct 2013 17:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9RH00Cn033949; Sun, 27 Oct 2013 17:00:00 GMT (envelope-from gnats) Resent-Date: Sun, 27 Oct 2013 17:00:00 GMT Resent-Message-Id: <201310271700.r9RH00Cn033949@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kevin Zheng Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 263803B7 for ; Sun, 27 Oct 2013 16:53:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE3D120A8 for ; Sun, 27 Oct 2013 16:53:40 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9RGre2R022447 for ; Sun, 27 Oct 2013 16:53:40 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9RGreuo022444; Sun, 27 Oct 2013 16:53:40 GMT (envelope-from nobody) Message-Id: <201310271653.r9RGreuo022444@oldred.freebsd.org> Date: Sun, 27 Oct 2013 16:53:40 GMT From: Kevin Zheng To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/183369: [maintainer-update] Add STAGE support for www/cgit X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Oct 2013 17:00:00 -0000 >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 .include @@ -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 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: