[pkgsrc/trunk]: pkgsrc/sysutils/syslog-ng sysutils/syslog-ng: Avoid doubling ...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5880741ecf4
branches:  trunk
changeset: 373974:f5880741ecf4
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri Jan 12 20:48:06 2018 +0000

description:
sysutils/syslog-ng: Avoid doubling up on a process watchdog inside
the SMF manifest. Bump PKGREVISION.

diffstat:

 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(-)

diffs (41 lines):

diff -r cfbccc20f4fe -r f5880741ecf4 sysutils/syslog-ng/Makefile
--- a/sysutils/syslog-ng/Makefile       Fri Jan 12 19:50:52 2018 +0000
+++ b/sysutils/syslog-ng/Makefile       Fri Jan 12 20:48:06 2018 +0000
@@ -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 -r cfbccc20f4fe -r f5880741ecf4 sysutils/syslog-ng/Makefile.common
--- a/sysutils/syslog-ng/Makefile.common        Fri Jan 12 19:50:52 2018 +0000
+++ b/sysutils/syslog-ng/Makefile.common        Fri Jan 12 20:48:06 2018 +0000
@@ -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-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 -r cfbccc20f4fe -r f5880741ecf4 sysutils/syslog-ng/files/smf/manifest.xml
--- a/sysutils/syslog-ng/files/smf/manifest.xml Fri Jan 12 19:50:52 2018 +0000
+++ b/sysutils/syslog-ng/files/smf/manifest.xml Fri Jan 12 20:48:06 2018 +0000
@@ -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" />