diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2016-02-27 21:16:16 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2016-02-27 21:16:16 +0000 |
| commit | d21511621702b8d663d481d477dbab358fa230a9 (patch) | |
| tree | 2b2033491c2f70be75491df59b7aa23d24c6735f | |
| parent | 9fcbe4c76409398ba9bc294181968693817d7ee7 (diff) | |
| download | ports-d21511621702b8d663d481d477dbab358fa230a9.tar.gz ports-d21511621702b8d663d481d477dbab358fa230a9.zip | |
Update to 1.6.
Submitted by: Mark Dixon <mnd999@gmail.com>
Notes
Notes:
svn path=/head/; revision=409689
| -rw-r--r-- | net/serviio/Makefile | 5 | ||||
| -rw-r--r-- | net/serviio/distinfo | 4 | ||||
| -rw-r--r-- | net/serviio/files/serviio-console.in | 32 | ||||
| -rw-r--r-- | net/serviio/pkg-plist | 4 |
4 files changed, 6 insertions, 39 deletions
diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 7a378a1a090b..4854ff4a493c 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= serviio -PORTVERSION= 1.5.2 +PORTVERSION= 1.6 #PORTREVISION= 0 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ @@ -20,7 +20,7 @@ USES= dos2unix DOS2UNIX_GLOB= derby.properties PKGMESSAGE= ${WRKSRC}/pkg-message -SUB_FILES+= pkg-message serviiod serviio-console +SUB_FILES+= pkg-message serviiod USE_RC_SUBR= serviio SUB_LIST+= USER=${USERS} RESTRICTED= License does not allow selling @@ -42,6 +42,5 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/console-log4j.properties \ ${STAGEDIR}${ETCDIR}/console-log4j.properties.sample ${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_SCRIPT} ${WRKDIR}/serviio-console ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/net/serviio/distinfo b/net/serviio/distinfo index f2bff991f91e..b2f50da90a2f 100644 --- a/net/serviio/distinfo +++ b/net/serviio/distinfo @@ -1,2 +1,2 @@ -SHA256 (serviio-1.5.2-linux.tar.gz) = 5886adc36b1a5a90b11276497f0298b594944ed54cc9c3b58676acf8742e106d -SIZE (serviio-1.5.2-linux.tar.gz) = 22073991 +SHA256 (serviio-1.6-linux.tar.gz) = 1e0bda45979bb9243ca911f50f65ac1dc398d7bf6c1ccc97be13122bc6902e1c +SIZE (serviio-1.6-linux.tar.gz) = 23752475 diff --git a/net/serviio/files/serviio-console.in b/net/serviio/files/serviio-console.in deleted file mode 100644 index 98fa1b683d63..000000000000 --- a/net/serviio/files/serviio-console.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -### ====================================================================== ### -## ## -## Serviio Console ript ## -## ## -### ====================================================================== ### - -SERVIIO_CONSOLE_HOME=%%JAVAJARDIR%%/serviio - -# Setup the classpath -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 - -# Setup Serviio specific 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 "$@" -do - case $o in - -D*) - JAVA_OPTS="$JAVA_OPTS $o" - ;; - esac -done - -# Execute the JVM in the foreground -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 "$@" diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist index 56a94a5d5a8b..355cd57abb0b 100644 --- a/net/serviio/pkg-plist +++ b/net/serviio/pkg-plist @@ -1,5 +1,4 @@ sbin/serviiod -bin/serviio-console %%JAVAJARDIR%%/serviio/commons-codec.jar %%JAVAJARDIR%%/serviio/commons-imaging.jar %%JAVAJARDIR%%/serviio/commons-io.jar @@ -29,9 +28,10 @@ bin/serviio-console %%JAVAJARDIR%%/serviio/rome-modules.jar %%JAVAJARDIR%%/serviio/rome.jar %%JAVAJARDIR%%/serviio/sbbi-upnp.jar -%%JAVAJARDIR%%/serviio/serviio-client.jar %%JAVAJARDIR%%/serviio/serviio-mediabrowser-api.jar %%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar +%%JAVAJARDIR%%/serviio/serviio-web-console-api.jar +%%JAVAJARDIR%%/serviio/serviio-web-console.jar %%JAVAJARDIR%%/serviio/serviio.jar %%JAVAJARDIR%%/serviio/simple.jar %%JAVAJARDIR%%/serviio/slf4j-api.jar |