diff options
| -rw-r--r-- | sysutils/syslog-ng/Makefile | 27 | ||||
| -rw-r--r-- | sysutils/syslog-ng/PLIST | 24 | ||||
| -rw-r--r-- | sysutils/syslog-ng/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/syslog-ng/patches/patch-ac | 6 |
4 files changed, 32 insertions, 29 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 738b1508e1d..58de077abae 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2011/09/28 18:17:25 bouyer Exp $ +# $NetBSD: Makefile,v 1.14 2011/10/09 10:59:31 obache Exp $ VERS= 3.2.4 DISTNAME= syslog-ng_${VERS} PKGNAME= syslog-ng-${VERS} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${VERS}/source/ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} @@ -15,7 +15,8 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= flex pkg-config gmake +USE_TOOLS+= flex pkg-config gmake awk:run +USE_LIBTOOL= YES GNU_CONFIGURE= YES RCD_SCRIPTS= syslogng @@ -23,11 +24,29 @@ PKG_SYSCONFSUBDIR= syslog-ng CONFIGURE_ARGS+= --enable-tcp-wrapper CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/syslog-ng -CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run +CONFIGURE_ARGS+= --with-pidfile-dir=${VARBASE}/run +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} + +REPLACE_AWK+= contrib/syslog2ng EGDIR= ${PREFIX}/share/examples/syslog-ng DOCDIR= ${PREFIX}/share/doc/syslog-ng +INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} + +OWN_DIRS+= ${VARBASE}/db/syslog-ng + +BUILD_DEFS+= VARBASE + +CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf +CONF_FILES+= ${EGDIR}/scl.conf ${PKG_SYSCONFDIR}/scl.conf +CONF_FILES+= ${EGDIR}/syslog-ng.conf ${PKG_SYSCONFDIR}/syslog-ng.conf + +SUBST_CLASSES+= unamepath +SUBST_STAGE.unamepath= post-configure +SUBST_FILES.unamepath= contrib/syslog2ng +SUBST_VARS.unamepath= UNAME + .include "../../mk/bsd.prefs.mk" .include "../../security/tcp_wrappers/buildlink3.mk" diff --git a/sysutils/syslog-ng/PLIST b/sysutils/syslog-ng/PLIST index 7c72f6f27e0..c87f82d65b7 100644 --- a/sysutils/syslog-ng/PLIST +++ b/sysutils/syslog-ng/PLIST @@ -1,41 +1,22 @@ -@comment $NetBSD: PLIST,v 1.3 2011/09/21 19:33:09 bouyer Exp $ - +@comment $NetBSD: PLIST,v 1.4 2011/10/09 10:59:31 obache 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 @@ -47,6 +28,9 @@ share/doc/${PKGBASE}/INSTALL share/doc/${PKGBASE}/README share/doc/${PKGBASE}/syslog-ng.conf.doc share/examples/rc.d/syslogng +share/examples/syslog-ng/modules.conf +share/examples/syslog-ng/scl.conf +share/examples/syslog-ng/syslog-ng.conf share/examples/syslog-ng/syslog-ng.conf.sample share/examples/syslog-ng/syslog-ng.conf.solaris share/examples/syslog-ng/syslog-ng.service diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index 61bd3a8e2a8..a954da9d14f 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2011/09/21 19:33:09 bouyer Exp $ +$NetBSD: distinfo,v 1.5 2011/10/09 10:59:31 obache Exp $ 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 +SHA1 (patch-ac) = e76b4cea2bfc04386574701e42908c5eae401b03 diff --git a/sysutils/syslog-ng/patches/patch-ac b/sysutils/syslog-ng/patches/patch-ac index ea3ff5b3362..ca83bb2b3ab 100644 --- a/sysutils/syslog-ng/patches/patch-ac +++ b/sysutils/syslog-ng/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $ +$NetBSD: patch-ac,v 1.2 2011/10/09 10:59:32 obache Exp $ # add NetBSD support and fix some paths @@ -15,8 +15,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $ # Handle the various platforms- determine proper log device - "/bin/uname -s" | getline sysname; - close("/bin/uname -s"); -+ "/usr/bin/uname -s" | getline sysname; -+ close("/usr/bin/uname -s"); ++ "@UNAME@ -s" | getline sysname; ++ close("@UNAME@ -s"); if (sysname == "SunOS") { LOGDEVTYPE="sun-streams"; + LOGDEVPATH="/dev/log"; |