Index: head/databases/puppetdb5/Makefile
===================================================================
--- head/databases/puppetdb5/Makefile	(revision 500513)
+++ head/databases/puppetdb5/Makefile	(revision 500514)
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
 PORTVERSION=	5.2.8
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash \
 		puppet:sysutils/puppet5
 
 USE_RC_SUBR=	puppetdb
 
 CONFLICTS_INSTALL=	puppetdb4-* puppetdb5-*
 USES=		shebangfix
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
 		ext/cli/foreground \
 		ext/cli/upgrade \
 		ext/cli/ssl-setup \
 		ext/cli/start \
 		ext/cli/stop \
 		ext/cli/reload \
 		ext/ezbake-functions.sh
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.7+
 
 USERS=		puppetdb
 GROUPS=		puppetdb
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 .for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
 	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
 
 .include <bsd.port.mk>
Index: head/databases/puppetdb5/files/puppetdb.in
===================================================================
--- head/databases/puppetdb5/files/puppetdb.in	(revision 500513)
+++ head/databases/puppetdb5/files/puppetdb.in	(revision 500514)
@@ -1,91 +1,91 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: puppetdb
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Configuration settings for puppetdb in /etc/rc.conf:
 #
 # puppetdb_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable puppetdb
 #
 # puppetdb_args (str):
 #   Extra arguments passed to start command
 #
 # puppetdb_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Set the Java virtual machine to run puppetdb
 #
 # puppetdb_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 # puppetdb_user (str):
 #   Set to "puppetdb" by default.
 #   User to run puppetdb as.
 #
 # puppetdb_group (str):
 #   Set to "puppetdb" by default.
 #   Group for data file ownership.
 #
 # puppetdb_log_file (str):
 #   Set to "/var/log/puppetdb/puppetdb.log" by default.
 #   Log file location.
 #
 
 . /etc/rc.subr
 
 name="puppetdb"
 rcvar=puppetdb_enable
 
 load_rc_config "${name}"
 
 : ${puppetdb_enable="NO"}
 : ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
 : ${puppetdb_java_home="%%JAVA_HOME%%"}
 : ${puppetdb_user="puppetdb"}
 : ${puppetdb_group="puppetdb"}
 : ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
 
 pidfile="/var/run/puppetdb/puppetdb.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetdb_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
+command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
 
 
 required_files="${java_cmd}"
 
 start_precmd="puppetdb_prestart"
 
 puppetdb_prestart() {
   if [ ! -d "/var/log/puppetdb" ]; then
     install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
   fi
   if [ ! -f "${puppetdb_log_file}" ]; then
     touch "${puppetdb_log_file}"
     chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
     chmod 640 "${puppetdb_log_file}"
   fi
   if [ ! -d "/var/run/puppetdb" ]; then
     install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
   fi
 
   chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
   chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
 
   chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
   chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
 
   if [ ! -d "/var/db/puppetdb" ]; then
     install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
   fi
   chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
   chmod 0750 "/var/db/puppetdb"
 }
 
 run_rc_command "$1"
Index: head/databases/puppetdb6/Makefile
===================================================================
--- head/databases/puppetdb6/Makefile	(revision 500513)
+++ head/databases/puppetdb6/Makefile	(revision 500514)
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
 PORTVERSION=	6.3.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash \
 		puppet:sysutils/puppet6
 
 USE_RC_SUBR=	puppetdb
 
 CONFLICTS_INSTALL=	puppetdb4-* puppetdb5-*
 USES=		shebangfix
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
 		ext/cli/foreground \
 		ext/cli/ssl-setup \
 		ext/cli/start \
 		ext/cli/stop \
 		ext/cli/reload \
 		ext/cli/upgrade \
 		ext/ezbake-functions.sh
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.7+
 
 USERS=		puppetdb
 GROUPS=		puppetdb
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 .for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
 	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
 
 .include <bsd.port.mk>
