From 9c8b46bf9cd45a11c42bc9d89f1258d1bc5cbe90 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Sun, 1 Dec 2013 12:09:48 +0000
Subject: [PATCH] disable rabbitmq for now. this has a hidden dep on python and
 failed with python3 - spotted by nigel@ merge some post-install tweaks - from
 aja@ ok aja@

---
 sysutils/syslog-ng/Makefile  | 9 ++++++---
 sysutils/syslog-ng/pkg/PLIST | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 228b573ebf2..59757a93b3a 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.39 2013/11/30 10:02:12 steven Exp $
+# $OpenBSD: Makefile,v 1.40 2013/12/01 12:09:48 steven Exp $
 
 COMMENT=	syslogd replacement
 
 SHARED_ONLY =	Yes
 
 V =		3.4.6
+REVISION =	0
 DISTNAME =	syslog-ng-$V
 CATEGORIES =	sysutils
 
@@ -37,6 +38,7 @@ CONFIGURE_ARGS +=	--enable-tcp-wrapper \
 			--with-pidfile-dir=/var/run \
 			--enable-json \
 			--with-libmongo-client=no \
+			--with-librabbitmq-client=no \
 			--disable-mongodb \
 			--disable-amqp \
 			--without-libnet \
@@ -60,10 +62,11 @@ pre-install:
 	cd ${WRKSRC}/doc/man && perl -pi -e 's@/opt/syslog\\-ng/etc/syslog\\-ng/@${SYSCONFDIR:S/-/\\-/g}/@g' *.[158]
  
 post-install:
-	${INSTALL_DATA_DIR} ${EXAMPLES}
+	mv ${WRKINST}/etc/syslog-ng ${EXAMPLES}
 	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf \
-		${EXAMPLES}/syslog-ng.conf.sample
+		${EXAMPLES}/syslog-ng.conf.openbsd
 	rm -rf ${PREFIX}/share/{include,tools,xsd}
+	rm -f ${PREFIX}/lib/syslog-ng/*.{a,la}
 # XXX hack for libtool dropping -rpath
 	ln -s syslog-ng/libsyslog-ng-crypto.so ${PREFIX}/lib/libsyslog-ng-crypto.so
 
diff --git a/sysutils/syslog-ng/pkg/PLIST b/sysutils/syslog-ng/pkg/PLIST
index c84256409c5..b86bd981b54 100644
--- a/sysutils/syslog-ng/pkg/PLIST
+++ b/sysutils/syslog-ng/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2013/11/30 10:02:12 steven Exp $
+@comment $OpenBSD: PLIST,v 1.15 2013/12/01 12:09:48 steven Exp $
 @bin bin/loggen
 @bin bin/pdbtool
 bin/update-patterndb
@@ -82,6 +82,7 @@ include/syslog-ng/versioning.h
 include/syslog-ng/vptransform.h
 @lib lib/libsyslog-ng-3.4.6.so.${LIBsyslog-ng-3.4.6_VERSION}
 lib/libsyslog-ng-crypto.so
+lib/libsyslog-ng.a
 lib/libsyslog-ng.la
 @lib lib/libsyslog-ng.so.${LIBsyslog-ng_VERSION}
 lib/pkgconfig/syslog-ng.pc
@@ -111,6 +112,9 @@ lib/syslog-ng/libsystem-source.so
 @bin sbin/syslog-ng-ctl
 share/examples/syslog-ng/
 @sample ${SYSCONFDIR}/syslog-ng/
-share/examples/syslog-ng/syslog-ng.conf.sample
+share/examples/syslog-ng/patterndb.d/
+share/examples/syslog-ng/scl.conf
+share/examples/syslog-ng/syslog-ng.conf
+share/examples/syslog-ng/syslog-ng.conf.openbsd
 @sample ${SYSCONFDIR}/syslog-ng/syslog-ng.conf
 @rcscript ${RCDIR}/syslog_ng