Update syslog-ng to 3.2.4 (from 1.6.2), OK agc@.

Changes for 3 years of work is too large to paste here ...

4 files changed, 69 insertions, 48 deletions

diff --git a/sysutils/syslog-ng/DESCR b/sysutils/syslog-ng/DESCR
index b3e192d6e5c..03d56de759f 100644
--- a/sysutils/syslog-ng/DESCR
+++ b/sysutils/syslog-ng/DESCR
@@ -1,6 +1,6 @@
 Syslog-ng tries to fill the gaps original syslogd's were lacking:
 	* powerful configurability
 	* filtering based on message content
-	* message integrity, message encryption (not yet implemented in 1.4.x)
+	* message integrity, message encryption
 	* portability
 	* better network forwarding
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index eeb5b80dab2..fe7e6e07feb 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2009/12/09 11:12:21 obache Exp $
+# $NetBSD: Makefile,v 1.10 2011/09/21 19:33:09 bouyer Exp $
 
-DISTNAME=	syslog-ng-1.6.12
+VERS=		3.2.4
+DISTNAME=	syslog-ng_${VERS}
+PKGNAME=	syslog-ng-${VERS}
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
+MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${VERS}/source/
+WRKSRC=		${WRKDIR}/${PKGNAME}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.balabit.com/network-security/syslog-ng/
@@ -11,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=	pax flex
+USE_TOOLS+=	flex pkg-config gmake
 
 GNU_CONFIGURE=		YES
 RCD_SCRIPTS=		syslogng
@@ -22,24 +25,17 @@ CONFIGURE_ARGS+=	--enable-tcp-wrapper
 EGDIR=			${PREFIX}/share/examples/syslog-ng
 DOCDIR=			${PREFIX}/share/doc/syslog-ng
 
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
-SUBST_FILES.conf=	doc/syslog-ng.8 doc/syslog-ng.conf.5 contrib/syslog2ng
-SUBST_SED.conf=		-e "s|/etc/syslog-ng|${PKG_SYSCONFDIR}|g"
-SUBST_SED.conf+=	-e "s|/usr/bin/awk|${AWK}|g"
-SUBST_MESSAGE.conf=	Fixing configuration file paths.
-
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../sysutils/libol/buildlink3.mk"
+.include "../../sysutils/eventlog/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--enable-full-dynamic
 .endif
 
-BUILDLINK_API_DEPENDS.libol+=	libol>=0.3.0
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.syslog-ng
 PKG_SUPPORTED_OPTIONS=	syslogng-spoof
 
@@ -55,25 +51,17 @@ CONFIGURE_ARGS+=	--enable-spoof-source
 .include "../../devel/libnet11/buildlink3.mk"
 .endif
 
