From nobody Mon Oct 24 10:28:25 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MwrrV1Z3gz4gByN; Mon, 24 Oct 2022 10:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MwrrV14s5z4G5X; Mon, 24 Oct 2022 10:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666607306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XihZ+9Cc+pkGoG+Zfo9gG1i5sFWJPwUqg9lmUVm+f+Y=; b=Mt5PzaAbw/dYrMHscEk4NOEL7jNwMCQsmcuhx7xRXU+8TvkPRBMJs25WLG78/73Ie696Of 2GrmAITxQxFcGxND4ik/4k2YR8YkyK6FvFzOrQoLTXyCnBxwNArrqMPZ/CWwZoueOLvxFv CdqFUDP6pz04Jh/4TZ/ubWnOBB2S3ujEVXYBl+wK3X+CeGKrAaGkH8zt7qrJ+hR9jEIHAr LvUZWRCzVeNFv9GG7xyRrn/t9CEH8L8ZLGhV+/eIdEwqD73zMHkwoPABeFt7bR1cHdcvGw lGGUvWtVEfkXRx73qwzQcPcsR7mAeZ8ZfAplbQxgq+qdGEONq+xY+HOlQPsPuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MwrrV0BR5z1C5R; Mon, 24 Oct 2022 10:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29OASPR7004474; Mon, 24 Oct 2022 10:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OASPEZ004473; Mon, 24 Oct 2022 10:28:25 GMT (envelope-from git) Date: Mon, 24 Oct 2022 10:28:25 GMT Message-Id: <202210241028.29OASPEZ004473@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: d5fc145b8093 - main - net/serviio: update to 2.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5fc145b809319d59775a2e51cb7cfa50ea8537d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666607306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XihZ+9Cc+pkGoG+Zfo9gG1i5sFWJPwUqg9lmUVm+f+Y=; b=u97FvZDrEjh7dLHzdspDzqsMnjgNsAesR68Cv+N3nE6UL06YAlcRa0aJfo2uZI5TOOCC1G /UA3VGC49s44LPDiNW1vu3Uxbtdw4kEZbsPB4h99H8WBnT8N5YMFNKIsBdHDDparflNkPx ic3m2qPMoHqERuxtFoT82Dknqwke1YMnmQSm43yVNjK/8wz4wmqUIneMpZ0GpJwlYHikXD Nmzq7Kb/tsrZA+Dbk+fqEK2b5gCRv/VJufUvDLFepO0HMxBrVS3YYx4iKFXP522XPg1M3y xbBW0lhrosNTpFl2P/24JAqxpz5NJYRGNnmErzB3xrnCv2q7ZisDl0KC8BsQMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666607306; a=rsa-sha256; cv=none; b=KtWZOwhiINgANuLdKQq/SxLctbMUvqqLH60bSwtfBx6DfnA+IFMwAIqLwDSDL13lcpNGqp ZFjgNQHhrD33THlEQBt3npteluGUOb3MUp9ilvQAssyiePnTlS0KpLKV1xVJKS5EKocwMS aC/J/6T6KUEl46T7e7/veIZuBnGROS4GVBDms0ANqbt9uwsqsUo6y5rshltoaXM2nEbARP fBz0prCbfCHXEgvuR206r3ixp8Q/qD6r7gkF24xW4sQ7E/mGieII5peVuFiXUZnJ2M1GPF mX4Jx4ZZjF9dEgM1QwWF/GaxSEejjLd+N29/i0xGBdFXSpMjEJDCeBqtd7gpGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5fc145b809319d59775a2e51cb7cfa50ea8537d commit d5fc145b809319d59775a2e51cb7cfa50ea8537d Author: Alexander Leidinger AuthorDate: 2022-10-24 10:25:29 +0000 Commit: Alexander Leidinger CommitDate: 2022-10-24 10:28:20 +0000 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 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