From owner-svn-ports-all@FreeBSD.ORG Tue Jun 3 20:15:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1FCCF99D; Tue, 3 Jun 2014 20:15:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CF6725C4; Tue, 3 Jun 2014 20:15:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53KFlPv062101; Tue, 3 Jun 2014 20:15:47 GMT (envelope-from netchild@svn.freebsd.org) Received: (from netchild@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53KFlaD062099; Tue, 3 Jun 2014 20:15:47 GMT (envelope-from netchild@svn.freebsd.org) Message-Id: <201406032015.s53KFlaD062099@svn.freebsd.org> From: Alexander Leidinger Date: Tue, 3 Jun 2014 20:15:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356404 - head/net/serviio X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jun 2014 20:15:48 -0000 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 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%% -@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%%