-pre-build:
-	cd ${WRKSRC}/doc/sgml && \
-		pax -O -zrf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz
-
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	${DOCDIR}
-INSTALLATION_DIRS+=	share/doc/html/syslog-ng
 INSTALLATION_DIRS+=	${EGDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.spoof ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.demo ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.solaris ${DESTDIR}${EGDIR}
+	for f in syslog-ng.conf.sample syslog-ng.conf.solaris syslog-ng.service\	; do \
+		${INSTALL_DATA} ${WRKSRC}/doc/examples/$${f} ${DESTDIR}${EGDIR};\
+	done
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${DESTDIR}${PREFIX}/bin
 
-	${INSTALL_DATA} ${WRKSRC}/doc/sgml/syslog-ng.html/*.html ${DESTDIR}${DOCDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng/PLIST b/sysutils/syslog-ng/PLIST
index 2fecb277810..7c72f6f27e0 100644
--- a/sysutils/syslog-ng/PLIST
+++ b/sysutils/syslog-ng/PLIST
@@ -1,28 +1,61 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/09/21 19:33:09 bouyer Exp $
+
+bin/loggen
+bin/pdbtool
 bin/syslog2ng
+bin/update-patterndb
+etc/modules.conf
+etc/scl.conf
+etc/syslog-ng.conf
+lib/libsyslog-ng.la
+lib/libsyslog-ng.so
+lib/libsyslog-ng.so.0
+lib/libsyslog-ng.so.0.0
+lib/syslog-ng/libaffile.la
+lib/syslog-ng/libaffile.so
+lib/syslog-ng/libafprog.la
+lib/syslog-ng/libafprog.so
+lib/syslog-ng/libafsocket-notls.la
+lib/syslog-ng/libafsocket-notls.so
+lib/syslog-ng/libafsocket-tls.la
+lib/syslog-ng/libafsocket-tls.so
+lib/syslog-ng/libafsocket.so
+lib/syslog-ng/libafuser.la
+lib/syslog-ng/libafuser.so
+lib/syslog-ng/libbasicfuncs.la
+lib/syslog-ng/libbasicfuncs.so
+lib/syslog-ng/libconfgen.la
+lib/syslog-ng/libconfgen.so
+lib/syslog-ng/libconvertfuncs.la
+lib/syslog-ng/libconvertfuncs.so
+lib/syslog-ng/libcsvparser.la
+lib/syslog-ng/libcsvparser.so
+lib/syslog-ng/libdbparser.la
+lib/syslog-ng/libdbparser.so
+lib/syslog-ng/libdummy.la
+lib/syslog-ng/libdummy.so
+lib/syslog-ng/libsyslogformat.la
+lib/syslog-ng/libsyslogformat.so
+man/man1/loggen.1
+man/man1/pdbtool.1
+man/man1/syslog-ng-ctl.1
 man/man5/syslog-ng.conf.5
 man/man8/syslog-ng.8
 sbin/syslog-ng
-share/doc/${PKGBASE}/book1.html
-share/doc/${PKGBASE}/destinations.html
-share/doc/${PKGBASE}/intro.html
-share/doc/${PKGBASE}/logpath.html
-share/doc/${PKGBASE}/msgroute.html
-share/doc/${PKGBASE}/reference.html
-share/doc/${PKGBASE}/tuning.html
-share/doc/${PKGBASE}/index.html
-share/doc/${PKGBASE}/x731.html
-share/doc/${PKGBASE}/x771.html
-share/doc/${PKGBASE}/x903.html
-share/doc/${PKGBASE}/x909.html
-share/doc/${PKGBASE}/x172.html
-share/doc/${PKGBASE}/x361.html
-share/doc/${PKGBASE}/x97.html
+sbin/syslog-ng-ctl
 share/doc/${PKGBASE}/INSTALL
 share/doc/${PKGBASE}/README
-share/doc/${PKGBASE}/README.spoof
 share/doc/${PKGBASE}/syslog-ng.conf.doc
 share/examples/rc.d/syslogng
-share/examples/syslog-ng/syslog-ng.conf.demo
 share/examples/syslog-ng/syslog-ng.conf.sample
 share/examples/syslog-ng/syslog-ng.conf.solaris
+share/examples/syslog-ng/syslog-ng.service
+share/include/scl/pacct/plugin.conf
+share/include/scl/syslogconf/README
+share/include/scl/syslogconf/convert-syslogconf.awk
+share/include/scl/syslogconf/plugin.conf
+share/include/scl/system/generate-system-source.sh
+share/include/scl/system/plugin.conf
+share/xsd/patterndb-1.xsd
+share/xsd/patterndb-2.xsd
+share/xsd/patterndb-3.xsd
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 2f672880920..61bd3a8e2a8 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/10/25 10:26:43 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2011/09/21 19:33:09 bouyer Exp $
 
-SHA1 (syslog-ng-1.6.12.tar.gz) = 02bf683cd96f0ec213992a41835af04afb1a4ab7
-RMD160 (syslog-ng-1.6.12.tar.gz) = b7a091bd2e6cfa1fd6eea50aee2ef016e8df6c40
-Size (syslog-ng-1.6.12.tar.gz) = 717903 bytes
+SHA1 (syslog-ng_3.2.4.tar.gz) = ff732f7223bd2bd0424d4b9028b523cf62133af1
+RMD160 (syslog-ng_3.2.4.tar.gz) = 2927ba4d9b8a913f7117a659806c1721fe3d244e
+Size (syslog-ng_3.2.4.tar.gz) = 1435115 bytes
 SHA1 (patch-ac) = 73b60fa4cf2cce6821873c51dba6b5327ee08f07