Date: Sun, 9 Dec 2012 19:43:48 +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: r308559 - in head/net/serviio: . files Message-ID: <201212091943.qB9JhmfS014920@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: netchild Date: Sun Dec 9 19:43:48 2012 New Revision: 308559 URL: http://svnweb.freebsd.org/changeset/ports/308559 Log: - update to 1.0.1. - take maintainership [1] Approved by: maintainer [1] Modified: 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/net/serviio/Makefile ============================================================================== --- head/net/serviio/Makefile Sun Dec 9 19:43:02 2012 (r308558) +++ head/net/serviio/Makefile Sun Dec 9 19:43:48 2012 (r308559) @@ -1,20 +1,16 @@ -# New ports collection makefile for: serviio -# Date created: 2011-01-03 -# Whom: Mikhail Teterin <mi@aldan.algebra.com> -# +# Created by: Mikhail Teterin <mi@aldan.algebra.com> # $FreeBSD$ -# PORTNAME= serviio -PORTVERSION= 0.6.2 +PORTVERSION= 1.0.1 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz -MAINTAINER= mi@aldan.algebra.com +MAINTAINER= netchild@FreeBSD.org COMMENT= Transcoding DLNA-server implemented in Java -RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg +RUN_DEPENDS= ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1 NO_BUILD= yes USE_JAVA= yes @@ -35,7 +31,7 @@ do-install: ${MKDIR} ${JAVAJARDIR}/${PORTNAME}/plugins ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${JAVAJARDIR}/${PORTNAME}/ ${MKDIR} ${PREFIX}/etc/${PORTNAME} -.for f in profiles log4j +.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}/ Modified: head/net/serviio/distinfo ============================================================================== --- head/net/serviio/distinfo Sun Dec 9 19:43:02 2012 (r308558) +++ head/net/serviio/distinfo Sun Dec 9 19:43:48 2012 (r308559) @@ -1,2 +1,2 @@ -SHA256 (serviio-0.6.2-linux.tar.gz) = 0fe0bbca138fa0eab7da99ab8a469017a55ab896c06b9993ed935ca4b0591919 -SIZE (serviio-0.6.2-linux.tar.gz) = 14038981 +SHA256 (serviio-1.0.1-linux.tar.gz) = 3454eceaca96f6cbf2ed126baaf3d81f5ef2441d70abbd41de1bf7b88f83eb8c +SIZE (serviio-1.0.1-linux.tar.gz) = 15580840 Modified: head/net/serviio/files/serviio-console.in ============================================================================== --- head/net/serviio/files/serviio-console.in Sun Dec 9 19:43:02 2012 (r308558) +++ head/net/serviio/files/serviio-console.in Sun Dec 9 19:43:48 2012 (r308559) @@ -8,7 +8,12 @@ SERVIIO_CONSOLE_HOME=%%JAVAJARDIR%%/serviio # Setup the classpath -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" +SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CONSOLE_HOME/serviio.jar" +# Setup the classpath +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" @@ -24,4 +29,4 @@ do done # Execute the JVM in the foreground -exec java $JAVA_OPTS -classpath "$SERVIIO_CONSOLE_CLASS_PATH" org.serviio.console.ServiioConsole "$@" +exec java -Xms5M -XX:+UseParNewGC -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 Sun Dec 9 19:43:02 2012 (r308558) +++ head/net/serviio/files/serviiod.in Sun Dec 9 19:43:48 2012 (r308559) @@ -5,20 +5,18 @@ ## ## ### ====================================================================== ### +PATH=$PATH:%%PREFIX%%/bin SERVIIO_HOME=%%JAVAJARDIR%%/serviio SERVIIO_CLASS_PATH="$SERVIIO_HOME/serviio.jar" # Setup the classpath -for j in derby jcs concurrent freemarker httpcore jaudiotagger \ - jul-to-slf4j jcl-over-slf4j log4j sanselan slf4j-api \ - slf4j-log4j12 org.restlet org.restlet.ext.xstream xstream \ - rome rome-modules jdom groovy-all winp org.restlet.ext.gson gson +for j in $SERVIIO_HOME/*.jar do - SERVIIO_CLASS_PATH="$SERVIIO_CLASS_PATH:$SERVIIO_HOME/$j.jar" + SERVIIO_CLASS_PATH="$SERVIIO_CLASS_PATH:$j" 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=$SERVIIO_HOME -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg" +JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dderby.system.home=/var/db/serviio -Dserviio.home=$SERVIIO_HOME -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg1" JAVA_OPTS="${JAVA_OPTS} -Djcs.auxiliary.DC.attributes.DiskPath=/var/db/serviio" @@ -33,4 +31,4 @@ do done # Execute the JVM in the foreground -exec java -Xmx384M $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" +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 Modified: head/net/serviio/pkg-plist ============================================================================== --- head/net/serviio/pkg-plist Sun Dec 9 19:43:02 2012 (r308558) +++ head/net/serviio/pkg-plist Sun Dec 9 19:43:48 2012 (r308559) @@ -1,31 +1,36 @@ sbin/serviiod bin/serviio-console -%%JAVAJARDIR%%/serviio/serviio-client.jar -%%JAVAJARDIR%%/serviio/serviio.jar -%%JAVAJARDIR%%/serviio/gson.jar +%%JAVAJARDIR%%/serviio/commons-codec.jar +%%JAVAJARDIR%%/serviio/commons-io.jar +%%JAVAJARDIR%%/serviio/concurrent.jar +%%JAVAJARDIR%%/serviio/derby.jar +%%JAVAJARDIR%%/serviio/freemarker.jar %%JAVAJARDIR%%/serviio/groovy-all.jar +%%JAVAJARDIR%%/serviio/gson.jar +%%JAVAJARDIR%%/serviio/httpcore.jar +%%JAVAJARDIR%%/serviio/jaudiotagger.jar +%%JAVAJARDIR%%/serviio/jcl-over-slf4j.jar +%%JAVAJARDIR%%/serviio/jcs.jar +%%JAVAJARDIR%%/serviio/jdom.jar +%%JAVAJARDIR%%/serviio/jul-to-slf4j.jar +%%JAVAJARDIR%%/serviio/log4j.jar %%JAVAJARDIR%%/serviio/org.restlet.ext.gson.jar -%%JAVAJARDIR%%/serviio/rome.jar +%%JAVAJARDIR%%/serviio/org.restlet.ext.xstream.jar +%%JAVAJARDIR%%/serviio/org.restlet.jar +%%JAVAJARDIR%%/serviio/padlock.jar %%JAVAJARDIR%%/serviio/rome-modules.jar -%%JAVAJARDIR%%/serviio/log4j.jar -%%JAVAJARDIR%%/serviio/freemarker.jar -%%JAVAJARDIR%%/serviio/derby.jar -%%JAVAJARDIR%%/serviio/jaudiotagger.jar +%%JAVAJARDIR%%/serviio/rome.jar %%JAVAJARDIR%%/serviio/sanselan.jar +%%JAVAJARDIR%%/serviio/serviio-client.jar +%%JAVAJARDIR%%/serviio/serviio-media-browser.jar +%%JAVAJARDIR%%/serviio/serviio.jar %%JAVAJARDIR%%/serviio/slf4j-api.jar -%%JAVAJARDIR%%/serviio/jul-to-slf4j.jar %%JAVAJARDIR%%/serviio/slf4j-log4j12.jar -%%JAVAJARDIR%%/serviio/jcl-over-slf4j.jar -%%JAVAJARDIR%%/serviio/jcs.jar -%%JAVAJARDIR%%/serviio/jdom.jar %%JAVAJARDIR%%/serviio/winp.jar -%%JAVAJARDIR%%/serviio/concurrent.jar %%JAVAJARDIR%%/serviio/xstream.jar -%%JAVAJARDIR%%/serviio/org.restlet.jar -%%JAVAJARDIR%%/serviio/org.restlet.ext.xstream.jar -%%JAVAJARDIR%%/serviio/httpcore.jar @dirrm %%JAVAJARDIR%%/serviio/plugins @dirrm %%JAVAJARDIR%%/serviio +@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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212091943.qB9JhmfS014920>