diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2011-03-28 03:49:09 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2011-03-28 03:49:09 +0000 |
| commit | 89637df3db8f7fe0ee226c5f561db14c895faf77 (patch) | |
| tree | e29febbe361721e1bc09436eae8938874102d81c /net/serviio | |
| parent | 78dd4fdce05c3a4e66ef7cdbeca129f983bfa53f (diff) | |
| download | ports-89637df3db8f7fe0ee226c5f561db14c895faf77.tar.gz ports-89637df3db8f7fe0ee226c5f561db14c895faf77.zip | |
Update from 0.5 to 0.5.2 -- a number of bugs fixed as well as transcoding
of FLAC files added.
Notes
Notes:
svn path=/head/; revision=271918
Diffstat (limited to 'net/serviio')
| -rw-r--r-- | net/serviio/Makefile | 2 | ||||
| -rw-r--r-- | net/serviio/distinfo | 4 | ||||
| -rw-r--r-- | net/serviio/files/serviio-console.in | 12 | ||||
| -rw-r--r-- | net/serviio/files/serviiod.in | 13 |
4 files changed, 26 insertions, 5 deletions
diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 49bc8603f5af..6dc8e2a9586e 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -6,7 +6,7 @@ # PORTNAME= serviio -PORTVERSION= 0.5 +PORTVERSION= 0.5.2 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz diff --git a/net/serviio/distinfo b/net/serviio/distinfo index 9e66c48849bf..4e6bcaeadfe6 100644 --- a/net/serviio/distinfo +++ b/net/serviio/distinfo @@ -1,2 +1,2 @@ -SHA256 (serviio-0.5-linux.tar.gz) = 1001e1fcf379c4d582e015ecdf19a01579c1019197bcf53ce16d4816ff1f87a8 -SIZE (serviio-0.5-linux.tar.gz) = 7566385 +SHA256 (serviio-0.5.2-linux.tar.gz) = 303bb1f855058304b4ae611aaa64815d0a2195e91dd0104fe136f694d7d75d8a +SIZE (serviio-0.5.2-linux.tar.gz) = 7640177 diff --git a/net/serviio/files/serviio-console.in b/net/serviio/files/serviio-console.in index 017669960bbb..139c6a735045 100644 --- a/net/serviio/files/serviio-console.in +++ b/net/serviio/files/serviio-console.in @@ -13,5 +13,15 @@ SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CONSOLE_HOME/serviio-client.jar:$SERVIIO_CO # 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" +# 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 $JAVA_OPTS "$@" -classpath "$SERVIIO_CONSOLE_CLASS_PATH" org.serviio.console.ServiioConsole +exec java $JAVA_OPTS -classpath "$SERVIIO_CONSOLE_CLASS_PATH" org.serviio.console.ServiioConsole "$@" diff --git a/net/serviio/files/serviiod.in b/net/serviio/files/serviiod.in index 3118f3203969..2c4b317b9e1f 100644 --- a/net/serviio/files/serviiod.in +++ b/net/serviio/files/serviiod.in @@ -12,5 +12,16 @@ SERVIIO_CLASS_PATH="$SERVIIO_HOME/serviio.jar:$SERVIIO_HOME/derby.jar:$SERVIIO_H # 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" + +# 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 -Xmx384M $JAVA_OPTS "$@" -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer +exec java -Xmx384M $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" |