From owner-svn-ports-all@freebsd.org Wed Jan 20 15:24:49 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F6B7A8910C; Wed, 20 Jan 2016 15:24:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0087C1370; Wed, 20 Jan 2016 15:24:48 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0KFOlwO099133; Wed, 20 Jan 2016 15:24:47 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0KFOlg4099131; Wed, 20 Jan 2016 15:24:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201601201524.u0KFOlg4099131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 20 Jan 2016 15:24:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406755 - head/www/tengine X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2016 15:24:49 -0000 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%%