svn commit: r389160 - head/www/red5

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Jun 11 09:21:00 UTC 2015 

Author: amdmi3
Date: Thu Jun 11 09:20:59 2015
New Revision: 389160
URL: https://svnweb.freebsd.org/changeset/ports/389160

Log:
  - Modernize plist: use @sample, @dir and @owner/@group
  
  PR:		200227
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (joris.dedieu at gmail.com, 3 weeks)

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

Modified: head/www/red5/Makefile
==============================================================================
--- head/www/red5/Makefile	Thu Jun 11 05:42:58 2015	(r389159)
+++ head/www/red5/Makefile	Thu Jun 11 09:20:59 2015	(r389160)
@@ -11,6 +11,7 @@ COMMENT=	Red5 is an Open Source Flash Se
 
 USE_JAVA=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_RC_SUBR=	red5
 WRKSRC=		${WRKDIR}/red5-server-1.0
 
@@ -19,6 +20,7 @@ RED5_GRP?=	${WWWGRP}
 RED5_HOME?=	${PREFIX}/${PORTNAME}
 
 SUB_LIST+=	RED5_USER=${RED5_USER} RED5_HOME=${RED5_HOME}
+PLIST_SUB=	RED5_USER=${RED5_USER} RED5_GRP=${RED5_GRP}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/host=0.0.0.0/host=127.0.0.1/' ${WRKSRC}/conf/red5.properties
@@ -44,8 +46,4 @@ do-install:
 	(cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${STAGEDIR}${RED5_HOME}/webapps)
 	(cd ${WRKSRC}/plugins && ${COPYTREE_SHARE} \* ${STAGEDIR}${RED5_HOME}/plugins)
 
-post-install:
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${RED5_USER}:${RED5_GRP} ${RED5_HOME}' \
-		>> ${TMPPLIST}
-
 .include <bsd.port.mk>

Modified: head/www/red5/pkg-plist
==============================================================================
--- head/www/red5/pkg-plist	Thu Jun 11 05:42:58 2015	(r389159)
+++ head/www/red5/pkg-plist	Thu Jun 11 09:20:59 2015	(r389160)
@@ -1,67 +1,27 @@
 @stopdaemon red5
