Skip site navigation (1)Skip section navigation (2)
Date:      25 Apr 2013 02:38:23 -0000
From:      Michael Gmelin <freebsd@grem.de>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        osa@FreeBSD.org
Subject:   ports/178123: [PATCH] www/nginx: fix plist so it uses %D consistently
Message-ID:  <20130425023823.98887.qmail@mail.grem.de>
Resent-Message-ID: <201304250240.r3P2e1dO075288@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130425023823.98887.qmail>