Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 May 2014 18:14:56 GMT
From:      Joseph Benden <joe@thrallingpenguin.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/190378: [patch] Add staging support to www/red5
Message-ID:  <201405291814.s4TIEu9F002386@cgiserv.freebsd.org>
Resent-Message-ID: <201405291820.s4TIK0Ma090347@freefall.freebsd.org>

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

>Number:         190378
>Category:       ports
>Synopsis:       [patch] Add staging support to www/red5
>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 May 29 18:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Joseph Benden
>Release:        FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014     root@lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/red5.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/red5/Makefile b/www/red5/Makefile
index 23aa281..24d771c 100644
--- a/www/red5/Makefile
+++ b/www/red5/Makefile
@@ -20,7 +20,6 @@ RED5_HOME?=	${PREFIX}/${PORTNAME}
 
 SUB_LIST+=	RED5_USER=${RED5_USER} RED5_HOME=${RED5_HOME}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's/host=0.0.0.0/host=127.0.0.1/' ${WRKSRC}/conf/red5.properties
 	@${RM} ${WRKSRC}/conf/red5.properties.bak
@@ -37,23 +36,16 @@ post-patch:
 		${MV} ${WRKSRC}/webapps/red5-default.xml ${WRKSRC}/webapps/red5-default.xml.sample
 
 do-install:
