Index: head/net-im/jicofo/Makefile
===================================================================
--- head/net-im/jicofo/Makefile	(revision 534104)
+++ head/net-im/jicofo/Makefile	(revision 534105)
@@ -1,65 +1,66 @@
 # $FreeBSD$
 
 PORTNAME=	jicofo
 DISTVERSION=	1.0-555
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im java
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Server side focus component used in Jitsi Meet conferences
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GITHUB=     yes
 GH_ACCOUNT=	jitsi
 GH_PROJECT=     jicofo
 GH_TAGNAME=	ec1b29e
 USE_JAVA=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
+SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/jicofo
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/:maven
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	cd ${WRKSRC}/lib \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
 
 	@(echo "JVB_XMPP_HOST=localhost"; \
 	echo "JVB_XMPP_DOMAIN=jitsi.example.com"; \
 	echo "JVB_XMPP_PORT=5347"; \
 	echo "JVB_XMPP_SECRET=YOURSECRET3"; \
 	echo "JVB_XMPP_USER_DOMAIN=auth.jitsi.example.com"; \
 	echo "JVB_XMPP_USER_NAME=focus"; \
 	echo "JVB_XMPP_USER_SECRET=YOURSECRET3"; \
         echo ""; \
         echo "MAX_MEMORY=3072m"; \
         ) > ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-1.1-SNAPSHOT-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
  	
 .include <bsd.port.mk>
Index: head/net-im/jicofo/files/jicofo.in
===================================================================
--- head/net-im/jicofo/files/jicofo.in	(revision 534104)
+++ head/net-im/jicofo/files/jicofo.in	(revision 534105)
@@ -1,87 +1,91 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: jicofo
 # REQUIRE: NETWORKING SERVERS
 # KEYWORD: shutdown
 #
 # Configuration settings for jicofo in /etc/rc.conf:
 #
+# jicofo_enable:	run jicofo server (default=NO)
+# jicofo_flags:		additional flags for jicofo server (default="")
 #
 
 . /etc/rc.subr
 
 name="jicofo"
 rcvar=${name}_enable
 
-jicofo_env_file="%%LOCALBASE%%/etc/jitsi/jicofo/jicofo.conf"
+jicofo_env_file="%%ETCDIR%%/jicofo.conf"
 jicofo_jar="%%JAVAJARDIR%%/jicofo.jar"
 jicofo_logging_config="%%DATADIR%%/lib/logging.properties"
+jicofo_trust_store="%%ETCDIR%%/truststore.jks"
 
 load_rc_config "${name}"
 
 : ${jicofo_enable="NO"}
 : ${jicofo_flags=""}
 
-command="%%LOCALBASE%%/bin/java"
+command="%%JAVA%%"
 pidfile="/var/run/jicofo.pid"
-required_files="${jicofo_env_file} %%LOCALBASE%%/etc/ssl/java.pem"
+required_files="${jicofo_env_file} ${jicofo_trust_store}"
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
 status_cmd=${name}_status
 restart_cmd=${name}_restart
 
 jicofo_start()
 {
-	daemon -p ${pidfile} -o /var/log/${name}.log ${command} -Xmx${MAX_MEMORY} \
+	daemon -p ${pidfile} -o /var/log/${name}.log \
+		${command} -Xmx${MAX_MEMORY} \
                 -XX:+HeapDumpOnOutOfMemoryError \
                 -XX:HeapDumpPath=/tmp \
                 -Djava.util.logging.config.file=${jicofo_logging_config} \
                 -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
                 -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \
                 -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
-		-Djavax.net.ssl.trustStore=%%LOCALBASE%%/etc/ssl/java.pem \
+		-Djavax.net.ssl.trustStore=${jicofo_trust_store} \
                 -cp ${jicofo_jar} \
                 org.jitsi.jicofo.Main \
                 --host=${JVB_XMPP_HOST} \
                 --domain=${JVB_XMPP_DOMAIN} \
                 --port=${JVB_XMPP_PORT} \
                 --secret=${JVB_XMPP_SECRET} \
 		--user_domain=${JVB_XMPP_USER_DOMAIN} \
 		--user_name=${JVB_XMPP_USER_NAME} \
 		--user_password=${JVB_XMPP_USER_SECRET} ${jicofo_flags}
 		echo "Started"
 }
 
 jicofo_stop()
 {
         if [ -f ${pidfile} ]
         then
                 kill `cat ${pidfile}`
                 rm ${pidfile}
 		echo "Stopped"
         fi
 }
 
 jicofo_status()
 {
         # If running, show pid
         if [ -f ${pidfile} ]
         then
                 echo "${name} is running as pid" `cat ${pidfile}`
         else
                 echo "${name} is not running"
         fi
 }
 
 jicofo_restart()
 {
 	echo "Performing restart"
 	jicofo_stop
 	sleep 5
 	jicofo_start
 }
 
 run_rc_command "$1"
Index: head/net-im/jicofo/files/pkg-message.in
===================================================================
--- head/net-im/jicofo/files/pkg-message.in	(revision 534104)
+++ head/net-im/jicofo/files/pkg-message.in	(revision 534105)
@@ -1,30 +1,30 @@
 [
 { type: install
   message: <<EOM
 Jitsi Conference Focus was installed
 
-1) Configuration file is located at:
+1) The configuration file is used by the startup rcfile and located at:
 
    %%ETCDIR%%/jicofo.conf
 
-   Values defined there are used by startup script file
-
 2) Add jicofo_enable="YES" to /etc/rc.conf.
 
-3) If you are using net-im/prosody with jicofo, do not forget import trusted 
-   certificate file
+3) For use of jicofo with net-im/prosody, you need to import prosody's
+   auth.jitsi.example.com TLS certificate into a Java truststore.
+   The startup rcfile will pass this filename to jicofo:
+   %%ETCDIR%%/truststore.jks - for example:
 
-  # keytool -noprompt -keystore %%LOCALBASE%%/etc/ssl/java.pem -importcert -alias prosody -file /path/to/prosody/auth.jitsi.example.com.crt
+   # prosodyctl cert generate jitsi.example.com
+   # prosodyctl cert generate auth.jitsi.example.com
+   # keytool -noprompt -keystore %%ETCDIR%%/truststore.jks -importcert -alias prosody -file /path/to/prosody/auth.jitsi.example.com.crt
 
-4) If you want use jicofo on FreeBSD 11.x, please look for apply the
-   following patch file:
+4) If you want use jicofo on FreeBSD 11.x, please apply the
+   following patch file: https://reviews.freebsd.org/D14453
 
-   https://reviews.freebsd.org/D14453
-
-   jicofo rc script use ${name}_env_file functionality. It is
+   jicofo rc script use ${name}_env_file functionality which is only
    available on FreeBSD >= 12.x
 
 5) Enjoy it
 EOM
 }
 ]