Date: Fri, 6 Feb 2015 08:40:34 +0000 (UTC) From: Alexander Leidinger <netchild@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378510 - in head: . net/serviio net/serviio/files Message-ID: <201502060840.t168eYFq079085@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: netchild Date: Fri Feb 6 08:40:33 2015 New Revision: 378510 URL: https://svnweb.freebsd.org/changeset/ports/378510 QAT: https://qat.redports.org/buildarchive/r378510/ Log: - Update to Serviio 1.5 - Require OpenJDK8 which is now the minimum requirement - Use "sample" in filenames over "dist" to be able to use @sample keyword - Sync Java command line exec arguments to upstream to work with OpenJDK8 - Partially sync JAVA_OPTS to upstream and specify a dcraw path to prevent errors looking for 'lib/dcraw' - Cleaned up the console script Submitted by: Jason Unovitch <jason.unovitch@gmail.com> Modified: head/UPDATING head/net/serviio/Makefile head/net/serviio/distinfo head/net/serviio/files/serviio-console.in head/net/serviio/files/serviiod.in head/net/serviio/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Feb 6 08:34:36 2015 (r378509) +++ head/UPDATING Fri Feb 6 08:40:33 2015 (r378510) @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150206: + AFFECTS: users of net/serviio + AUTHOR: netchild@FreeBSD.org + + The java dependency changed from java 7 (lang/openjdk7 if you haven't + installed another java 7 implementation) to java 8 (e.g. lang/openjdk8). + If serviio is the only reason that java 7 is installed, you can delete + java 7 after the update to serviio 1.5.0. + + The Java Polling Watch Service used in Serviio 1.5 aggressively searches + for file system updates. Until the Serviio poller is re-enabled in 1.5.1, + consider unchecking "Keep library automatically updated" if you have a + large media collection or are concerned about CPU/disk usage. + 20150204: AFFECTS: users of databases/mysql55-(server|client) AUTHOR: ale@FreeBSD.org Modified: head/net/serviio/Makefile ============================================================================== --- head/net/serviio/Makefile Fri Feb 6 08:34:36 2015 (r378509) +++ head/net/serviio/Makefile Fri Feb 6 08:40:33 2015 (r378510) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= serviio -PORTVERSION= 1.4.1.2 -PORTREVISION= 2 +PORTVERSION= 1.5 +#PORTREVISION= 0 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz @@ -15,6 +15,7 @@ RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimed NO_BUILD= yes USE_JAVA= yes +JAVA_VERSION= 1.8 USES= dos2unix DOS2UNIX_GLOB= derby.properties @@ -36,10 +37,10 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} .for f in application-profiles profiles log4j ${INSTALL_DATA} ${WRKSRC}/config/$f.xml \ - ${STAGEDIR}${ETCDIR}/$f.dist.xml + ${STAGEDIR}${ETCDIR}/$f.xml.sample .endfor ${INSTALL_DATA} ${FILESDIR}/console-log4j.properties \ - ${STAGEDIR}${ETCDIR}/console-log4j.dist.properties + ${STAGEDIR}${ETCDIR}/console-log4j.properties.sample ${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKDIR}/serviio-console ${STAGEDIR}${PREFIX}/bin Modified: head/net/serviio/distinfo ============================================================================== --- head/net/serviio/distinfo Fri Feb 6 08:34:36 2015 (r378509) +++ head/net/serviio/distinfo Fri Feb 6 08:40:33 2015 (r378510) @@ -1,2 +1,2 @@ -SHA256 (serviio-1.4.1.2-linux.tar.gz) = 76f208716e2c1c8d7ed52eb2f57bd190ee622acd9529e225a59424bd1b12a0a2 -SIZE (serviio-1.4.1.2-linux.tar.gz) = 20701487 +SHA256 (serviio-1.5-linux.tar.gz) = e933de2f5f9da95cc3cdc3afba9d5b623fd5fd4189c5f7f247d4718e14166c3c +SIZE (serviio-1.5-linux.tar.gz) = 22055839 Modified: head/net/serviio/files/serviio-console.in ============================================================================== --- head/net/serviio/files/serviio-console.in Fri Feb 6 08:34:36 2015 (r378509) +++ head/net/serviio/files/serviio-console.in Fri Feb 6 08:40:33 2015 (r378510) @@ -13,10 +13,10 @@ SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CON for j in $SERVIIO_CONSOLE_HOME/*.jar; do SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CONSOLE_CLASS_PATH:$j" done -#SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CONSOLE_HOME/serviio-client.jar:$SERVIIO_CONSOLE_HOME/serviio.jar:$SERVIIO_CONSOLE_HOME/log4j.jar:$SERVIIO_CONSOLE_HOME/slf4j-api.jar:$SERVIIO_CONSOLE_HOME/slf4j-log4j12.jar:$SERVIIO_CONSOLE_HOME/jul-to-slf4j.jar:$SERVIIO_CONSOLE_HOME/org.restlet.jar:$SERVIIO_CONSOLE_HOME/org.restlet.ext.xstream.jar:$SERVIIO_CONSOLE_HOME/xstream.jar" # Setup Serviio specific properties -JAVA_OPTS="-Dserviio.home=$SERVIIO_CONSOLE_HOME -Djava.net.preferIPv4Stack=true -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg -Dlog4j.configuration=file:%%ETCDIR%%/console-log4j.properties" +JAVA_OPTS="-Dserviio.home=$SERVIIO_CONSOLE_HOME -Djava.net.preferIPv4Stack=true -Dorg.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade" +JAVA_OPTS="${JAVA_OPTS} -Dlog4j.configuration=file:%%ETCDIR%%/console-log4j.properties" # A kludge to get the -D... flags to Java, rather than to Serviio itself: for o in "$@" @@ -29,4 +29,4 @@ do done # Execute the JVM in the foreground -exec java -Xms5M -XX:+UseParNewGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 $JAVA_OPTS -classpath "$SERVIIO_CONSOLE_CLASS_PATH" org.serviio.console.ServiioConsole "$@" +exec java -Xms5M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 $JAVA_OPTS -classpath "$SERVIIO_CONSOLE_CLASS_PATH" org.serviio.console.ServiioConsole "$@" Modified: head/net/serviio/files/serviiod.in ============================================================================== --- head/net/serviio/files/serviiod.in Fri Feb 6 08:34:36 2015 (r378509) +++ head/net/serviio/files/serviiod.in Fri Feb 6 08:40:33 2015 (r378510) @@ -17,10 +17,9 @@ done SERVIIO_CLASS_PATH="$SERVIIO_CLASS_PATH:%%ETCDIR%%" # Setup Serviio specific properties -JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dderby.system.home=/var/db/serviio -Dserviio.home=$HOME -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg" +JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dorg.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade -Dderby.system.home=/var/db/serviio -Dserviio.home=$HOME -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg -Ddcraw.location=%%LOCALBASE%%/bin/dcraw" JAVA_OPTS="${JAVA_OPTS} -Djcs.auxiliary.DC.attributes.DiskPath=/var/db/serviio" - # A kludge to get the -D... flags to Java, rather than to Serviio itself: for o in "$@" do @@ -33,4 +32,4 @@ done # Execute the JVM in the foreground export HOME PATH -exec java -Xmx512M -Xms20M -XX:+UseParNewGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null +exec java -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null Modified: head/net/serviio/pkg-plist ============================================================================== --- head/net/serviio/pkg-plist Fri Feb 6 08:34:36 2015 (r378509) +++ head/net/serviio/pkg-plist Fri Feb 6 08:40:33 2015 (r378510) @@ -17,10 +17,12 @@ bin/serviio-console %%JAVAJARDIR%%/serviio/jdom.jar %%JAVAJARDIR%%/serviio/jnat-pmplib.jar %%JAVAJARDIR%%/serviio/jul-to-slf4j.jar +%%JAVAJARDIR%%/serviio/log4j.jar %%JAVAJARDIR%%/serviio/lucene-analyzers-common.jar %%JAVAJARDIR%%/serviio/lucene-core.jar -%%JAVAJARDIR%%/serviio/log4j.jar %%JAVAJARDIR%%/serviio/org.restlet.ext.gson.jar +%%JAVAJARDIR%%/serviio/org.restlet.ext.simple.jar +%%JAVAJARDIR%%/serviio/org.restlet.ext.slf4j.jar %%JAVAJARDIR%%/serviio/org.restlet.ext.xstream.jar %%JAVAJARDIR%%/serviio/org.restlet.jar %%JAVAJARDIR%%/serviio/padlock.jar @@ -28,24 +30,17 @@ bin/serviio-console %%JAVAJARDIR%%/serviio/rome.jar %%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-mediabrowser-api.jar +%%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar %%JAVAJARDIR%%/serviio/serviio.jar +%%JAVAJARDIR%%/serviio/simple.jar %%JAVAJARDIR%%/serviio/slf4j-api.jar %%JAVAJARDIR%%/serviio/slf4j-log4j12.jar %%JAVAJARDIR%%/serviio/streamflyer-core.jar %%JAVAJARDIR%%/serviio/winp.jar %%JAVAJARDIR%%/serviio/xstream.jar -@unexec cmp %D/%%ETCDIR%%/application-profiles.xml %D/%%ETCDIR%%/application-profiles.dist.xml && rm -f %D/%%ETCDIR%%/application-profiles.xml || echo Modified application-profiles.xml remains in %D/%%ETCDIR%% -@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%% -%%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 +@sample %%ETCDIR%%/profiles.xml.sample +@sample %%ETCDIR%%/log4j.xml.sample +@sample %%ETCDIR%%/application-profiles.xml.sample +@sample %%ETCDIR%%/console-log4j.properties.sample @dir %%JAVAJARDIR%%/serviio/plugins
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502060840.t168eYFq079085>