Update (replace) syslog-ng version 1 with syslog-ng version 3.

Previous history for syslog-ng version 3 can be found in sysutils/syslog-ng3.

Suggested by:	syslog-ng upline and syslog-ng version 1 maintainer.
Approved by:	syslog-ng version 1 maintainer and syslog-ng version 3 maintainer

6 files changed, 23 insertions, 41 deletions

diff --git a/sysutils/syslog-ng/files/patch-scl-Makefile.in b/sysutils/syslog-ng/files/patch-scl-Makefile.in
new file mode 100644
index 000000000000..567af03179e4
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-scl-Makefile.in
@@ -0,0 +1,11 @@
+--- scl/Makefile.in.orig	2011-01-15 08:15:10.000000000 -0800
++++ scl/Makefile.in	2011-01-20 21:16:20.000000000 -0800
+@@ -200,7 +200,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SCL_SUBDIRS = system pacct syslogconf
+-SCL_CONFIGS = scl.conf modules.conf syslog-ng.conf
++SCL_CONFIGS = scl.conf modules.conf syslog-ng.conf.dist
+ EXTRA_DIST = $(SCL_CONFIGS) $(SCL_SUBDIRS)
+ scldir = $(datadir)/include/scl
+ all: all-am
diff --git a/sysutils/syslog-ng/files/patch-syslog-names.c b/sysutils/syslog-ng/files/patch-syslog-names.c
deleted file mode 100644
index 7f1f7f8d18fe..000000000000
--- a/sysutils/syslog-ng/files/patch-syslog-names.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/syslog-names.c.orig	Wed Mar  5 12:16:57 2003
-+++ src/syslog-names.c	Wed Mar  5 12:34:40 2003
-@@ -47,6 +47,7 @@
- #ifdef LOG_AUTHPRIV
- 	{ "authpriv", LOG_AUTHPRIV },
- #endif
-+	{ "console", LOG_CONSOLE },
- 	{ "cron", LOG_CRON },
- 	{ "daemon", LOG_DAEMON },
- #ifdef LOG_FTP
-@@ -56,7 +57,8 @@
- 	{ "lpr", LOG_LPR },
- 	{ "mail", LOG_MAIL },
- 	{ "news", LOG_NEWS },
--	{ "security", LOG_AUTH },           /* DEPRECATED */
-+	{ "ntp", LOG_NTP },
-+	{ "security", LOG_SECURITY },
- 	{ "syslog", LOG_SYSLOG },
- 	{ "user", LOG_USER },
- 	{ "uucp", LOG_UUCP },
diff --git a/sysutils/syslog-ng/files/patch-syslog-ng.h b/sysutils/syslog-ng/files/patch-syslog-ng.h
deleted file mode 100644
index 82338e393163..000000000000
--- a/sysutils/syslog-ng/files/patch-syslog-ng.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/syslog-ng.h.orig	Fri Apr 26 02:43:54 2002
-+++ src/syslog-ng.h	Wed Mar  5 12:08:02 2003
-@@ -32,10 +32,10 @@
- 
- #if WITH_DEBUG
- #define PATH_SYSLOG_NG_CONF     "syslog-ng.conf"
--#define PATH_PIDFILE            "syslog-ng.pid"
-+#define PATH_PIDFILE            "syslog.pid"
- #else
- #define PATH_SYSLOG_NG_CONF     PATH_SYSCONFDIR "/syslog-ng.conf"
--#define PATH_PIDFILE            "/var/run/syslog-ng.pid"
-+#define PATH_PIDFILE            "/var/run/syslog.pid"
- #endif
- 
- #define ST_QUIT                 16
diff --git a/sysutils/syslog-ng/files/pkg-message.in b/sysutils/syslog-ng/files/pkg-message.in
index f6ffaaabe8fc..2b5582660897 100644
--- a/sysutils/syslog-ng/files/pkg-message.in
+++ b/sysutils/syslog-ng/files/pkg-message.in
@@ -2,8 +2,12 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
-   (a sample named syslog-ng.conf.sample has been included)
+1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf
+   (a sample named syslog-ng.conf.sample has been included in
+   %%PREFIX%%/etc). Note that this is a change in 2.0.2
+   version, previous ones put the config file in
+   %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update
+   move that file in the right place
 
 2. Configure syslog-ng to start automatically by adding the following
    to /etc/rc.conf:
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index c2059c4165db..a58743dad624 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -1,3 +1,5 @@
+@version:3.2
+
 #
 # This sample configuration file is essentially equilivent to the stock
 # FreeBSD /etc/syslog.conf file.
@@ -6,7 +8,7 @@
 #
 # options
 #
-options { long_hostnames(off); sync(0); };
+options { long_hostnames(off); flush_lines(0); };
 
 #
 # sources
@@ -43,7 +45,7 @@ destination allusers { usertty("*"); };
 filter f_auth { facility(auth); };
 filter f_authpriv { facility(authpriv); };
 filter f_not_authpriv { not facility(authpriv); };
-filter f_console { facility(console); };
+#filter f_console { facility(console); };
 filter f_cron { facility(cron); };
 filter f_daemon { facility(daemon); };
 filter f_ftp { facility(ftp); };
diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.in b/sysutils/syslog-ng/files/syslog-ng.sh.in
index 6f43b4217eaf..1aa03e961357 100644
--- a/sysutils/syslog-ng/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng/files/syslog-ng.sh.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote cleanvar ldconfig
 # BEFORE:  SERVERS
 
 #
@@ -24,7 +24,7 @@ name=syslog_ng
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/syslog-ng
-required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+required_files=%%PREFIX%%/etc/syslog-ng.conf
 extra_commands=reload
 
 if checkyesno syslog_ng_purgeklog; then