Index: head/databases/puppetdb6/files/puppetdb.in
===================================================================
--- head/databases/puppetdb6/files/puppetdb.in	(revision 500513)
+++ head/databases/puppetdb6/files/puppetdb.in	(revision 500514)
@@ -1,91 +1,91 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: puppetdb
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Configuration settings for puppetdb in /etc/rc.conf:
 #
 # puppetdb_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable puppetdb
 #
 # puppetdb_args (str):
 #   Extra arguments passed to start command
 #
 # puppetdb_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Set the Java virtual machine to run puppetdb
 #
 # puppetdb_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 # puppetdb_user (str):
 #   Set to "puppetdb" by default.
 #   User to run puppetdb as.
 #
 # puppetdb_group (str):
 #   Set to "puppetdb" by default.
 #   Group for data file ownership.
 #
 # puppetdb_log_file (str):
 #   Set to "/var/log/puppetdb/puppetdb.log" by default.
 #   Log file location.
 #
 
 . /etc/rc.subr
 
 name="puppetdb"
 rcvar=puppetdb_enable
 
 load_rc_config "${name}"
 
 : ${puppetdb_enable="NO"}
 : ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
 : ${puppetdb_java_home="%%JAVA_HOME%%"}
 : ${puppetdb_user="puppetdb"}
 : ${puppetdb_group="puppetdb"}
 : ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
 
 pidfile="/var/run/puppetdb/puppetdb.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetdb_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
+command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
 
 
 required_files="${java_cmd}"
 
 start_precmd="puppetdb_prestart"
 
 puppetdb_prestart() {
   if [ ! -d "/var/log/puppetdb" ]; then
     install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
   fi
   if [ ! -f "${puppetdb_log_file}" ]; then
     touch "${puppetdb_log_file}"
     chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
     chmod 640 "${puppetdb_log_file}"
   fi
   if [ ! -d "/var/run/puppetdb" ]; then
     install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
   fi
 
   chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
   chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
 
   chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
   chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
 
   if [ ! -d "/var/db/puppetdb" ]; then
     install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
   fi
   chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
   chmod 0750 "/var/db/puppetdb"
 }
 
 run_rc_command "$1"
