svn commit: r330348 - in head/net/serviio: . files

[Alexander Leidinger]

Author: netchild
Date: Mon Oct 14 19:50:26 2013
New Revision: 330348
URL: http://svnweb.freebsd.org/changeset/ports/330348

Log:
  - give serviio a home (other than what is specified in the GECOS of the user)
  - generate a set of config files from the example ones, if no config file
    exists (on first install or if the config didn't change from the example
    one) [1]
  
  PR:		182711 [1]
  Submitted by:	Jason Unovitch <jason.unovitch at gmail.com> [1]

Modified:
  head/net/serviio/Makefile
  head/net/serviio/files/serviio.in
  head/net/serviio/files/serviiod.in
  head/net/serviio/pkg-plist

Modified: head/net/serviio/Makefile
==============================================================================
--- head/net/serviio/Makefile	Mon Oct 14 19:48:49 2013	(r330347)
+++ head/net/serviio/Makefile	Mon Oct 14 19:50:26 2013	(r330348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	serviio
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	http://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz

Modified: head/net/serviio/files/serviio.in
==============================================================================
--- head/net/serviio/files/serviio.in	Mon Oct 14 19:48:49 2013	(r330347)
+++ head/net/serviio/files/serviio.in	Mon Oct 14 19:50:26 2013	(r330348)
@@ -24,7 +24,7 @@ if [ -n "${serviio_lang}" ]; then
 	export LANG=${serviio_lang}
 fi
 
-_dirs="/var/db/serviio /var/log/serviio"
+_dirs="/var/db/serviio /var/db/serviio/home /var/log/serviio"
 start_precmd="mkdir -p $_dirs; chown $serviio_user $_dirs"
 command_args="$serviio_args &"
 

Modified: head/net/serviio/files/serviiod.in
==============================================================================
--- head/net/serviio/files/serviiod.in	Mon Oct 14 19:48:49 2013	(r330347)
+++ head/net/serviio/files/serviiod.in	Mon Oct 14 19:50:26 2013	(r330348)
@@ -6,6 +6,7 @@
 ### ====================================================================== ###
 
 PATH=$PATH:%%PREFIX%%/bin
+HOME=/var/db/serviio/home
 SERVIIO_HOME=%%JAVAJARDIR%%/serviio
 SERVIIO_CLASS_PATH="$SERVIIO_HOME/serviio.jar"
 # Setup the classpath
@@ -16,7 +17,7 @@ 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/ffmpeg1"
+JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dderby.system.home=/var/db/serviio -Dserviio.home=$HOME -Dffmpeg.location=%%LOCALBASE%%/bin/ffmpeg1"
 JAVA_OPTS="${JAVA_OPTS} -Djcs.auxiliary.DC.attributes.DiskPath=/var/db/serviio"
 
 
@@ -31,4 +32,5 @@ do
 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

Modified: head/net/serviio/pkg-plist
==============================================================================
--- head/net/serviio/pkg-plist	Mon Oct 14 19:48:49 2013	(r330347)
+++ head/net/serviio/pkg-plist	Mon Oct 14 19:50:26 2013	(r330348)
@@ -41,6 +41,10 @@ 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%%
+ at exec [ -f %D/%%ETCDIR%%/application-profiles.xml ] || cp -v %D/%%ETCDIR%%/application-profiles.dist.xml %D/%%ETCDIR%%/application-profiles.xml
+ at exec [ -f %D/%%ETCDIR%%/profiles.xml ] || cp -v %D/%%ETCDIR%%/profiles.dist.xml %D/%%ETCDIR%%/profiles.xml
+ at exec [ -f %D/%%ETCDIR%%/log4j.xml ] || cp -v %D/%%ETCDIR%%/log4j.dist.xml %D/%%ETCDIR%%/log4j.xml
+ at 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