Date: Sun, 10 Apr 2016 09:54:25 +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: r412910 - in head: www/drraw www/havp www/nginx www/nginx-devel www/otrs www/py-graphite-web www/rt40 www/rt42 www/tomcat6 x11-wm/fvwm2 Message-ID: <201604100954.u3A9sPis046529@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Apr 10 09:54:25 2016 New Revision: 412910 URL: https://svnweb.freebsd.org/changeset/ports/412910 Log: Convert to @sample Modified: head/www/drraw/pkg-plist head/www/havp/pkg-plist head/www/nginx-devel/pkg-plist head/www/nginx/pkg-plist head/www/otrs/pkg-plist head/www/py-graphite-web/pkg-plist head/www/rt40/pkg-plist head/www/rt42/pkg-plist head/www/tomcat6/pkg-plist head/x11-wm/fvwm2/pkg-plist Modified: head/www/drraw/pkg-plist ============================================================================== --- head/www/drraw/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/drraw/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -1,6 +1,4 @@ -@unexec if cmp -s %D/%%CONFDIR%%/drraw.conf-dist %D/%%CONFDIR%%/drraw.conf; then rm -f %D/%%CONFDIR%%/drraw.conf; fi -%%CONFDIR%%/drraw.conf-dist -@exec if [ ! -f %D/%%CONFDIR%%/drraw.conf ]; then cp -p %D/%F %B/drraw.conf; fi +@sample %%CONFDIR%%/drraw.conf-dist %%CONFDIR%%/drraw.conf %%WWWDIR%%/drraw.cgi %%WWWDIR%%/icons/bomb.gif %%WWWDIR%%/icons/folder.gif Modified: head/www/havp/pkg-plist ============================================================================== --- head/www/havp/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/havp/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -1,7 +1,5 @@ sbin/havp -@unexec if cmp -s %D/etc/havp/havp.config %D/etc/havp/havp.config.default; then rm -f %D/etc/havp/havp.config; fi -etc/havp/havp.config.default -@exec [ -f %B/havp.config ] || cp %B/%f %B/havp.config +@sample etc/havp/havp.config.default etc/havp/havp.config @unexec [ ! -f %%RUN_DIR%%/havp.pid ] || %D/etc/rc.d/havp stop %%EXAMPLESDIR%%/blacklist.sample %%EXAMPLESDIR%%/templates/br/blacklist.html Modified: head/www/nginx-devel/pkg-plist ============================================================================== --- head/www/nginx-devel/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/nginx-devel/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -1,21 +1,11 @@ -@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; 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; 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; 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; fi -@unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi -%%ETCDIR%%/nginx.conf-dist -@exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi +@sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types +@sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf %%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 Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/nginx/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -1,21 +1,11 @@ -@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; 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; 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; 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; fi -@unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi -%%ETCDIR%%/nginx.conf-dist -@exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi +@sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types +@sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf %%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 Modified: head/www/otrs/pkg-plist ============================================================================== --- head/www/otrs/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/otrs/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -4,9 +4,7 @@ otrs/.fetchmailrc.dist otrs/.mailfilter.dist otrs/.procmailrc.dist otrs/ARCHIVE -@unexec if cmp -s %D/otrs/Kernel/Config.pm.dist %D/otrs/Kernel/Config.pm; then rm -f %D/otrs/Kernel/Config.pm; fi -otrs/Kernel/Config.pm.dist -@exec if [ ! -f %B/Config.pm ] ; then cp -p %D/%F %B/Config.pm; fi +@sample otrs/Kernel/Config.pm.dist otrs/Kernel/Config.pm otrs/Kernel/Config/Defaults.pm otrs/Kernel/Config/Files/CloudServices.xml otrs/Kernel/Config/Files/Daemon.xml Modified: head/www/py-graphite-web/pkg-plist ============================================================================== --- head/www/py-graphite-web/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/py-graphite-web/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -1,16 +1,8 @@ bin/build-index.sh -@unexec if cmp -s %D/etc/graphite/dashboard.conf.example %D/etc/graphite/dashboard.conf; then rm -f %D/etc/graphite/dashboard.conf; fi -etc/graphite/dashboard.conf.example -@exec if [ ! -f %D/etc/graphite/dashboard.conf ] ; then cp -p %D/%F %B/dashboard.conf; fi -@unexec if cmp -s %D/etc/graphite/graphTemplates.conf.example %D/etc/graphite/graphTemplates.conf; then rm -f %D/etc/graphite/graphTemplates.conf; fi -etc/graphite/graphTemplates.conf.example -@exec if [ ! -f %D/etc/graphite/graphTemplates.conf ] ; then cp -p %D/%F %B/graphTemplates.conf; fi -@unexec if cmp -s %D/etc/graphite/graphite.wsgi.example %D/etc/graphite/graphite.wsgi; then rm -f %D/etc/graphite/graphite.wsgi; fi -etc/graphite/graphite.wsgi.example -@exec if [ ! -f %D/etc/graphite/graphite.wsgi ] ; then cp -p %D/%F %B/graphite.wsgi; fi -@unexec if cmp -s %D/etc/graphite/local_settings.py.example %D/etc/graphite/local_settings.py; then rm -f %D/etc/graphite/local_settings.py; fi -etc/graphite/local_settings.py.example -@exec if [ ! -f %D/etc/graphite/local_settings.py ] ; then cp -p %D/%F %B/local_settings.py; fi +@sample etc/graphite/dashboard.conf.example etc/graphite/dashboard.conf +@sample etc/graphite/graphTemplates.conf.example etc/graphite/graphTemplates.conf +@sample etc/graphite/graphite.wsgi.example etc/graphite/graphite.wsgi +@sample etc/graphite/local_settings.py.example etc/graphite/local_settings.py %%DATADIR%%/examples/example-client.py %%DATADIR%%/examples/example-graphite-vhost.conf %%DATADIR%%/content/css/cli.css Modified: head/www/rt40/pkg-plist ============================================================================== --- head/www/rt40/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/rt40/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -5,9 +5,7 @@ bin/rt-mailgate @dir(root,rt,0750) %%RT_ETC_DIR%% @mode 0440 %%RT_ETC_DIR%%/RT_Config.pm -@unexec if cmp -s %D/%%RT_ETC_DIR%%/RT_SiteConfig.pm-dist %D/%%RT_ETC_DIR%%/RT_SiteConfig.pm ; then rm -f %D/%%RT_ETC_DIR%%/RT_SiteConfig.pm; fi -%%RT_ETC_DIR%%/RT_SiteConfig.pm-dist -@exec [ -f %B/RT_SiteConfig.pm ] || cp -p %D/%F %B/RT_SiteConfig.pm +@sample %%RT_ETC_DIR%%/RT_SiteConfig.pm-dist %%RT_ETC_DIR%%/RT_SiteConfig.pm %%RT_ETC_DIR%%/acl.Oracle %%RT_ETC_DIR%%/acl.Pg %%RT_ETC_DIR%%/acl.mysql Modified: head/www/rt42/pkg-plist ============================================================================== --- head/www/rt42/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/rt42/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -5,9 +5,7 @@ bin/rt-mailgate @dir(root,rt,0750) %%RT_ETC_DIR%% @mode 0440 %%RT_ETC_DIR%%/RT_Config.pm -@unexec if cmp -s %D/%%RT_ETC_DIR%%/RT_SiteConfig.pm-dist %D/%%RT_ETC_DIR%%/RT_SiteConfig.pm ; then rm -f %D/%%RT_ETC_DIR%%/RT_SiteConfig.pm; fi -%%RT_ETC_DIR%%/RT_SiteConfig.pm-dist -@exec [ -f %B/RT_SiteConfig.pm ] || cp -p %D/%F %B/RT_SiteConfig.pm +@sample %%RT_ETC_DIR%%/RT_SiteConfig.pm-dist %%RT_ETC_DIR%%/RT_SiteConfig.pm %%RT_ETC_DIR%%/acl.Oracle %%RT_ETC_DIR%%/acl.Pg %%RT_ETC_DIR%%/acl.mysql Modified: head/www/tomcat6/pkg-plist ============================================================================== --- head/www/tomcat6/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/www/tomcat6/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -16,27 +16,13 @@ %%T%%/bin/tomcat-native.tar.gz %%T%%/bin/tool-wrapper.sh %%T%%/bin/version.sh -@unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; fi -%%T%%/conf/catalina.policy.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/catalina.policy ] || cp %D/%%T%%/conf/catalina.policy.%%CONF_EXT%% %D/%%T%%/conf/catalina.policy -@unexec if cmp -s %D/%%T%%/conf/catalina.properties %D/%%T%%/conf/catalina.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.properties; fi -%%T%%/conf/catalina.properties.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/catalina.properties ] || cp %D/%%T%%/conf/catalina.properties.%%CONF_EXT%% %D/%%T%%/conf/catalina.properties -@unexec if cmp -s %D/%%T%%/conf/context.xml %D/%%T%%/conf/context.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/context.xml; else fi -%%T%%/conf/context.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/context.xml ] || cp %D/%%T%%/conf/context.xml.%%CONF_EXT%% %D/%%T%%/conf/context.xml -@unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; fi -%%T%%/conf/logging.properties.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/logging.properties ] || cp %D/%%T%%/conf/logging.properties.%%CONF_EXT%% %D/%%T%%/conf/logging.properties -@unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; fi -%%T%%/conf/server.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/server.xml ] || cp %D/%%T%%/conf/server.xml.%%CONF_EXT%% %D/%%T%%/conf/server.xml -@unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; fi -%%T%%/conf/tomcat-users.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/tomcat-users.xml ] || cp %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%% %D/%%T%%/conf/tomcat-users.xml -@unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; fi -%%T%%/conf/web.xml.%%CONF_EXT%% -@exec [ -f %D/%%T%%/conf/web.xml ] || cp %D/%%T%%/conf/web.xml.%%CONF_EXT%% %D/%%T%%/conf/web.xml +@sample %%T%%/conf/catalina.policy.%%CONF_EXT%%%%T %%/conf/catalina.policy +@sample %%T%%/conf/catalina.properties.%%CONF_EXT%% %%T%%/conf/catalina.properties +@sample %%T%%/conf/context.xml.%%CONF_EXT%% %%T%%/conf/context.xml +@sample %%T%%/conf/logging.properties.%%CONF_EXT%% %%T%%/conf/logging.properties +@sample %%T%%/conf/server.xml.%%CONF_EXT%% %%T%%/conf/server.xml +@sample %%T%%/conf/tomcat-users.xml.%%CONF_EXT%% %%T%%/conf/tomcat-users.xml +@sample %%T%%/conf/web.xml.%%CONF_EXT%% %%T%%/conf/web.xml %%T%%/lib/annotations-api.jar %%T%%/lib/catalina-ant.jar %%T%%/lib/catalina-ha.jar Modified: head/x11-wm/fvwm2/pkg-plist ============================================================================== --- head/x11-wm/fvwm2/pkg-plist Sun Apr 10 09:41:20 2016 (r412909) +++ head/x11-wm/fvwm2/pkg-plist Sun Apr 10 09:54:25 2016 (r412910) @@ -12,9 +12,7 @@ bin/fvwm-root bin/fvwm bin/fvwm2 bin/xpmroot -@unexec if cmp -s %D/etc/system.fvwm2rc %D/etc/system.fvwm2rc.dist; then rm -f %D/etc/system.fvwm2rc; fi -etc/system.fvwm2rc.dist -@exec [ -f %B/system.fvwm2rc ] || cp %B/%f %B/system.fvwm2rc +@sample etc/system.fvwm2rc.dist etc/system.fvwm2rc libexec/fvwm/%%FVWM_VERSION%%/FvwmAnimate libexec/fvwm/%%FVWM_VERSION%%/FvwmAudio libexec/fvwm/%%FVWM_VERSION%%/FvwmAuto
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604100954.u3A9sPis046529>