Index: head/sysutils/puppetserver5/Makefile
===================================================================
--- head/sysutils/puppetserver5/Makefile	(revision 500513)
+++ head/sysutils/puppetserver5/Makefile	(revision 500514)
@@ -1,96 +1,97 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
 PORTVERSION=	5.3.8
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Puppet Server running in the JVM
 
 LICENSE=	APACHE20
 
 BROKEN_FreeBSD_12=	Does not start. See PR 233766
 BROKEN_FreeBSD_13=	Does not start. See PR 233766
 
 RUN_DEPENDS=	bash>=0:shells/bash \
 		puppet5>=0:sysutils/puppet5
 
 USES=		shebangfix
 USE_RC_SUBR=	puppetserver
 
 USE_JAVA=	yes
 USE_RUBY=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.8+
 
 CONFLICTS_INSTALL=	puppetserver-* puppetserver6-*
 
 SHEBANG_FILES=  ext/bin/puppetserver
 
 USERS=		puppet
 GROUPS=		puppet
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFAULT=	CFACTER
 OPTIONS_RADIO=		FACTER
 OPTIONS_RADIO_FACTER=	CFACTER RFACTER
 
 RFACTER_DESC=	Use facter 2.x (written in Ruby)
 CFACTER_DESC=	Use facter 3.x (experimental rewrite in C++)
 
 RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
 
 CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
 
 post-patch:
 .for file in ext/config/logback.xml ext/config/request-logging.xml \
 	ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \
 	ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \
 	ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \
 	ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver \
 	ext/cli_defaults/cli-defaults.sh
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \
 		-e 's|%%RUBY_VER%%|${RUBY_VER}|' \
 		-e 's|%%JAVA%%|${JAVA}|' \
 		-e 's|%%ETCDIR%%|${ETCDIR}|' \
 		-e 's|%%DATADIR%%|${DATADIR}|' \
 		${WRKSRC}/${file}
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/services.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
 	@${MKDIR} ${STAGEDIR}/var/log/puppetserver
 	@${MKDIR} ${STAGEDIR}/var/puppet/server
 	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar
 	${INSTALL_DATA} ${WRKSRC}/jruby-9k.jar ${STAGEDIR}${DATADIR}/jruby-9k.jar
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/metrics.conf ${STAGEDIR}${ETCDIR}/conf.d/metrics.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/services.d/ca.cfg ${STAGEDIR}${ETCDIR}/services.d/ca.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/system-config/services.d/bootstrap.cfg ${STAGEDIR}${ETCDIR}/services.d/bootstrap.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetserver ${STAGEDIR}${PREFIX}/bin/puppetserver
 	${INSTALL_DATA} ${WRKSRC}/ext/ezbake-functions.sh ${STAGEDIR}${DATADIR}/ezbake-functions.sh
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/reload ${STAGEDIR}${DATADIR}/cli/apps/reload
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop
 	${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh
 
 .include <bsd.port.mk>
Index: head/sysutils/puppetserver5/files/puppetserver.in
===================================================================
--- head/sysutils/puppetserver5/files/puppetserver.in	(revision 500513)
+++ head/sysutils/puppetserver5/files/puppetserver.in	(revision 500514)
@@ -1,96 +1,97 @@
 #!/bin/sh
 
 # $FreeBSD: head/sysutils/puppetserver/files/puppetserver.in 428145 2016-12-08 17:41:39Z swills $
 #
 # PROVIDE: puppetserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Configuration settings for puppetserver in /etc/rc.conf:
 #
 # puppetserver_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable puppetserver
 #
 # puppetserver_args (str):
 #   Extra arguments passed to start command
 #
 # puppetserver_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Set the Java virtual machine to run puppetserver
 #
 # puppetserver_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 # puppetserver_user (str):
 #   Set to "puppet" by default.
 #   User to run puppetserver as.
 #
 # puppetserver_group (str):
 #   Set to "puppet" by default.
 #   Group for data file ownership.
 #
 # puppetserver_log_file (str):
 #   Set to "/var/log/puppetserver/puppetserver.log" by default.
 #   Log file location.
 #
 
 . /etc/rc.subr
 
 name="puppetserver"
 rcvar=puppetserver_enable
 
 load_rc_config "${name}"
 
 : ${puppetserver_enable="NO"}
 : ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"}
 : ${puppetserver_java_home="%%JAVA_HOME%%"}
+: ${puppetserver_java_opts=""}
 : ${puppetserver_user="puppet"}
 : ${puppetserver_group="puppet"}
 : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"}
 
 pidfile="/var/run/puppetserver/puppetserver.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-f -p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
+command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"
 
 start_precmd="puppetserver_prestart"
 
 # An UTF-8 locale is required
 : LC_ALL=${LC_ALL:=C.UTF-8}
 case $LC_ALL in
     *.UTF-8)
         ;;
     *.*)
         LC_ALL="${LC_ALL%.*}.UTF-8"
         ;;
     *)
         LC_ALL=C.UTF-8
         ;;
 esac
 export LC_ALL
 
 puppetserver_prestart() {
   if [ ! -f "${puppetserver_log_file}" ]; then
     touch "${puppetserver_log_file}"
     chown "${puppetserver_user}:${puppetserver_group}" "${puppetserver_log_file}"
     chmod 640 "${puppetserver_log_file}"
   fi
   if [ ! -d "/var/run/puppetserver" ]; then
     install -d -o "${puppetserver_user}" -g "${puppetserver_group}" -m 750 "/var/run/puppetserver"
   fi
 
   chown -R "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/conf.d"
   chmod 0750 "%%PREFIX%%/etc/puppetserver/conf.d"
 
   chown "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/logback.xml"
   chmod 0640 "%%PREFIX%%/etc/puppetserver/logback.xml"
 }
 
 run_rc_command "$1"
