Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Jan 2016 15:24:47 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406755 - head/www/tengine
Message-ID:  <201601201524.u0KFOlg4099131@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Jan 20 15:24:47 2016
New Revision: 406755
URL: https://svnweb.freebsd.org/changeset/ports/406755

Log:
  Cleanup plist:
  - Use @sample
  - use post*exec
  - Remove useless @exec
  - Remove useless @dir

Modified:
  head/www/tengine/Makefile
  head/www/tengine/pkg-plist

Modified: head/www/tengine/Makefile
==============================================================================
--- head/www/tengine/Makefile	Wed Jan 20 14:57:53 2016	(r406754)
+++ head/www/tengine/Makefile	Wed Jan 20 15:24:47 2016	(r406755)
@@ -4,7 +4,7 @@
 PORTNAME=	tengine
 PORTVERSION=	2.0.3
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 
 MAINTAINER=	ports@FreeBSD.org

Modified: head/www/tengine/pkg-plist
==============================================================================
--- head/www/tengine/pkg-plist	Wed Jan 20 14:57:53 2016	(r406754)
+++ head/www/tengine/pkg-plist	Wed Jan 20 15:24:47 2016	(r406755)
@@ -1,31 +1,17 @@
-@unexec if cmp -s %D/%%ETCDIR%%/fastcgi_params-dist %D/%%ETCDIR%%/fastcgi_params; then rm -f %D/%%ETCDIR%%/fastcgi_params; fi
-%%ETCDIR%%/fastcgi_params-dist
-@exec if [ ! -f %D/%%ETCDIR%%/fastcgi_params ] ; then cp -p %D/%F %B/fastcgi_params && chmod u+w %B/fastcgi_params; fi
+@sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params
 %%ETCDIR%%/koi-utf
 %%ETCDIR%%/koi-win
-@unexec if cmp -s %D/%%ETCDIR%%/scgi_params-dist %D/%%ETCDIR%%/scgi_params; then rm -f %D/%%ETCDIR%%/scgi_params; fi
-%%ETCDIR%%/scgi_params-dist
-@exec if [ ! -f %D/%%ETCDIR%%/scgi_params ] ; then cp -p %D/%F %B/scgi_params && chmod u+w %B/scgi_params; fi
-@unexec if cmp -s %D/%%ETCDIR%%/uwsgi_params-dist %D/%%ETCDIR%%/uwsgi_params; then rm -f %D/%%ETCDIR%%/uwsgi_params; fi
-%%ETCDIR%%/uwsgi_params-dist
-@exec if [ ! -f %D/%%ETCDIR%%/uwsgi_params ] ; then cp -p %D/%F %B/uwsgi_params  && chmod u+w %B/uwsgi_params; fi
+@sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
+@sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
 %%ETCDIR%%/win-utf
-@unexec if cmp -s %D/%%ETCDIR%%/mime.types-dist %D/%%ETCDIR%%/mime.types; then rm -f %D/%%ETCDIR%%/mime.types; fi
-%%ETCDIR%%/mime.types-dist
-@exec if [ ! -f %D/%%ETCDIR%%/mime.types ] ; then cp -p %D/%F %B/mime.types  && chmod u+w %B/mime.types; fi
-@unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi
-@dir %%ETCDIR%%
-%%ETCDIR%%/nginx.conf-dist
-@exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf && chmod u+w %B/nginx.conf; fi
-@exec if [ ! -d %%NGINX_TMPDIR%% ] ; then mkdir  %%NGINX_TMPDIR%%; fi
-%%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
+@sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types
+@sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf
+%%WWWDATA%%@postexec 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 %D/www/nginx-dist
-%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
-%%WWWDATA%%@dir www/nginx-dist
+%%WWWDATA%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
+%%WWWDATA%%@dir(,,755) www/nginx-dist
 %%ETCDIR%%/include/ddebug.h
 %%ETCDIR%%/include/nginx.h
 %%ETCDIR%%/include/ngx_alloc.h
@@ -198,8 +184,5 @@
 %%ETCDIR%%/modules/ngx_http_xslt_filter_module.so
 sbin/nginx
 sbin/dso_tool
-@unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi
 man/man8/nginx.8.gz
-@dir %%ETCDIR%%/modules
-@dir %%ETCDIR%%/include
 @dir %%NGINX_TMPDIR%%



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