From 397261f29392f9ac9396846da3bffab060ced081 Mon Sep 17 00:00:00 2001
From: Zach Leslie <zleslie@FreeBSD.org>
Date: Tue, 30 Apr 2019 18:12:00 +0000
Subject: Ensure java options are utilized

Without this change, the doc for the rc script references the ability pass Java opts to the start command, but those references are never used. Here we ensure that thse options are respected and implemented.

PR:		237295
Reviewed by:	mat(mentor),romain
Approved by:	mat(mentor),romain
Differential Revision:	D20010
---
 databases/puppetdb5/Makefile          | 1 +
 databases/puppetdb5/files/puppetdb.in | 2 +-
 databases/puppetdb6/Makefile          | 1 +
 databases/puppetdb6/files/puppetdb.in | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'databases')

diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
index 89a9856f5d0f..4e953788b62f 100644
--- a/databases/puppetdb5/Makefile
+++ b/databases/puppetdb5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetdb
 PORTVERSION=	5.2.8
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	5
diff --git a/databases/puppetdb5/files/puppetdb.in b/databases/puppetdb5/files/puppetdb.in
index 66bcf18618e8..a88ce98ce5a7 100644
--- a/databases/puppetdb5/files/puppetdb.in
+++ b/databases/puppetdb5/files/puppetdb.in
@@ -55,7 +55,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} -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}"
diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile
index 9b8059acb153..12bae7fcf0df 100644
--- a/databases/puppetdb6/Makefile
+++ b/databases/puppetdb6/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetdb
 PORTVERSION=	6.3.1
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
diff --git a/databases/puppetdb6/files/puppetdb.in b/databases/puppetdb6/files/puppetdb.in
index aa2bcb296c3a..5a1e1f4e376c 100644
--- a/databases/puppetdb6/files/puppetdb.in
+++ b/databases/puppetdb6/files/puppetdb.in
@@ -55,7 +55,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} -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}"
-- 
cgit v1.2.3