diff options
author | netchild <netchild@FreeBSD.org> | 2014-06-04 04:15:47 +0800 |
---|---|---|
committer | netchild <netchild@FreeBSD.org> | 2014-06-04 04:15:47 +0800 |
commit | 081507295b582b0b4c3ac05f1f3035a4c2f84574 (patch) | |
tree | c419c78d825e1425d001d5e47223ede1d597fa07 /net | |
parent | 19adc3eb738595f723daa0c6e8706832ad43bfef (diff) | |
download | freebsd-ports-gnome-081507295b582b0b4c3ac05f1f3035a4c2f84574.tar.gz freebsd-ports-gnome-081507295b582b0b4c3ac05f1f3035a4c2f84574.tar.zst freebsd-ports-gnome-081507295b582b0b4c3ac05f1f3035a4c2f84574.zip |
- stage-ify
- fix plist
Diffstat (limited to 'net')
-rw-r--r-- | net/serviio/Makefile | 28 | ||||
-rw-r--r-- | net/serviio/pkg-plist | 9 |
2 files changed, 15 insertions, 22 deletions
diff --git a/net/serviio/Makefile b/net/serviio/Makefile index b52dc93f49ce..f3299a81a32e 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -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> diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist index 8ab17d80f22a..04075d776ae0 100644 --- a/net/serviio/pkg-plist +++ b/net/serviio/pkg-plist @@ -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%% -@exec [ -f %D/%%ETCDIR%%/application-profiles.xml ] || cp -v %D/%%ETCDIR%%/application-profiles.dist.xml %D/%%ETCDIR%%/application-profiles.xml -@exec [ -f %D/%%ETCDIR%%/profiles.xml ] || cp -v %D/%%ETCDIR%%/profiles.dist.xml %D/%%ETCDIR%%/profiles.xml -@exec [ -f %D/%%ETCDIR%%/log4j.xml ] || cp -v %D/%%ETCDIR%%/log4j.dist.xml %D/%%ETCDIR%%/log4j.xml -@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 +@exec [ -f %D/%%ETCDIR%%/application-profiles.xml ] || cp -v %D/%%ETCDIR%%/application-profiles.dist.xml %D/%%ETCDIR%%/application-profiles.xml +@exec [ -f %D/%%ETCDIR%%/profiles.xml ] || cp -v %D/%%ETCDIR%%/profiles.dist.xml %D/%%ETCDIR%%/profiles.xml +@exec [ -f %D/%%ETCDIR%%/log4j.xml ] || cp -v %D/%%ETCDIR%%/log4j.dist.xml %D/%%ETCDIR%%/log4j.xml +@exec [ -f %D/%%ETCDIR%%/console-log4j.properties ] || cp -v %D/%%ETCDIR%%/console-log4j.dist.properties %D/%%ETCDIR%%/console-log4j.properties @dirrmtry %%ETCDIR%% |