CVS commit: pkgsrc/sysutils/syslog-ng

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Jan 12 20:48:06 UTC 2018

Modified Files:
        pkgsrc/sysutils/syslog-ng: Makefile Makefile.common
        pkgsrc/sysutils/syslog-ng/files/smf: manifest.xml

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


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/syslog-ng/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/syslog-ng/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/syslog-ng/files/smf/manifest.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/syslog-ng/Makefile
diff -u pkgsrc/sysutils/syslog-ng/Makefile:1.31 pkgsrc/sysutils/syslog-ng/Makefile:1.32
--- pkgsrc/sysutils/syslog-ng/Makefile:1.31     Mon Dec 11 14:45:11 2017
+++ pkgsrc/sysutils/syslog-ng/Makefile  Fri Jan 12 20:48:06 2018
@@ -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"
 

Index: pkgsrc/sysutils/syslog-ng/Makefile.common
diff -u pkgsrc/sysutils/syslog-ng/Makefile.common:1.8 pkgsrc/sysutils/syslog-ng/Makefile.common:1.9
--- pkgsrc/sysutils/syslog-ng/Makefile.common:1.8       Mon Dec 11 14:45:11 2017
+++ pkgsrc/sysutils/syslog-ng/Makefile.common   Fri Jan 12 20:48:06 2018
@@ -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

Index: pkgsrc/sysutils/syslog-ng/files/smf/manifest.xml
diff -u pkgsrc/sysutils/syslog-ng/files/smf/manifest.xml:1.3 pkgsrc/sysutils/syslog-ng/files/smf/manifest.xml:1.4
--- pkgsrc/sysutils/syslog-ng/files/smf/manifest.xml:1.3        Wed Jun  8 10:16:56 2016
+++ pkgsrc/sysutils/syslog-ng/files/smf/manifest.xml    Fri Jan 12 20:48:06 2018
@@ -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" />