From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 25 02:40:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 56B02A12 for ; Thu, 25 Apr 2013 02:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 276251AC0 for ; Thu, 25 Apr 2013 02:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3P2e11J075289 for ; Thu, 25 Apr 2013 02:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3P2e1dO075288; Thu, 25 Apr 2013 02:40:01 GMT (envelope-from gnats) Resent-Date: Thu, 25 Apr 2013 02:40:01 GMT Resent-Message-Id: <201304250240.r3P2e1dO075288@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, Michael Gmelin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CF8CF9FD for ; Thu, 25 Apr 2013 02:38:24 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.grem.de (outcast.grem.de [213.239.217.27]) by mx1.freebsd.org (Postfix) with SMTP id 2F9141AB7 for ; Thu, 25 Apr 2013 02:38:23 +0000 (UTC) Received: (qmail 98888 invoked by uid 0); 25 Apr 2013 02:38:23 -0000 Message-Id: <20130425023823.98887.qmail@mail.grem.de> Date: 25 Apr 2013 02:38:23 -0000 From: Michael Gmelin To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/178123: [PATCH] www/nginx: fix plist so it uses %D consistently Cc: osa@FreeBSD.org 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: Thu, 25 Apr 2013 02:40:01 -0000 >Number: 178123 >Category: ports >Synopsis: [PATCH] www/nginx: fix plist so it uses %D consistently >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 25 02:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Michael Gmelin >Release: FreeBSD 9.0-RELEASE amd64 >Organization: Grem Equity GmbH >Environment: System: FreeBSD bsd64 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: This patch fixes plist so it won't break when using pkgng. Note that using %D is important since pkg doesn't guarantee that @cwd matches real world pwd (it just used to be that way in the past). See here for details: http://lists.freebsd.org/pipermail/freebsd-ports/2013-April/082800.html Port maintainer (osa@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- nginx-1.2.8,1.patch begins here --- diff -ruN --exclude=CVS ../nginx.orig/pkg-plist ./pkg-plist --- ../nginx.orig/pkg-plist 2013-04-25 04:29:29.687467950 +0200 +++ ./pkg-plist 2013-04-25 04:30:49.792010567 +0200 @@ -18,12 +18,12 @@ %%ETCDIR%%/nginx.conf-dist @exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi @dirrmtry %%ETCDIR%% -%%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist +%%WWWDATA%%@exec mkdir -p -m 755 %D/www/nginx-dist %%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING %%WWWDATA%%www/nginx-dist/index.html %%WWWDATA%%www/nginx-dist/50x.html -%%WWWDATA%%@exec chmod a-w www/nginx-dist +%%WWWDATA%%@exec chmod a-w %D/www/nginx-dist %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi %%WWWDATA%%@dirrmtry www/nginx-dist sbin/nginx --- nginx-1.2.8,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: