- Update to 1.6.9

- Remove USE_REINPLACE
- rcNGfy

PR:		ports/95011
Submitted by:	maintainer

2 files changed, 36 insertions, 20 deletions

diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.in b/sysutils/syslog-ng/files/syslog-ng.sh.in
new file mode 100644
index 000000000000..341143b8a2f3
--- /dev/null
+++ b/sysutils/syslog-ng/files/syslog-ng.sh.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: syslogd
+# REQUIRE: mountcritremote cleanvar
+# BEFORE:  SERVERS
+
+#
+# Add the following line to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+#syslog_ng_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=syslog_ng
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/syslog-ng
+required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+pidfile=/var/run/syslog.pid
+extra_commands=reload
+stop_postcmd=stop_postcmd
+
+load_rc_config $name
+
+: ${syslog_ng_enable:="NO"}
+
+stop_postcmd() {
+  rm -f $pidfile
+}
+
+run_rc_command "$1"
diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.sample b/sysutils/syslog-ng/files/syslog-ng.sh.sample
deleted file mode 100644
index 9aff5b0d38eb..000000000000
--- a/sysutils/syslog-ng/files/syslog-ng.sh.sample
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -x ${PREFIX}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && echo -n ' syslog-ng'
-	;;
-stop)
-	killall syslog-ng && echo -n ' syslog-ng'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0