- at unexec cmp -s %D/red5/conf/access.properties %D/red5/conf/access.properties.sample && rm -f %D/red5/conf/access.properties || true 2>/dev/null
-red5/conf/access.properties.sample
- at exec [ -f %D/red5/conf/access.properties ] || cp -p %D/red5/conf/access.properties.sample %D/red5/conf/access.properties
- at unexec cmp -s %D/red5/conf/build_standalone.properties %D/red5/conf/build_standalone.properties.sample && rm -f %D/red5/conf/build_standalone.properties || true 2>/dev/null
-red5/conf/build_standalone.properties.sample
- at exec [ -f %D/red5/conf/build_standalone.properties ] || cp -p %D/red5/conf/build_standalone.properties.sample %D/red5/conf/build_standalone.properties
- at unexec cmp -s %D/red5/conf/catalina.policy %D/red5/conf/catalina.policy.sample && rm -f %D/red5/conf/catalina.policy || true 2>/dev/null
-red5/conf/catalina.policy.sample
- at exec [ -f %D/red5/conf/catalina.policy ] || cp -p %D/red5/conf/catalina.policy.sample %D/red5/conf/catalina.policy
- at unexec cmp -s %D/red5/conf/context.xml %D/red5/conf/context.xml.sample && rm -f %D/red5/conf/context.xml || true 2>/dev/null
-red5/conf/context.xml.sample
- at exec [ -f %D/red5/conf/context.xml ] || cp -p %D/red5/conf/context.xml.sample %D/red5/conf/context.xml
- at unexec cmp -s %D/red5/conf/ehcache.xml %D/red5/conf/ehcache.xml.sample && rm -f %D/red5/conf/ehcache.xml || true 2>/dev/null
-red5/conf/ehcache.xml.sample
- at exec [ -f %D/red5/conf/ehcache.xml ] || cp -p %D/red5/conf/ehcache.xml.sample %D/red5/conf/ehcache.xml
- at unexec cmp -s %D/red5/conf/jee-container.xml %D/red5/conf/jee-container.xml.sample && rm -f %D/red5/conf/jee-container.xml || true 2>/dev/null
-red5/conf/jee-container.xml.sample
- at exec [ -f %D/red5/conf/jee-container.xml ] || cp -p %D/red5/conf/jee-container.xml.sample %D/red5/conf/jee-container.xml
- at unexec cmp -s %D/red5/conf/keystore.jmx %D/red5/conf/keystore.jmx.sample && rm -f %D/red5/conf/keystore.jmx || true 2>/dev/null
-red5/conf/keystore.jmx.sample
- at exec [ -f %D/red5/conf/keystore.jmx ] || cp -p %D/red5/conf/keystore.jmx.sample %D/red5/conf/keystore.jmx
- at unexec cmp -s %D/red5/conf/logback.xml %D/red5/conf/logback.xml.sample && rm -f %D/red5/conf/logback.xml || true 2>/dev/null
-red5/conf/logback.xml.sample
- at exec [ -f %D/red5/conf/logback.xml ] || cp -p %D/red5/conf/logback.xml.sample %D/red5/conf/logback.xml
- at unexec cmp -s %D/red5/conf/no-jee-container.xml %D/red5/conf/no-jee-container.xml.sample && rm -f %D/red5/conf/no-jee-container.xml || true 2>/dev/null
-red5/conf/no-jee-container.xml.sample
- at exec [ -f %D/red5/conf/no-jee-container.xml ] || cp -p %D/red5/conf/no-jee-container.xml.sample %D/red5/conf/no-jee-container.xml
- at unexec cmp -s %D/red5/conf/password.properties %D/red5/conf/password.properties.sample && rm -f %D/red5/conf/password.properties || true 2>/dev/null
-red5/conf/password.properties.sample
- at exec [ -f %D/red5/conf/password.properties ] || cp -p %D/red5/conf/password.properties.sample %D/red5/conf/password.properties
- at unexec cmp -s %D/red5/conf/quartz.properties %D/red5/conf/quartz.properties.sample && rm -f %D/red5/conf/quartz.properties || true 2>/dev/null
-red5/conf/quartz.properties.sample
- at exec [ -f %D/red5/conf/quartz.properties ] || cp -p %D/red5/conf/quartz.properties.sample %D/red5/conf/quartz.properties
- at unexec cmp -s %D/red5/conf/realm.properties %D/red5/conf/realm.properties.sample && rm -f %D/red5/conf/realm.properties || true 2>/dev/null
-red5/conf/realm.properties.sample
- at exec [ -f %D/red5/conf/realm.properties ] || cp -p %D/red5/conf/realm.properties.sample %D/red5/conf/realm.properties
- at unexec cmp -s %D/red5/conf/red5-common.xml %D/red5/conf/red5-common.xml.sample && rm -f %D/red5/conf/red5-common.xml || true 2>/dev/null
-red5/conf/red5-common.xml.sample
- at exec [ -f %D/red5/conf/red5-common.xml ] || cp -p %D/red5/conf/red5-common.xml.sample %D/red5/conf/red5-common.xml
- at unexec cmp -s %D/red5/conf/red5-core.xml %D/red5/conf/red5-core.xml.sample && rm -f %D/red5/conf/red5-core.xml || true 2>/dev/null
-red5/conf/red5-core.xml.sample
- at exec [ -f %D/red5/conf/red5-core.xml ] || cp -p %D/red5/conf/red5-core.xml.sample %D/red5/conf/red5-core.xml
- at unexec cmp -s %D/red5/conf/red5.globals %D/red5/conf/red5.globals.sample && rm -f %D/red5/conf/red5.globals || true 2>/dev/null
-red5/conf/red5.globals.sample
- at exec [ -f %D/red5/conf/red5.globals ] || cp -p %D/red5/conf/red5.globals.sample %D/red5/conf/red5.globals
- at unexec cmp -s %D/red5/conf/red5.policy %D/red5/conf/red5.policy.sample && rm -f %D/red5/conf/red5.policy || true 2>/dev/null
-red5/conf/red5.policy.sample
- at exec [ -f %D/red5/conf/red5.policy ] || cp -p %D/red5/conf/red5.policy.sample %D/red5/conf/red5.policy
- at unexec cmp -s %D/red5/conf/red5.properties %D/red5/conf/red5.properties.sample && rm -f %D/red5/conf/red5.properties || true 2>/dev/null
-red5/conf/red5.properties.sample
- at exec [ -f %D/red5/conf/red5.properties ] || cp -p %D/red5/conf/red5.properties.sample %D/red5/conf/red5.properties
- at unexec cmp -s %D/red5/conf/red5.xml %D/red5/conf/red5.xml.sample && rm -f %D/red5/conf/red5.xml || true 2>/dev/null
-red5/conf/red5.xml.sample
- at exec [ -f %D/red5/conf/red5.xml ] || cp -p %D/red5/conf/red5.xml.sample %D/red5/conf/red5.xml
- at unexec cmp -s %D/red5/conf/tomcat-users.xml %D/red5/conf/tomcat-users.xml.sample && rm -f %D/red5/conf/tomcat-users.xml || true 2>/dev/null
-red5/conf/tomcat-users.xml.sample
- at exec [ -f %D/red5/conf/tomcat-users.xml ] || cp -p %D/red5/conf/tomcat-users.xml.sample %D/red5/conf/tomcat-users.xml
- at unexec cmp -s %D/red5/conf/truststore.jmx %D/red5/conf/truststore.jmx.sample && rm -f %D/red5/conf/truststore.jmx || true 2>/dev/null
-red5/conf/truststore.jmx.sample
- at exec [ -f %D/red5/conf/truststore.jmx ] || cp -p %D/red5/conf/truststore.jmx.sample %D/red5/conf/truststore.jmx
- at unexec cmp -s %D/red5/conf/web.xml %D/red5/conf/web.xml.sample && rm -f %D/red5/conf/web.xml || true 2>/dev/null
-red5/conf/web.xml.sample
- at exec [ -f %D/red5/conf/web.xml ] || cp -p %D/red5/conf/web.xml.sample %D/red5/conf/web.xml
+ at owner %%RED5_USER%%
+ at group %%RED5_GRP%%
+ at sample red5/conf/access.properties.sample
+ at sample red5/conf/build_standalone.properties.sample
+ at sample red5/conf/catalina.policy.sample
+ at sample red5/conf/context.xml.sample
+ at sample red5/conf/ehcache.xml.sample
+ at sample red5/conf/jee-container.xml.sample
+ at sample red5/conf/keystore.jmx.sample
+ at sample red5/conf/logback.xml.sample
+ at sample red5/conf/no-jee-container.xml.sample
+ at sample red5/conf/password.properties.sample
+ at sample red5/conf/quartz.properties.sample
+ at sample red5/conf/realm.properties.sample
+ at sample red5/conf/red5-common.xml.sample
+ at sample red5/conf/red5-core.xml.sample
+ at sample red5/conf/red5.globals.sample
+ at sample red5/conf/red5.policy.sample
+ at sample red5/conf/red5.properties.sample
+ at sample red5/conf/red5.xml.sample
+ at sample red5/conf/tomcat-users.xml.sample
+ at sample red5/conf/truststore.jmx.sample
+ at sample red5/conf/web.xml.sample
 red5/lib/bcprov-jdk15on-1.47.jar
 red5/lib/com.springsource.javax.xml.stream-1.0.1.jar
 red5/lib/com.springsource.net.sf.cglib-2.2.0.jar
