Index: head/net/serviio/Makefile
===================================================================
--- head/net/serviio/Makefile	(revision 562220)
+++ head/net/serviio/Makefile	(revision 562221)
@@ -1,52 +1,54 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 # $FreeBSD$
 
 PORTNAME=	serviio
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	https://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Transcoding DLNA-server implemented in Java
 
 RUN_DEPENDS=	ffmpeg: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
 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} ${WRKSRC}/config/serviio.jks \
+		${STAGEDIR}${ETCDIR}/serviio.jks.sample
 	${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>
Index: head/net/serviio/pkg-plist
===================================================================
--- head/net/serviio/pkg-plist	(revision 562220)
+++ head/net/serviio/pkg-plist	(revision 562221)
@@ -1,57 +1,58 @@
 %%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/derby.jar
 %%JAVAJARDIR%%/serviio/freemarker.jar
 %%JAVAJARDIR%%/serviio/groovy-all.jar
 %%JAVAJARDIR%%/serviio/gson.jar
 %%JAVAJARDIR%%/serviio/httpclient-cache.jar
 %%JAVAJARDIR%%/serviio/httpclient.jar
 %%JAVAJARDIR%%/serviio/httpcore.jar
 %%JAVAJARDIR%%/serviio/icu4j.jar
 %%JAVAJARDIR%%/serviio/imgscalr-lib.jar
 %%JAVAJARDIR%%/serviio/jaudiotagger.jar
 %%JAVAJARDIR%%/serviio/javax.xml.soap-api.jar
 %%JAVAJARDIR%%/serviio/jcl-over-slf4j.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
 %%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/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
 %%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/stax-api.jar
 %%JAVAJARDIR%%/serviio/stax-ex.jar
 %%JAVAJARDIR%%/serviio/streamflyer-core.jar
 %%JAVAJARDIR%%/serviio/winp.jar
 %%JAVAJARDIR%%/serviio/xstream.jar
 @sample %%ETCDIR%%/application-profiles.xml.sample
 @sample %%ETCDIR%%/console-log4j.properties.sample
 @sample %%ETCDIR%%/log4j.xml.sample
 @sample %%ETCDIR%%/profiles.xml.sample
+@sample %%ETCDIR%%/serviio.jks.sample
 sbin/serviiod