Index: head/net-im/jicofo/Makefile
===================================================================
--- head/net-im/jicofo/Makefile	(revision 533312)
+++ head/net-im/jicofo/Makefile	(revision 533313)
@@ -1,64 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	jicofo
 DISTVERSION=	1.0-555
+PORTREVISION=	1
 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
 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 533312)
+++ head/net-im/jicofo/files/jicofo.in	(revision 533313)
@@ -1,87 +1,87 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: jicofo
 # REQUIRE: NETWORKING SERVERS
 # KEYWORD: shutdown
 #
 # Configuration settings for jicofo in /etc/rc.conf:
 #
 #
 
 . /etc/rc.subr
 
 name="jicofo"
 rcvar=${name}_enable
 
-jicofo_env_file="/usr/local/etc/jicofo.conf"
+jicofo_env_file="%%LOCALBASE%%/etc/jitsi/jicofo/jicofo.conf"
 jicofo_jar="%%JAVAJARDIR%%/jicofo.jar"
 jicofo_logging_config="%%DATADIR%%/lib/logging.properties"
 
 load_rc_config "${name}"
 
 : ${jicofo_enable="NO"}
 : ${jicofo_flags=""}
 
 command="%%LOCALBASE%%/bin/java"
 pidfile="/var/run/jicofo.pid"
 required_files="${jicofo_env_file} %%LOCALBASE%%/etc/ssl/java.pem"
 
 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} \
                 -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 \
                 -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/jitsi-videobridge/Makefile
===================================================================
--- head/net-im/jitsi-videobridge/Makefile	(revision 533312)
+++ head/net-im/jitsi-videobridge/Makefile	(revision 533313)
@@ -1,68 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	jitsi
 DISTVERSION=	2.1-183
+PORTREVISION=	1
 CATEGORIES=	net-im java
 PKGNAMESUFFIX=	-videobridge
-#DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	WebRTC compatible video router or SFU
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GITHUB=     yes
 GH_PROJECT=     ${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	dbddd16
 USE_JAVA=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES+=	pkg-message
 ETCDIR=		${PREFIX}/etc/jitsi/videobridge
 
 DEV_UPDATE_MODE=        no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/:maven
 DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-PbuildFatJar -DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|1.0-20190319.172750-1|1.0-0-ge979298|g' ${WRKSRC}/pom.xml
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	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=YOURSECRET1"; \
 	echo ""; \
 	echo "VIDEOBRIDGE_MAX_MEMORY=3072m"; \
 	echo "# VIDEOBRIDGE_DEBUG_OPTIONS=\"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000\" "; \
 	) > ${STAGEDIR}${ETCDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}${PKGNAMESUFFIX}-2.1-SNAPSHOT-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
  	
 .include <bsd.port.mk>
Index: head/net-im/jitsi-videobridge/files/jitsi-videobridge.in
===================================================================
--- head/net-im/jitsi-videobridge/files/jitsi-videobridge.in	(revision 533312)
+++ head/net-im/jitsi-videobridge/files/jitsi-videobridge.in	(revision 533313)
@@ -1,83 +1,83 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: jitsi-videobridge
 # REQUIRE: NETWORKING SERVERS
 # KEYWORD: shutdown
 #
 # Configuration settings for jitsi-videobridge in /etc/rc.conf:
 #
 #
 
 . /etc/rc.subr
 
 name="jitsi_videobridge"
 rcvar=${name}_enable
 
-jitsi_videobridge_env_file="%%LOCALBASE%%/etc/jitsi/jitsi-videobridge.conf"
+jitsi_videobridge_env_file="%%LOCALBASE%%/etc/jitsi/videobridge/jitsi-videobridge.conf"
 jitsi_videobridge_jar="%%JAVAJARDIR%%/jitsi-videobridge.jar"
 jitsi_videobridge_logging_config="%%DATADIR%%/lib/logging.properties"
 
 load_rc_config "${name}"
 
 : ${jitsi_videobridge_enable="NO"}
 : ${jitsi_videobridge_flags=""}
 
 command="%%LOCALBASE%%/bin/java"
 
 pidfile="/var/run/jitsi-videobridge.pid"
 required_files="${jitsi_videobridge_env_file}"
 start_cmd=${name}_start
 stop_cmd=${name}_stop
 status_cmd=${name}_status
 restart_cmd=${name}_restart
 
 jitsi_videobridge_start()
 {
 	daemon -p ${pidfile} -o /var/log/jitsi-videobridge.log ${command} -Xmx${VIDEOBRIDGE_MAX_MEMORY} \
                 -XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError \
                 -XX:HeapDumpPath=/tmp \
                 -Djava.util.logging.config.file=${jitsi_videobridge_logging_config} \
                 -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=%%LOCALBASE%%/etc/jitsi \
                 -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
                 -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/ \
                 -cp ${jitsi_videobridge_jar} \
                 org.jitsi.videobridge.Main \
                 --host=${JVB_XMPP_HOST} \
                 --domain=${JVB_XMPP_DOMAIN} \
                 --port=${JVB_XMPP_PORT} \
                 --secret=${JVB_XMPP_SECRET} ${jitsi_videobridge_flags}
 		echo "Started"
 }
 
 jitsi_videobridge_stop()
 {
         if [ -f ${pidfile} ]
         then
                 kill `cat ${pidfile}`
                 rm ${pidfile}
 		echo "Stopped"
         fi
 }
 
 jitsi_videobridge_status()
 {
         # If running, show pid
         if [ -f ${pidfile} ]
         then
                 echo "${name} is running as pid" `cat ${pidfile}`
         else
                 echo "${name} is not running"
         fi
 }
 
 jitsi_videobridge_restart()
 {
 	echo "Performing restart"
 	jitsi_videobridge_stop
 	sleep 5
 	jitsi_videobridge_start
 }
 
 run_rc_command "$1"