From dde0c781ccc35985d40b462f54d6f501080235ec Mon Sep 17 00:00:00 2001
From: fhajny <fhajny@pkgsrc.org>
Date: Fri, 12 Jan 2018 20:48:06 +0000
Subject: [PATCH] sysutils/syslog-ng: Avoid doubling up on a process watchdog
 inside the SMF manifest. Bump PKGREVISION.

---
 sysutils/syslog-ng/Makefile               | 4 +++-
 sysutils/syslog-ng/Makefile.common        | 4 ++--
 sysutils/syslog-ng/files/smf/manifest.xml | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 0b8cf5146476..45404df2bb81 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2017/12/11 14:45:11 fhajny Exp $
+# $NetBSD: Makefile,v 1.32 2018/01/12 20:48:06 fhajny Exp $
+
+PKGREVISION=	1
 
 .include "../../sysutils/syslog-ng/Makefile.common"
 
diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common
index 8581aab800bf..80c5dc35abb0 100644
--- a/sysutils/syslog-ng/Makefile.common
+++ b/sysutils/syslog-ng/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2017/12/11 14:45:11 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.9 2018/01/12 20:48:06 fhajny Exp $
 # used by sysutils/syslog-ng/Makefile
 # used by sysutils/syslog-ng/Makefile.module
 
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-sun-streams
 CONFIGURE_ARGS+=	--disable-tcp-wrapper
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db/syslog-ng
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-ivykis=${BUILDLINK_PREFIX.ivykis}
+CONFIGURE_ARGS+=	--with-ivykis=system
 CONFIGURE_ARGS+=	--with-mongoc=no
 CONFIGURE_ARGS+=	--with-librabbitmq-client=no
 CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
diff --git a/sysutils/syslog-ng/files/smf/manifest.xml b/sysutils/syslog-ng/files/smf/manifest.xml
index 45221a0da9c7..8c4dc7c98823 100644
--- a/sysutils/syslog-ng/files/smf/manifest.xml
+++ b/sysutils/syslog-ng/files/smf/manifest.xml
@@ -11,7 +11,7 @@
       <service_fmri value="svc:/system/filesystem/local" />
     </dependency>
     <method_context></method_context>
-    <exec_method type="method" name="start" exec="@PREFIX@/sbin/syslog-ng" timeout_seconds="60" />
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/syslog-ng --process-mode=background" timeout_seconds="60" />
     <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
     <property_group name="startd" type="framework">
       <propval name="duration" type="astring" value="contract" />