Index: head/sysutils/puppetserver6/Makefile
===================================================================
--- head/sysutils/puppetserver6/Makefile	(revision 526635)
+++ head/sysutils/puppetserver6/Makefile	(revision 526636)
@@ -1,98 +1,98 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
-PORTVERSION=	6.8.0
+PORTVERSION=	6.9.0
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/:upstream \
 		https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi
 PKGNAMESUFFIX=	6
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:upstream \
 		ffi.rb:ffi
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Puppet Server running in the JVM
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash>=0:shells/bash \
 		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
 
 pre-patch:
 	${CP} ${_DISTDIR}/ffi.rb ${WRKSRC}
 
 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}${DATADIR}/lib
 	@${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
 	${INSTALL_DATA} ${WRKSRC}/ffi.rb ${STAGEDIR}${DATADIR}/lib
 
 .include <bsd.port.mk>
Index: head/sysutils/puppetserver6/distinfo
===================================================================
--- head/sysutils/puppetserver6/distinfo	(revision 526635)
+++ head/sysutils/puppetserver6/distinfo	(revision 526636)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1579106523
-SHA256 (puppetserver-6.8.0.tar.gz) = 53c96490df765a3eef8771f410b6678a910832c5c4568bd72c25d1d618e0049f
-SIZE (puppetserver-6.8.0.tar.gz) = 59370389
+TIMESTAMP = 1582061370
+SHA256 (puppetserver-6.9.0.tar.gz) = 23c2414447110b44caf5a221ee98296e8f1e0818db0b1c57606b626ce1f8d87e
+SIZE (puppetserver-6.9.0.tar.gz) = 59495229
 SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93
 SIZE (ffi.rb) = 5893
Index: head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf
===================================================================
--- head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf	(revision 526635)
+++ head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf	(revision 526636)
@@ -1,59 +1,59 @@
 --- ext/config/conf.d/puppetserver.conf.orig	2019-11-18 21:34:21 UTC
 +++ ext/config/conf.d/puppetserver.conf
 @@ -2,16 +2,24 @@
  jruby-puppet: {
      # Where the puppet-agent dependency places puppet, facter, etc...
      # Puppet server expects to load Puppet from this location
 -    ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
 +    ruby-load-path: [
 +        %%PREFIX%%/share/puppetserver/lib,
 +        %%RUBY_SITELIBDIR%%,
 +        %%PREFIX%%/lib/ruby/vendor_ruby,
-+        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/concurrent-ruby-1.1.5/lib,
++        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/concurrent-ruby-1.1.6/lib/concurrent-ruby,
 +        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/deep_merge-1.2.1/lib,
 +        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/multi_json-1.13.1/lib,
 +        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/semantic_puppet-1.0.2/lib,
 +    ]
  
      # This setting determines where JRuby will install gems.  It is used for loading gems,
      # and also by the `puppetserver gem` command line tool.
 -    gem-home: /opt/puppetlabs/server/data/puppetserver/jruby-gems
 +    gem-home: /var/puppet/server/data/puppetserver/jruby-gems
  
      # This setting defines the complete "GEM_PATH" for jruby.  If set, it should include
      # the gem-home directory as well as any other directories that gems can be loaded
      # from (including the vendored gems directory for gems that ship with puppetserver)
 -    gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"]
 +    gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems"]
  
      # PLEASE NOTE: Use caution when modifying the below settings. Modifying
      # these settings will change the value of the corresponding Puppet settings
 @@ -26,23 +34,23 @@ jruby-puppet: {
  
      # (optional) path to puppet conf dir; if not specified, will use
      # /etc/puppetlabs/puppet
 -    master-conf-dir: /etc/puppetlabs/puppet
 +    master-conf-dir: %%PREFIX%%/etc/puppet
  
      # (optional) path to puppet code dir; if not specified, will use
      # /etc/puppetlabs/code
 -    master-code-dir: /etc/puppetlabs/code
 +    master-code-dir: %%PREFIX%%/etc/puppet/code
  
      # (optional) path to puppet var dir; if not specified, will use
      # /opt/puppetlabs/server/data/puppetserver
 -    master-var-dir: /opt/puppetlabs/server/data/puppetserver
 +    master-var-dir: /var/puppet/server/data/puppetserver
  
      # (optional) path to puppet run dir; if not specified, will use
      # /var/run/puppetlabs/puppetserver
 -    master-run-dir: /var/run/puppetlabs/puppetserver
 +    master-run-dir: /var/run/puppetserver
  
      # (optional) path to puppet log dir; if not specified, will use
      # /var/log/puppetlabs/puppetserver
 -    master-log-dir: /var/log/puppetlabs/puppetserver
 +    master-log-dir: /var/log/puppetserver
  
      # (optional) maximum number of JRuby instances to allow
      #max-active-instances: 1