-	${MKDIR} ${RED5_HOME}/conf ${RED5_HOME}/lib ${RED5_HOME}/webapps ${RED5_HOME}/log ${RED5_HOME}/plugins
-	${INSTALL} ${WRKSRC}/red5-server-1.0-bootstrap.jar ${RED5_HOME}
-	${INSTALL} ${WRKSRC}/red5-server-1.0.jar ${RED5_HOME}
-	(cd ${WRKSRC}/conf && ${COPYTREE_SHARE} \* ${RED5_HOME}/conf)
-	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${RED5_HOME}/lib)
-	(cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${RED5_HOME}/webapps)
-	(cd ${WRKSRC}/plugins && ${COPYTREE_SHARE} \* ${RED5_HOME}/plugins)
-	${CHOWN} -R  ${RED5_USER}:${RED5_GRP} ${RED5_HOME}
+	${MKDIR} ${STAGEDIR}${RED5_HOME}/conf ${STAGEDIR}${RED5_HOME}/lib ${STAGEDIR}${RED5_HOME}/webapps ${STAGEDIR}${RED5_HOME}/log ${STAGEDIR}${RED5_HOME}/plugins
+	${INSTALL} ${WRKSRC}/red5-server-1.0-bootstrap.jar ${STAGEDIR}${RED5_HOME}
+	${INSTALL} ${WRKSRC}/red5-server-1.0.jar ${STAGEDIR}${RED5_HOME}
+	(cd ${WRKSRC}/conf && ${COPYTREE_SHARE} \* ${STAGEDIR}${RED5_HOME}/conf)
+	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${RED5_HOME}/lib)
+	(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}
-	for conf in `find ${RED5_HOME}/conf -type f -regex '.*\.sample$$'` ; \
-	  do	[ -f $${conf%.sample} ] || ${CP} -p $$conf $${conf%.sample} ; \
-	  done
-	for conf in ${RED5_HOME}/webapps/root/WEB-INF/*.sample ${RED5_HOME}/webapps/installer/WEB-INF/*.sample ${RED5_HOME}/webapps/red5-default.xml.sample; \
-	  do	[ -f $${conf%.sample} ] || ${CP} -p $$conf $${conf%.sample} ; \
-	  done
 
 .include <bsd.port.mk>
diff --git a/www/red5/pkg-plist b/www/red5/pkg-plist
index 17d9337..b372764 100644
--- a/www/red5/pkg-plist
+++ b/www/red5/pkg-plist
@@ -1,67 +1,67 @@
 @stopdaemon red5
 @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
-@exec [ -f %D/red5/conf/access.properties ] || cp -p %D/red5/conf/access.properties.sample %D/red5/red5/conf/access.properties
+@exec [ -f %D/red5/conf/access.properties ] || cp -p %D/red5/conf/access.properties.sample %D/red5/conf/access.properties
 @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
-@exec [ -f %D/red5/conf/build_standalone.properties ] || cp -p %D/red5/conf/build_standalone.properties.sample %D/red5/red5/conf/build_standalone.properties
+@exec [ -f %D/red5/conf/build_standalone.properties ] || cp -p %D/red5/conf/build_standalone.properties.sample %D/red5/conf/build_standalone.properties
 @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
-@exec [ -f %D/red5/conf/catalina.policy ] || cp -p %D/red5/conf/catalina.policy.sample %D/red5/red5/conf/catalina.policy
+@exec [ -f %D/red5/conf/catalina.policy ] || cp -p %D/red5/conf/catalina.policy.sample %D/red5/conf/catalina.policy
 @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
-@exec [ -f %D/red5/conf/context.xml ] || cp -p %D/red5/conf/context.xml.sample %D/red5/red5/conf/context.xml
+@exec [ -f %D/red5/conf/context.xml ] || cp -p %D/red5/conf/context.xml.sample %D/red5/conf/context.xml
 @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
-@exec [ -f %D/red5/conf/ehcache.xml ] || cp -p %D/red5/conf/ehcache.xml.sample %D/red5/red5/conf/ehcache.xml
+@exec [ -f %D/red5/conf/ehcache.xml ] || cp -p %D/red5/conf/ehcache.xml.sample %D/red5/conf/ehcache.xml
 @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
-@exec [ -f %D/red5/conf/jee-container.xml ] || cp -p %D/red5/conf/jee-container.xml.sample %D/red5/red5/conf/jee-container.xml
+@exec [ -f %D/red5/conf/jee-container.xml ] || cp -p %D/red5/conf/jee-container.xml.sample %D/red5/conf/jee-container.xml
 @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
-@exec [ -f %D/red5/conf/keystore.jmx ] || cp -p %D/red5/conf/keystore.jmx.sample %D/red5/red5/conf/keystore.jmx
+@exec [ -f %D/red5/conf/keystore.jmx ] || cp -p %D/red5/conf/keystore.jmx.sample %D/red5/conf/keystore.jmx
 @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
-@exec [ -f %D/red5/conf/logback.xml ] || cp -p %D/red5/conf/logback.xml.sample %D/red5/red5/conf/logback.xml
+@exec [ -f %D/red5/conf/logback.xml ] || cp -p %D/red5/conf/logback.xml.sample %D/red5/conf/logback.xml
 @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
-@exec [ -f %D/red5/conf/no-jee-container.xml ] || cp -p %D/red5/conf/no-jee-container.xml.sample %D/red5/red5/conf/no-jee-container.xml
+@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
 @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
-@exec [ -f %D/red5/conf/password.properties ] || cp -p %D/red5/conf/password.properties.sample %D/red5/red5/conf/password.properties
+@exec [ -f %D/red5/conf/password.properties ] || cp -p %D/red5/conf/password.properties.sample %D/red5/conf/password.properties
 @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
-@exec [ -f %D/red5/conf/quartz.properties ] || cp -p %D/red5/conf/quartz.properties.sample %D/red5/red5/conf/quartz.properties
+@exec [ -f %D/red5/conf/quartz.properties ] || cp -p %D/red5/conf/quartz.properties.sample %D/red5/conf/quartz.properties
 @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
-@exec [ -f %D/red5/conf/realm.properties ] || cp -p %D/red5/conf/realm.properties.sample %D/red5/red5/conf/realm.properties
+@exec [ -f %D/red5/conf/realm.properties ] || cp -p %D/red5/conf/realm.properties.sample %D/red5/conf/realm.properties
 @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
-@exec [ -f %D/red5/conf/red5-common.xml ] || cp -p %D/red5/conf/red5-common.xml.sample %D/red5/red5/conf/red5-common.xml
+@exec [ -f %D/red5/conf/red5-common.xml ] || cp -p %D/red5/conf/red5-common.xml.sample %D/red5/conf/red5-common.xml
 @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
-@exec [ -f %D/red5/conf/red5-core.xml ] || cp -p %D/red5/conf/red5-core.xml.sample %D/red5/red5/conf/red5-core.xml
+@exec [ -f %D/red5/conf/red5-core.xml ] || cp -p %D/red5/conf/red5-core.xml.sample %D/red5/conf/red5-core.xml
 @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
-@exec [ -f %D/red5/conf/red5.globals ] || cp -p %D/red5/conf/red5.globals.sample %D/red5/red5/conf/red5.globals
+@exec [ -f %D/red5/conf/red5.globals ] || cp -p %D/red5/conf/red5.globals.sample %D/red5/conf/red5.globals
 @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
-@exec [ -f %D/red5/conf/red5.policy ] || cp -p %D/red5/conf/red5.policy.sample %D/red5/red5/conf/red5.policy
+@exec [ -f %D/red5/conf/red5.policy ] || cp -p %D/red5/conf/red5.policy.sample %D/red5/conf/red5.policy
 @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
-@exec [ -f %D/red5/conf/red5.properties ] || cp -p %D/red5/conf/red5.properties.sample %D/red5/red5/conf/red5.properties
+@exec [ -f %D/red5/conf/red5.properties ] || cp -p %D/red5/conf/red5.properties.sample %D/red5/conf/red5.properties
 @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
-@exec [ -f %D/red5/conf/red5.xml ] || cp -p %D/red5/conf/red5.xml.sample %D/red5/red5/conf/red5.xml
+@exec [ -f %D/red5/conf/red5.xml ] || cp -p %D/red5/conf/red5.xml.sample %D/red5/conf/red5.xml
 @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
-@exec [ -f %D/red5/conf/tomcat-users.xml ] || cp -p %D/red5/conf/tomcat-users.xml.sample %D/red5/red5/conf/tomcat-users.xml
+@exec [ -f %D/red5/conf/tomcat-users.xml ] || cp -p %D/red5/conf/tomcat-users.xml.sample %D/red5/conf/tomcat-users.xml
 @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
-@exec [ -f %D/red5/conf/truststore.jmx ] || cp -p %D/red5/conf/truststore.jmx.sample %D/red5/red5/conf/truststore.jmx
+@exec [ -f %D/red5/conf/truststore.jmx ] || cp -p %D/red5/conf/truststore.jmx.sample %D/red5/conf/truststore.jmx
 @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
-@exec [ -f %D/red5/conf/web.xml ] || cp -p %D/red5/conf/web.xml.sample %D/red5/red5/conf/web.xml
+@exec [ -f %D/red5/conf/web.xml ] || cp -p %D/red5/conf/web.xml.sample %D/red5/conf/web.xml
 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
@@ -124,13 +124,13 @@ red5/red5-server-1.0.jar
 red5/webapps/installer/AC_OETags.js
 @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
-@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/red5/webapps/installer/WEB-INF/red5-web.properties
+@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
 @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
-@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/red5/webapps/installer/WEB-INF/red5-web.xml
+@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
 @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
-@exec [ -f %D/red5/webapps/installer/WEB-INF/web.xml ] || cp -p %D/red5/webapps/installer/WEB-INF/web.xml.sample %D/red5/red5/webapps/installer/WEB-INF/web.xml
+@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
 red5/webapps/installer/history/history.css
 red5/webapps/installer/history/history.js
 red5/webapps/installer/history/historyFrame.html
@@ -139,25 +139,25 @@ red5/webapps/installer/installer.swf
 red5/webapps/installer/playerProductInstall.swf
 @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
-@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/red5/webapps/live/WEB-INF/red5-web.properties
+@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
 @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
-@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/red5/webapps/live/WEB-INF/red5-web.xml
+@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
 @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
-@exec [ -f %D/red5/webapps/live/WEB-INF/web.xml ] || cp -p %D/red5/webapps/live/WEB-INF/web.xml.sample %D/red5/red5/webapps/live/WEB-INF/web.xml
+@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
 @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
 @exec [ -f %D/red5/webapps/red5-default.xml ] || cp -p %D/red5/webapps/red5-default.xml.sample %D/red5/webapps/red5-default.xml 
 @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
-@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/red5/webapps/root/WEB-INF/red5-web.properties
+@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
 @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
-@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/red5/webapps/root/WEB-INF/red5-web.xml
+@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
 @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
-@exec [ -f %D/red5/webapps/root/WEB-INF/web.xml ] || cp -p %D/red5/webapps/root/WEB-INF/web.xml.sample %D/red5/red5/webapps/root/WEB-INF/web.xml
+@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
 red5/webapps/root/biglogo.png
 red5/webapps/root/crossdomain.xml
 red5/webapps/root/demos/BallControl.html
@@ -204,13 +204,13 @@ red5/webapps/root/index.html
 red5/webapps/root/logo.png
 @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
-@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/red5/webapps/vod/WEB-INF/red5-web.properties
+@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
 @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
-@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/red5/webapps/vod/WEB-INF/red5-web.xml
+@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
 @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
-@exec [ -f %D/red5/webapps/vod/WEB-INF/web.xml ] || cp -p %D/red5/webapps/vod/WEB-INF/web.xml.sample %D/red5/red5/webapps/vod/WEB-INF/web.xml
+@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
 red5/webapps/vod/framework_4.5.1.21328.swf
 red5/webapps/vod/index.html
 red5/webapps/vod/miniplayer.swf


>Release-Note:
>Audit-Trail:
>Unformatted:



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