Index: head/sysutils/puppetserver6/Makefile
===================================================================
--- head/sysutils/puppetserver6/Makefile	(revision 500513)
+++ head/sysutils/puppetserver6/Makefile	(revision 500514)
@@ -1,93 +1,94 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
 PORTVERSION=	6.3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Puppet Server running in the JVM
 
 LICENSE=	APACHE20
 
 BROKEN_FreeBSD_12=	Does not start. See PR 233766
 BROKEN_FreeBSD_13=	Does not start. See PR 233766
 
 RUN_DEPENDS=	bash>=0:shells/bash \
 		jruby>=9.1:lang/jruby \
 		puppet6>=0:sysutils/puppet6 \
 		rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \
 		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \
 		sudo>=1:security/sudo
 
 USES=		shebangfix
 USE_RC_SUBR=	puppetserver
 
 USE_JAVA=	yes
 USE_RUBY=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.8+
 
 CONFLICTS_INSTALL=	puppetserver-* puppetserver5-*
 
 SHEBANG_FILES=  ext/bin/puppetserver
 
 USERS=		puppet
 GROUPS=		puppet
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 .for file in ext/config/logback.xml ext/config/request-logging.xml \
 	ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \
 	ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \
 	ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \
 	ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver \
 	ext/cli_defaults/cli-defaults.sh ext/cli/foreground
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \
 		-e 's|%%RUBY_VER%%|${RUBY_VER}|' \
 		-e 's|%%JAVA%%|${JAVA}|' \
 		-e 's|%%ETCDIR%%|${ETCDIR}|' \
 		-e 's|%%DATADIR%%|${DATADIR}|' \
 		${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|#!/opt/puppetlabs/puppet/bin/ruby|#!${RUBY}|' \
 		${WRKSRC}/ext/cli/ca
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/services.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
 	@${MKDIR} ${STAGEDIR}/var/log/puppetserver
 	@${MKDIR} ${STAGEDIR}/var/puppet/server
 	@${MKDIR} ${STAGEDIR}/var/puppet/server/data
 	@${MKDIR} ${STAGEDIR}/var/run/puppetserver
 	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/metrics.conf ${STAGEDIR}${ETCDIR}/conf.d/metrics.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/services.d/ca.cfg ${STAGEDIR}${ETCDIR}/services.d/ca.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/system-config/services.d/bootstrap.cfg ${STAGEDIR}${ETCDIR}/services.d/bootstrap.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetserver ${STAGEDIR}${PREFIX}/bin/puppetserver
 	${INSTALL_DATA} ${WRKSRC}/ext/ezbake-functions.sh ${STAGEDIR}${DATADIR}/ezbake-functions.sh
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/ca ${STAGEDIR}${DATADIR}/cli/apps/ca
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/reload ${STAGEDIR}${DATADIR}/cli/apps/reload
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start
 	${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop
 	${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh
 
 .include <bsd.port.mk>
Index: head/sysutils/puppetserver6/files/puppetserver.in
===================================================================
--- head/sysutils/puppetserver6/files/puppetserver.in	(revision 500513)
+++ head/sysutils/puppetserver6/files/puppetserver.in	(revision 500514)
@@ -1,96 +1,97 @@
 #!/bin/sh
 
 # $FreeBSD: head/sysutils/puppetserver/files/puppetserver.in 428145 2016-12-08 17:41:39Z swills $
 #
 # PROVIDE: puppetserver
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Configuration settings for puppetserver in /etc/rc.conf:
 #
 # puppetserver_enable (bool):
 #   Set to "NO" by default.
 #   Set it to "YES" to enable puppetserver
 #
 # puppetserver_args (str):
 #   Extra arguments passed to start command
 #
 # puppetserver_java_home (str):
 #   Set to "%%JAVA_HOME%%" by default.
 #   Set the Java virtual machine to run puppetserver
 #
 # puppetserver_java_opts (str):
 #   Set to "" by default.
 #   Java VM args to use.
 #
 # puppetserver_user (str):
 #   Set to "puppet" by default.
 #   User to run puppetserver as.
 #
 # puppetserver_group (str):
 #   Set to "puppet" by default.
 #   Group for data file ownership.
 #
 # puppetserver_log_file (str):
 #   Set to "/var/log/puppetserver/puppetserver.log" by default.
 #   Log file location.
 #
 
 . /etc/rc.subr
 
 name="puppetserver"
 rcvar=puppetserver_enable
 
 load_rc_config "${name}"
 
 : ${puppetserver_enable="NO"}
 : ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"}
 : ${puppetserver_java_home="%%JAVA_HOME%%"}
+: ${puppetserver_java_opts=""}
 : ${puppetserver_user="puppet"}
 : ${puppetserver_group="puppet"}
 : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"}
 
 pidfile="/var/run/puppetserver/puppetserver.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-f -p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
+command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"
 
 start_precmd="puppetserver_prestart"
 
 # An UTF-8 locale is required
 : LC_ALL=${LC_ALL:=C.UTF-8}
 case $LC_ALL in
     *.UTF-8)
         ;;
     *.*)
         LC_ALL="${LC_ALL%.*}.UTF-8"
         ;;
     *)
         LC_ALL=C.UTF-8
         ;;
 esac
 export LC_ALL
 
 puppetserver_prestart() {
   if [ ! -f "${puppetserver_log_file}" ]; then
     touch "${puppetserver_log_file}"
     chown "${puppetserver_user}:${puppetserver_group}" "${puppetserver_log_file}"
     chmod 640 "${puppetserver_log_file}"
   fi
   if [ ! -d "/var/run/puppetserver" ]; then
     install -d -o "${puppetserver_user}" -g "${puppetserver_group}" -m 750 "/var/run/puppetserver"
   fi
 
   chown -R "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/conf.d"
   chmod 0750 "%%PREFIX%%/etc/puppetserver/conf.d"
 
   chown "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/logback.xml"
   chmod 0640 "%%PREFIX%%/etc/puppetserver/logback.xml"
 }
 
 run_rc_command "$1"