From 54be3c7f550b56fe2e41279e3a46b42e14ff1231 Mon Sep 17 00:00:00 2001
From: Zach Leslie <zleslie@FreeBSD.org>
Date: Sun, 17 Mar 2019 16:38:22 +0000
Subject: [PATCH] Add -f to puppetserver daemon call

Without this in place, the rc script does not successfully start the
puppetserver service on hardware or virtualized systems, leaving jails as the
only functional way to run puppetserver.

PR:		236389
Reviewed by:	mat(mentor)
Approved by:	mat(mentor)
Differential Revision:	D19610
---
 sysutils/puppetserver5/Makefile              | 1 +
 sysutils/puppetserver5/files/puppetserver.in | 2 +-
 sysutils/puppetserver6/Makefile              | 1 +
 sysutils/puppetserver6/files/puppetserver.in | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sysutils/puppetserver5/Makefile b/sysutils/puppetserver5/Makefile
index 513ebbc9520f..8a021436ef8a 100644
--- a/sysutils/puppetserver5/Makefile
+++ b/sysutils/puppetserver5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	5.3.7
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
diff --git a/sysutils/puppetserver5/files/puppetserver.in b/sysutils/puppetserver5/files/puppetserver.in
index 41d11616f242..ac30c1449e0b 100644
--- a/sysutils/puppetserver5/files/puppetserver.in
+++ b/sysutils/puppetserver5/files/puppetserver.in
@@ -55,7 +55,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-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} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"
diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile
index 391d2b227cb5..a5e6a8e682e2 100644
--- a/sysutils/puppetserver6/Makefile
+++ b/sysutils/puppetserver6/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	6.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	6
diff --git a/sysutils/puppetserver6/files/puppetserver.in b/sysutils/puppetserver6/files/puppetserver.in
index f378def02456..4eb2608fd3cd 100644
--- a/sysutils/puppetserver6/files/puppetserver.in
+++ b/sysutils/puppetserver6/files/puppetserver.in
@@ -55,7 +55,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-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} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"