Index: head/net/serviio/Makefile
===================================================================
--- head/net/serviio/Makefile	(revision 409688)
+++ head/net/serviio/Makefile	(revision 409689)
@@ -1,47 +1,46 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 # $FreeBSD$
 
 PORTNAME=	serviio
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6
 #PORTREVISION=	0
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	http://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Transcoding DLNA-server implemented in Java
 
 RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 USES=		dos2unix
 DOS2UNIX_GLOB=	derby.properties
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
-SUB_FILES+=	pkg-message serviiod serviio-console
+SUB_FILES+=	pkg-message serviiod
 USE_RC_SUBR=	serviio
 SUB_LIST+=	USER=${USERS}
 RESTRICTED=	License does not allow selling
 EXTRACT_AFTER_ARGS=--exclude junit.jar	\
 	--exclude org.restlet.ext.net.jar
 
 USERS=	dlna
 GROUPS=	dlna
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/plugins
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 .for f in application-profiles profiles log4j
 	${INSTALL_DATA} ${WRKSRC}/config/$f.xml \
 		${STAGEDIR}${ETCDIR}/$f.xml.sample
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/console-log4j.properties	\
 		${STAGEDIR}${ETCDIR}/console-log4j.properties.sample
 	${INSTALL_SCRIPT} ${WRKDIR}/serviiod ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKDIR}/serviio-console ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/net/serviio/distinfo
===================================================================
--- head/net/serviio/distinfo	(revision 409688)
+++ head/net/serviio/distinfo	(revision 409689)
@@ -1,2 +1,2 @@
-SHA256 (serviio-1.5.2-linux.tar.gz) = 5886adc36b1a5a90b11276497f0298b594944ed54cc9c3b58676acf8742e106d
-SIZE (serviio-1.5.2-linux.tar.gz) = 22073991
+SHA256 (serviio-1.6-linux.tar.gz) = 1e0bda45979bb9243ca911f50f65ac1dc398d7bf6c1ccc97be13122bc6902e1c
+SIZE (serviio-1.6-linux.tar.gz) = 23752475
Index: head/net/serviio/files/serviio-console.in
===================================================================
--- head/net/serviio/files/serviio-console.in	(revision 409688)
+++ head/net/serviio/files/serviio-console.in	(nonexistent)
@@ -1,32 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-##                                                                          ##
-##  Serviio Console ript                                                    ##
-##                                                                          ##
-### ====================================================================== ###
-
-SERVIIO_CONSOLE_HOME=%%JAVAJARDIR%%/serviio
-
-# Setup the classpath
-SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CONSOLE_HOME/serviio.jar"
-# Setup the classpath
-for j in $SERVIIO_CONSOLE_HOME/*.jar; do
-	SERVIIO_CONSOLE_CLASS_PATH="$SERVIIO_CONSOLE_CLASS_PATH:$j"
-done
-
-# Setup Serviio specific properties
-JAVA_OPTS="-Dserviio.home=$SERVIIO_CONSOLE_HOME -Djava.net.preferIPv4Stack=true -Dorg.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade"
-JAVA_OPTS="${JAVA_OPTS} -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 -Xms5M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 $JAVA_OPTS -classpath "$SERVIIO_CONSOLE_CLASS_PATH" org.serviio.console.ServiioConsole "$@"

Property changes on: head/net/serviio/files/serviio-console.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/serviio/pkg-plist
===================================================================
--- head/net/serviio/pkg-plist	(revision 409688)
+++ head/net/serviio/pkg-plist	(revision 409689)
@@ -1,46 +1,46 @@
 sbin/serviiod
-bin/serviio-console
 %%JAVAJARDIR%%/serviio/commons-codec.jar
 %%JAVAJARDIR%%/serviio/commons-imaging.jar
 %%JAVAJARDIR%%/serviio/commons-io.jar
 %%JAVAJARDIR%%/serviio/commons-jxpath.jar
 %%JAVAJARDIR%%/serviio/commons-lang.jar
 %%JAVAJARDIR%%/serviio/concurrent.jar
 %%JAVAJARDIR%%/serviio/derby.jar
 %%JAVAJARDIR%%/serviio/freemarker.jar
 %%JAVAJARDIR%%/serviio/groovy-all.jar
 %%JAVAJARDIR%%/serviio/gson.jar
 %%JAVAJARDIR%%/serviio/httpcore.jar
 %%JAVAJARDIR%%/serviio/jaudiotagger.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/org.restlet.ext.gson.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.simple.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.slf4j.jar
 %%JAVAJARDIR%%/serviio/org.restlet.ext.xstream.jar
 %%JAVAJARDIR%%/serviio/org.restlet.jar
 %%JAVAJARDIR%%/serviio/padlock.jar
 %%JAVAJARDIR%%/serviio/rome-modules.jar
 %%JAVAJARDIR%%/serviio/rome.jar
 %%JAVAJARDIR%%/serviio/sbbi-upnp.jar
-%%JAVAJARDIR%%/serviio/serviio-client.jar
 %%JAVAJARDIR%%/serviio/serviio-mediabrowser-api.jar
 %%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar
+%%JAVAJARDIR%%/serviio/serviio-web-console-api.jar
+%%JAVAJARDIR%%/serviio/serviio-web-console.jar
 %%JAVAJARDIR%%/serviio/serviio.jar
 %%JAVAJARDIR%%/serviio/simple.jar
 %%JAVAJARDIR%%/serviio/slf4j-api.jar
 %%JAVAJARDIR%%/serviio/slf4j-log4j12.jar
 %%JAVAJARDIR%%/serviio/streamflyer-core.jar
 %%JAVAJARDIR%%/serviio/winp.jar
 %%JAVAJARDIR%%/serviio/xstream.jar
 @sample %%ETCDIR%%/profiles.xml.sample
 @sample %%ETCDIR%%/log4j.xml.sample
 @sample %%ETCDIR%%/application-profiles.xml.sample
 @sample %%ETCDIR%%/console-log4j.properties.sample
 @dir %%JAVAJARDIR%%/serviio/plugins