svn commit: r505936 - in head: . net/serviio

[Alexander Leidinger]

Author: netchild
Date: Fri Jul  5 20:47:46 2019
New Revision: 505936
URL: https://svnweb.freebsd.org/changeset/ports/505936

Log:
  Update serviio to v2.0.

Modified:
  head/UPDATING
  head/net/serviio/Makefile
  head/net/serviio/distinfo
  head/net/serviio/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Jul  5 20:30:54 2019	(r505935)
+++ head/UPDATING	Fri Jul  5 20:47:46 2019	(r505936)
@@ -6,6 +6,13 @@ You should get into the habit of checking this file fo
 you update your ports collection, before attempting any port upgrades.
 
 
+20190705:
+  AFFECTS: users of net/serviio which bought a license for the non-free features
+  AUTHOR: netchild at FreeBSD.org
+
+  Version 2 of serviio needs a new license file. Updating without a new license
+  file will disable the non-free features.
+
 20190701:
   AFFECTS: users of databases/mysql56-(server|client)
   AUTHOR: ale at FreeBSD.org

Modified: head/net/serviio/Makefile
==============================================================================
--- head/net/serviio/Makefile	Fri Jul  5 20:30:54 2019	(r505935)
+++ head/net/serviio/Makefile	Fri Jul  5 20:47:46 2019	(r505936)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	serviio
-PORTVERSION=	1.10.1
+PORTVERSION=	2.0
 #PORTREVISION=	1
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	http://download.serviio.org/releases/
@@ -42,5 +42,11 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/console-log4j.properties	\
 		${STAGEDIR}${ETCDIR}/console-log4j.properties.sample
 	${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin
+
+# 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
+#	${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>

Modified: head/net/serviio/distinfo
==============================================================================
--- head/net/serviio/distinfo	Fri Jul  5 20:30:54 2019	(r505935)
+++ head/net/serviio/distinfo	Fri Jul  5 20:47:46 2019	(r505936)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546375066
-SHA256 (serviio-1.10.1-linux.tar.gz) = d8742e9159aba9c76e70a8e002c8d0455564dcf63f6211f7ee206ffe6b12aa3f
-SIZE (serviio-1.10.1-linux.tar.gz) = 28413154
+TIMESTAMP = 1562247551
+SHA256 (serviio-2.0-linux.tar.gz) = cfdae264b7d336a4a63f6a201b20b7881f32e310fad40db805d6f576415701ff
+SIZE (serviio-2.0-linux.tar.gz) = 29345082

Modified: head/net/serviio/pkg-plist
==============================================================================
--- head/net/serviio/pkg-plist	Fri Jul  5 20:30:54 2019	(r505935)
+++ head/net/serviio/pkg-plist	Fri Jul  5 20:47:46 2019	(r505936)
@@ -1,13 +1,13 @@
-sbin/serviiod
+%%JAVAJARDIR%%/serviio/activation.jar
 %%JAVAJARDIR%%/serviio/aspectjrt.jar
 %%JAVAJARDIR%%/serviio/aspectjweaver.jar
 %%JAVAJARDIR%%/serviio/commons-codec.jar
 %%JAVAJARDIR%%/serviio/commons-imaging.jar
 %%JAVAJARDIR%%/serviio/commons-io.jar
+%%JAVAJARDIR%%/serviio/commons-jcs-core.jar
 %%JAVAJARDIR%%/serviio/commons-jxpath.jar
 %%JAVAJARDIR%%/serviio/commons-lang.jar
 %%JAVAJARDIR%%/serviio/commons-logging.jar
-%%JAVAJARDIR%%/serviio/concurrent.jar
 %%JAVAJARDIR%%/serviio/derby.jar
 %%JAVAJARDIR%%/serviio/freemarker.jar
 %%JAVAJARDIR%%/serviio/groovy-all.jar
@@ -20,13 +20,13 @@ sbin/serviiod
 %%JAVAJARDIR%%/serviio/jaudiotagger.jar
 %%JAVAJARDIR%%/serviio/javax.xml.soap-api.jar
 %%JAVAJARDIR%%/serviio/jcl-over-slf4j.jar
-%%JAVAJARDIR%%/serviio/jcs.jar
 %%JAVAJARDIR%%/serviio/jdom.jar
 %%JAVAJARDIR%%/serviio/jnat-pmplib.jar
 %%JAVAJARDIR%%/serviio/jul-to-slf4j.jar
 %%JAVAJARDIR%%/serviio/log4j.jar
 %%JAVAJARDIR%%/serviio/lucene-analyzers-common.jar
 %%JAVAJARDIR%%/serviio/lucene-core.jar
+%%JAVAJARDIR%%/serviio/mimepull.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.gson.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.simple.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.slf4j.jar
@@ -35,6 +35,7 @@ sbin/serviiod
 %%JAVAJARDIR%%/serviio/padlock.jar
 %%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
@@ -44,11 +45,13 @@ sbin/serviiod
 %%JAVAJARDIR%%/serviio/simple.jar
 %%JAVAJARDIR%%/serviio/slf4j-api.jar
 %%JAVAJARDIR%%/serviio/slf4j-log4j12.jar
+%%JAVAJARDIR%%/serviio/stax-api.jar
+%%JAVAJARDIR%%/serviio/stax-ex.jar
 %%JAVAJARDIR%%/serviio/streamflyer-core.jar
 %%JAVAJARDIR%%/serviio/winp.jar
 %%JAVAJARDIR%%/serviio/xstream.jar
- at sample %%ETCDIR%%/profiles.xml.sample
- at sample %%ETCDIR%%/log4j.xml.sample
 @sample %%ETCDIR%%/application-profiles.xml.sample
 @sample %%ETCDIR%%/console-log4j.properties.sample
- at comment @dir %%JAVAJARDIR%%/serviio/plugins
+ at sample %%ETCDIR%%/log4j.xml.sample
+ at sample %%ETCDIR%%/profiles.xml.sample
+sbin/serviiod