svn commit: r356404 - head/net/serviio

[Alexander Leidinger]

Author: netchild
Date: Tue Jun  3 20:15:47 2014
New Revision: 356404
URL: http://svnweb.freebsd.org/changeset/ports/356404
QAT: https://qat.redports.org/buildarchive/r356404/

Log:
  - stage-ify
  - fix plist

Modified:
  head/net/serviio/Makefile
  head/net/serviio/pkg-plist

Modified: head/net/serviio/Makefile
==============================================================================
--- head/net/serviio/Makefile	Tue Jun  3 20:06:55 2014	(r356403)
+++ head/net/serviio/Makefile	Tue Jun  3 20:15:47 2014	(r356404)
@@ -3,7 +3,7 @@
 
 PORTNAME=	serviio
 PORTVERSION=	1.4.1.2
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	http://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz
@@ -29,26 +29,18 @@ EXTRACT_AFTER_ARGS=--exclude junit.jar	\
 USERS=	dlna
 GROUPS=	dlna
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${JAVAJARDIR}/${PORTNAME}/plugins
-	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${JAVAJARDIR}/${PORTNAME}/
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugins
+	${INSTALL_DATA} ${WRKSRC}/lib/*.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 .for f in application-profiles profiles log4j
-	${INSTALL_DATA} ${WRKSRC}/config/$f.xml ${ETCDIR}/$f.dist.xml
-	${TEST} -e ${ETCDIR}/$f.xml || \
-		${INSTALL_DATA} ${WRKSRC}/config/$f.xml ${ETCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/config/$f.xml \
+		${STAGEDIR}${ETCDIR}/$f.dist.xml
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/console-log4j.properties	\
-		${ETCDIR}/console-log4j.dist.properties
-	${TEST} -e ${ETCDIR}/console-log4.dist.properties || \
-		${INSTALL_DATA} ${FILESDIR}/console-log4j.properties ${ETCDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKDIR}/serviio-console ${PREFIX}/bin
-
-post-install:
-	# =========================================================
-	@${FMT} ${PKGMESSAGE}
-	# =========================================================
+		${STAGEDIR}${ETCDIR}/console-log4j.dist.properties
+	${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKDIR}/serviio-console ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/net/serviio/pkg-plist
==============================================================================
--- head/net/serviio/pkg-plist	Tue Jun  3 20:06:55 2014	(r356403)
+++ head/net/serviio/pkg-plist	Tue Jun  3 20:15:47 2014	(r356404)
@@ -29,6 +29,7 @@ bin/serviio-console
 %%JAVAJARDIR%%/serviio/sbbi-upnp.jar
 %%JAVAJARDIR%%/serviio/serviio-client.jar
 %%JAVAJARDIR%%/serviio/serviio-media-browser.jar
+%%JAVAJARDIR%%/serviio/serviio-media-browser-web.jar
 %%JAVAJARDIR%%/serviio/serviio.jar
 %%JAVAJARDIR%%/serviio/slf4j-api.jar
 %%JAVAJARDIR%%/serviio/slf4j-log4j12.jar
@@ -41,12 +42,12 @@ bin/serviio-console
 @unexec cmp %D/%%ETCDIR%%/profiles.xml %D/%%ETCDIR%%/profiles.dist.xml && rm -f %D/%%ETCDIR%%/profiles.xml || echo Modified profiles.xml remains in %D/%%ETCDIR%%
 @unexec cmp %D/%%ETCDIR%%/log4j.xml %D/%%ETCDIR%%/log4j.dist.xml && rm -f %D/%%ETCDIR%%/log4j.xml || echo Modified log4j.xml remains in %D/%%ETCDIR%%
 @unexec cmp %D/%%ETCDIR%%/console-log4j.properties %D/%%ETCDIR%%/console-log4j.dist.properties && rm -f %D/%%ETCDIR%%/console-log4j.properties || echo Modified console-log4j.properties remains in %D/%%ETCDIR%%
- at exec [ -f %D/%%ETCDIR%%/application-profiles.xml ] || cp -v %D/%%ETCDIR%%/application-profiles.dist.xml %D/%%ETCDIR%%/application-profiles.xml
- at exec [ -f %D/%%ETCDIR%%/profiles.xml ] || cp -v %D/%%ETCDIR%%/profiles.dist.xml %D/%%ETCDIR%%/profiles.xml
- at exec [ -f %D/%%ETCDIR%%/log4j.xml ] || cp -v %D/%%ETCDIR%%/log4j.dist.xml %D/%%ETCDIR%%/log4j.xml
- at exec [ -f %D/%%ETCDIR%%/console-log4j.properties ] || cp -v %D/%%ETCDIR%%/console-log4j.dist.properties %D/%%ETCDIR%%/console-log4j.properties
 %%ETCDIR%%/profiles.dist.xml
 %%ETCDIR%%/log4j.dist.xml
 %%ETCDIR%%/application-profiles.dist.xml
 %%ETCDIR%%/console-log4j.dist.properties
+ at exec [ -f %D/%%ETCDIR%%/application-profiles.xml ] || cp -v %D/%%ETCDIR%%/application-profiles.dist.xml %D/%%ETCDIR%%/application-profiles.xml
+ at exec [ -f %D/%%ETCDIR%%/profiles.xml ] || cp -v %D/%%ETCDIR%%/profiles.dist.xml %D/%%ETCDIR%%/profiles.xml
+ at exec [ -f %D/%%ETCDIR%%/log4j.xml ] || cp -v %D/%%ETCDIR%%/log4j.dist.xml %D/%%ETCDIR%%/log4j.xml
+ at exec [ -f %D/%%ETCDIR%%/console-log4j.properties ] || cp -v %D/%%ETCDIR%%/console-log4j.dist.properties %D/%%ETCDIR%%/console-log4j.properties
 @dirrmtry %%ETCDIR%%