From d5fc145b809319d59775a2e51cb7cfa50ea8537d Mon Sep 17 00:00:00 2001
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Mon, 24 Oct 2022 12:25:29 +0200
Subject: [PATCH] net/serviio: update to 2.3

- uodate to 2.3
- add possibility to modify heap and stack size
---
 net/serviio/Makefile          | 6 +++---
 net/serviio/distinfo          | 6 +++---
 net/serviio/files/serviio.in  | 4 ++++
 net/serviio/files/serviiod.in | 3 ++-
 net/serviio/pkg-plist         | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index 91e69ab8bd8c..3efdf9c0ba81 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	serviio
-PORTVERSION=	2.2.1
+PORTVERSION=	2.3
 PORTREVISION=	0
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	https://download.serviio.org/releases/
@@ -50,8 +50,8 @@ do-install:
 
 # to be used with a non-standard PREFIX for just this port
 # e.g. PREFIX=/porttest
-mkplist:
-	${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -v etc/rc.d | ${SORT} >${PLIST}.new
+gen-plist:
+	${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -Ev '(etc/rc.d|licenses)' | ${SORT} >${PLIST}.new
 #	${FIND} ${STAGEDIR}${PREFIX}/ -type d | ${SED} -e "s:${STAGEDIR}${PREFIX}/:@dirrm :g ; s:etc/serviio:%%ETCDIR%%:g ; s:share/java/classes:%%JAVAJARDIR%%:g" | ${SORT} -r >>${PLIST}.new
 
 .include <bsd.port.mk>
diff --git a/net/serviio/distinfo b/net/serviio/distinfo
index cbd09c2f8250..aaa9a20dce61 100644
--- a/net/serviio/distinfo
+++ b/net/serviio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639505046
-SHA256 (serviio-2.2.1-linux.tar.gz) = b9145628cbf87f66f5c8813d3a75c3219026728ab0ffc174cf52ce7ac401b324
-SIZE (serviio-2.2.1-linux.tar.gz) = 28789070
+TIMESTAMP = 1666604910
+SHA256 (serviio-2.3-linux.tar.gz) = 9e6dd13720b8a269c6723eced7870b2486674ff5c6358fdde6a11c168c3ff627
+SIZE (serviio-2.3-linux.tar.gz) = 28885139
diff --git a/net/serviio/files/serviio.in b/net/serviio/files/serviio.in
index 34632a7f0be2..1a31e5054982 100644
--- a/net/serviio/files/serviio.in
+++ b/net/serviio/files/serviio.in
@@ -17,11 +17,15 @@ command=%%PREFIX%%/sbin/serviiod
 load_rc_config $name
 
 : ${serviio_user="dlna"}
+: ${serviio_heap="512M"}
+: ${serviio_stack="20M"}
 
 if [ -n "${serviio_lang}" ]; then
 	export LANG=${serviio_lang}
 fi
 
+export SERVIIO_MEM="-Xmx${serviio_heap} -Xms${serviio_stack}"
+
 _dirs="/var/db/serviio /var/db/serviio/home /var/log/serviio"
 start_precmd="mkdir -p $_dirs; chown $serviio_user $_dirs"
 command_args="$serviio_args &"
diff --git a/net/serviio/files/serviiod.in b/net/serviio/files/serviiod.in
index 19f16560c49e..44864aac25b5 100644
--- a/net/serviio/files/serviiod.in
+++ b/net/serviio/files/serviiod.in
@@ -7,6 +7,7 @@
 
 PATH=$PATH:%%PREFIX%%/bin
 HOME=/var/db/serviio/home
+: ${SERVIIO_MEM="-Xmx512M -Xms20M"}
 SERVIIO_HOME=%%JAVAJARDIR%%/serviio
 SERVIIO_CLASS_PATH="$SERVIIO_HOME/serviio.jar"
 # Setup the classpath
@@ -33,4 +34,4 @@ done
 
 # Execute the JVM in the foreground
 export HOME PATH JAVA_VERSION
-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
+exec java ${SERVIIO_MEM} -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null
diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist
index 4f4638a9d451..830e850fe9ad 100644
--- a/net/serviio/pkg-plist
+++ b/net/serviio/pkg-plist
@@ -36,7 +36,6 @@
 %%JAVAJARDIR%%/serviio/rome-modules.jar
 %%JAVAJARDIR%%/serviio/rome.jar
 %%JAVAJARDIR%%/serviio/saaj-impl.jar
-%%JAVAJARDIR%%/serviio/sbbi-upnp.jar
 %%JAVAJARDIR%%/serviio/serviio-mediabrowser-api.jar
 %%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar
 %%JAVAJARDIR%%/serviio/serviio-web-console-api.jar
@@ -47,6 +46,7 @@
 %%JAVAJARDIR%%/serviio/stax-api.jar
 %%JAVAJARDIR%%/serviio/stax-ex.jar
 %%JAVAJARDIR%%/serviio/streamflyer-core.jar
+%%JAVAJARDIR%%/serviio/waifupnp.jar
 %%JAVAJARDIR%%/serviio/winp.jar
 %%JAVAJARDIR%%/serviio/xstream.jar
 @sample %%ETCDIR%%/application-profiles.xml.sample