Index: head/databases/puppetdb-terminus6/Makefile
===================================================================
--- head/databases/puppetdb-terminus6/Makefile	(revision 487830)
+++ head/databases/puppetdb-terminus6/Makefile	(revision 487831)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	6.0.1
+PORTVERSION=	6.1.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
 DISTNAME=	puppetdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet6>=0:sysutils/puppet6
 
 CONFLICTS_INSTALL=	puppetdb-terminus4-* puppetdb-terminus5-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 USES=		gmake
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
 
 .include <bsd.port.mk>
Index: head/databases/puppetdb-terminus6/distinfo
===================================================================
--- head/databases/puppetdb-terminus6/distinfo	(revision 487830)
+++ head/databases/puppetdb-terminus6/distinfo	(revision 487831)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540547058
-SHA256 (puppetdb-6.0.1.tar.gz) = eb3de8a60794829ced99771ec16032ded7de508bfb9c586a223917a4e949788c
-SIZE (puppetdb-6.0.1.tar.gz) = 23198234
+TIMESTAMP = 1545174654
+SHA256 (puppetdb-6.1.0.tar.gz) = ddd3295d0c1fa68c882d138223e5d4be1dfb643de6d34c0a82d0e95ff0c4a38b
+SIZE (puppetdb-6.1.0.tar.gz) = 40448212
Index: head/databases/puppetdb6/Makefile
===================================================================
--- head/databases/puppetdb6/Makefile	(revision 487830)
+++ head/databases/puppetdb6/Makefile	(revision 487831)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
-PORTVERSION=	6.0.1
+PORTVERSION=	6.1.0
 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/distinfo
===================================================================
--- head/databases/puppetdb6/distinfo	(revision 487830)
+++ head/databases/puppetdb6/distinfo	(revision 487831)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540547045
-SHA256 (puppetdb-6.0.1.tar.gz) = eb3de8a60794829ced99771ec16032ded7de508bfb9c586a223917a4e949788c
-SIZE (puppetdb-6.0.1.tar.gz) = 23198234
+TIMESTAMP = 1545174298
+SHA256 (puppetdb-6.1.0.tar.gz) = ddd3295d0c1fa68c882d138223e5d4be1dfb643de6d34c0a82d0e95ff0c4a38b
+SIZE (puppetdb-6.1.0.tar.gz) = 40448212
Index: head/databases/puppetdb6/files/puppetdb.in
===================================================================
--- head/databases/puppetdb6/files/puppetdb.in	(revision 487830)
+++ head/databases/puppetdb6/files/puppetdb.in	(revision 487831)
@@ -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} -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"