databases/puppetdb7: Fix logging

Some changes in PuppetDB recently broke logging.  Ensure we write logs
as before.

While here, do some cleanup of the Makefile.

With hat:	puppet

databases/puppetdb7/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	puppetdb
 PORTVERSION=	7.15.0
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7

databases/puppetdb7/files/puppetdb.in

@@ -53,7 +53,7 @@ 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} ${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"
+command_args="-p ${pidfile} ${java_cmd} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${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}"