@@ -122,42 +82,22 @@ red5/plugins/tomcatplugin-1.3.jar
 red5/red5-server-1.0-bootstrap.jar
 red5/red5-server-1.0.jar
 red5/webapps/installer/AC_OETags.js
- at unexec cmp -s %D/red5/webapps/installer/WEB-INF/red5-web.properties %D/red5/webapps/installer/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/installer/WEB-INF/red5-web.properties || true 2>/dev/null
-red5/webapps/installer/WEB-INF/red5-web.properties.sample
- at exec [ -f %D/red5/webapps/installer/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/installer/WEB-INF/red5-web.properties.sample %D/red5/webapps/installer/WEB-INF/red5-web.properties
- at unexec cmp -s %D/red5/webapps/installer/WEB-INF/red5-web.xml %D/red5/webapps/installer/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/installer/WEB-INF/red5-web.xml || true 2>/dev/null
-red5/webapps/installer/WEB-INF/red5-web.xml.sample
- at exec [ -f %D/red5/webapps/installer/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/installer/WEB-INF/red5-web.xml.sample %D/red5/webapps/installer/WEB-INF/red5-web.xml
- at unexec cmp -s %D/red5/webapps/installer/WEB-INF/web.xml %D/red5/webapps/installer/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/installer/WEB-INF/web.xml || true 2>/dev/null
-red5/webapps/installer/WEB-INF/web.xml.sample
- at exec [ -f %D/red5/webapps/installer/WEB-INF/web.xml ] || cp -p %D/red5/webapps/installer/WEB-INF/web.xml.sample %D/red5/webapps/installer/WEB-INF/web.xml
+ at sample red5/webapps/installer/WEB-INF/red5-web.properties.sample
+ at sample red5/webapps/installer/WEB-INF/red5-web.xml.sample
+ at sample red5/webapps/installer/WEB-INF/web.xml.sample
 red5/webapps/installer/history/history.css
 red5/webapps/installer/history/history.js
 red5/webapps/installer/history/historyFrame.html
 red5/webapps/installer/index.html
 red5/webapps/installer/installer.swf
 red5/webapps/installer/playerProductInstall.swf
- at unexec cmp -s %D/red5/webapps/live/WEB-INF/red5-web.properties %D/red5/webapps/live/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/live/WEB-INF/red5-web.properties || true 2>/dev/null
-red5/webapps/live/WEB-INF/red5-web.properties.sample
- at exec [ -f %D/red5/webapps/live/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/live/WEB-INF/red5-web.properties.sample %D/red5/webapps/live/WEB-INF/red5-web.properties
- at unexec cmp -s %D/red5/webapps/live/WEB-INF/red5-web.xml %D/red5/webapps/live/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/live/WEB-INF/red5-web.xml || true 2>/dev/null
-red5/webapps/live/WEB-INF/red5-web.xml.sample
- at exec [ -f %D/red5/webapps/live/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/live/WEB-INF/red5-web.xml.sample %D/red5/webapps/live/WEB-INF/red5-web.xml
- at unexec cmp -s %D/red5/webapps/live/WEB-INF/web.xml %D/red5/webapps/live/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/live/WEB-INF/web.xml || true 2>/dev/null
-red5/webapps/live/WEB-INF/web.xml.sample
- at exec [ -f %D/red5/webapps/live/WEB-INF/web.xml ] || cp -p %D/red5/webapps/live/WEB-INF/web.xml.sample %D/red5/webapps/live/WEB-INF/web.xml
- at unexec cmp -s %D/red5/webapps/red5-default.xml %D/red5/webapps/red5-default.xml.sample && rm -f %D/red5/webapps/red5-default.xml || true 2>/dev/null
-red5/webapps/red5-default.xml.sample
- at exec [ -f %D/red5/webapps/red5-default.xml ] || cp -p %D/red5/webapps/red5-default.xml.sample %D/red5/webapps/red5-default.xml 
- at unexec cmp -s %D/red5/webapps/root/WEB-INF/red5-web.properties %D/red5/webapps/root/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/root/WEB-INF/red5-web.properties || true 2>/dev/null
-red5/webapps/root/WEB-INF/red5-web.properties.sample
- at exec [ -f %D/red5/webapps/root/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/root/WEB-INF/red5-web.properties.sample %D/red5/webapps/root/WEB-INF/red5-web.properties
- at unexec cmp -s %D/red5/webapps/root/WEB-INF/red5-web.xml %D/red5/webapps/root/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/root/WEB-INF/red5-web.xml || true 2>/dev/null
-red5/webapps/root/WEB-INF/red5-web.xml.sample
- at exec [ -f %D/red5/webapps/root/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/root/WEB-INF/red5-web.xml.sample %D/red5/webapps/root/WEB-INF/red5-web.xml
- at unexec cmp -s %D/red5/webapps/root/WEB-INF/web.xml %D/red5/webapps/root/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/root/WEB-INF/web.xml || true 2>/dev/null
-red5/webapps/root/WEB-INF/web.xml.sample
- at exec [ -f %D/red5/webapps/root/WEB-INF/web.xml ] || cp -p %D/red5/webapps/root/WEB-INF/web.xml.sample %D/red5/webapps/root/WEB-INF/web.xml
+ at sample red5/webapps/live/WEB-INF/red5-web.properties.sample
+ at sample red5/webapps/live/WEB-INF/red5-web.xml.sample
+ at sample red5/webapps/live/WEB-INF/web.xml.sample
+ at sample red5/webapps/red5-default.xml.sample
+ at sample red5/webapps/root/WEB-INF/red5-web.properties.sample
+ at sample red5/webapps/root/WEB-INF/red5-web.xml.sample
+ at sample red5/webapps/root/WEB-INF/web.xml.sample
 red5/webapps/root/biglogo.png
 red5/webapps/root/crossdomain.xml
 red5/webapps/root/demos/BallControl.html
@@ -202,15 +142,9 @@ red5/webapps/root/flvdemo.html
 red5/webapps/root/gc.jsp
 red5/webapps/root/index.html
 red5/webapps/root/logo.png
- at unexec cmp -s %D/red5/webapps/vod/WEB-INF/red5-web.properties %D/red5/webapps/vod/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/vod/WEB-INF/red5-web.properties || true 2>/dev/null
-red5/webapps/vod/WEB-INF/red5-web.properties.sample
- at exec [ -f %D/red5/webapps/vod/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/vod/WEB-INF/red5-web.properties.sample %D/red5/webapps/vod/WEB-INF/red5-web.properties
- at unexec cmp -s %D/red5/webapps/vod/WEB-INF/red5-web.xml %D/red5/webapps/vod/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/vod/WEB-INF/red5-web.xml || true 2>/dev/null
-red5/webapps/vod/WEB-INF/red5-web.xml.sample
- at exec [ -f %D/red5/webapps/vod/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/vod/WEB-INF/red5-web.xml.sample %D/red5/webapps/vod/WEB-INF/red5-web.xml
- at unexec cmp -s %D/red5/webapps/vod/WEB-INF/web.xml %D/red5/webapps/vod/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/vod/WEB-INF/web.xml || true 2>/dev/null
-red5/webapps/vod/WEB-INF/web.xml.sample
- at exec [ -f %D/red5/webapps/vod/WEB-INF/web.xml ] || cp -p %D/red5/webapps/vod/WEB-INF/web.xml.sample %D/red5/webapps/vod/WEB-INF/web.xml
+ at sample red5/webapps/vod/WEB-INF/red5-web.properties.sample
+ at sample red5/webapps/vod/WEB-INF/red5-web.xml.sample
+ at sample red5/webapps/vod/WEB-INF/web.xml.sample
 red5/webapps/vod/framework_4.5.1.21328.swf
 red5/webapps/vod/index.html
 red5/webapps/vod/miniplayer.swf
@@ -219,21 +153,23 @@ red5/webapps/vod/spark_4.5.1.21328.swf
 red5/webapps/vod/streams/red5.flv
 red5/webapps/vod/swfobject.js
 red5/webapps/vod/textLayout_2.0.0.232.swf
- at dirrmtry red5/conf
- at dirrmtry red5/lib
- at dirrmtry red5/log
- at dirrmtry red5/plugins
- at dirrmtry red5/webapps/installer/history
- at dirrmtry red5/webapps/installer/WEB-INF
- at dirrmtry red5/webapps/installer
- at dirrmtry red5/webapps/live/WEB-INF
- at dirrmtry red5/webapps/live
- at dirrmtry red5/webapps/root/demos/assets
- at dirrmtry red5/webapps/root/demos
- at dirrmtry red5/webapps/root/WEB-INF
- at dirrmtry red5/webapps/root
- at dirrmtry red5/webapps/vod/streams
- at dirrmtry red5/webapps/vod/WEB-INF
- at dirrmtry red5/webapps/vod
- at dirrmtry red5/webapps
- at dirrmtry red5
+ at dir red5/webapps/vod/streams
+ at dir red5/webapps/vod/WEB-INF
+ at dir red5/webapps/vod
+ at dir red5/webapps/root/demos/assets
+ at dir red5/webapps/root/demos
+ at dir red5/webapps/root/WEB-INF
+ at dir red5/webapps/root
+ at dir red5/webapps/live/WEB-INF
+ at dir red5/webapps/live
+ at dir red5/webapps/installer/history
+ at dir red5/webapps/installer/WEB-INF
+ at dir red5/webapps/installer
+ at dir red5/webapps
+ at dir red5/plugins
+ at dir red5/log
+ at dir red5/lib
+ at dir red5/conf
+ at dir red5
+ at owner
+ at group

More information about the svn-ports-head mailing list