Mon Jun 8 13:59:38 2015 UTC ()
Disable compatibility epoll headers on SunOS, fixes modern Illumos builds.


(fhajny)
diff -r1.8 -r1.9 pkgsrc/sysutils/rsyslog/Makefile.common
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/rsyslog/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/Makefile.common 2015/04/07 14:48:28 1.8
+++ pkgsrc/sysutils/rsyslog/Makefile.common 2015/06/08 13:59:38 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.8 2015/04/07 14:48:28 fhajny Exp $ 1# $NetBSD: Makefile.common,v 1.9 2015/06/08 13:59:38 fhajny Exp $
2# used by sysutils/rsyslog/Makefile 2# used by sysutils/rsyslog/Makefile
3# used by sysutils/rsyslog-dbi/Makefile 3# used by sysutils/rsyslog-dbi/Makefile
4# used by sysutils/rsyslog-gnutls/Makefile 4# used by sysutils/rsyslog-gnutls/Makefile
5# used by sysutils/rsyslog-gssapi/Makefile 5# used by sysutils/rsyslog-gssapi/Makefile
6# used by sysutils/rsyslog-libgcrypt/Makefile 6# used by sysutils/rsyslog-libgcrypt/Makefile
7# used by sysutils/rsyslog-mysql/Makefile 7# used by sysutils/rsyslog-mysql/Makefile
8# used by sysutils/rsyslog-pgsql/Makefile 8# used by sysutils/rsyslog-pgsql/Makefile
9# used by sysutils/rsyslog-rabbitmq/Makefile 9# used by sysutils/rsyslog-rabbitmq/Makefile
10# used by sysutils/rsyslog-snmp/Makefile 10# used by sysutils/rsyslog-snmp/Makefile
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14DISTNAME= rsyslog-8.9.0 14DISTNAME= rsyslog-8.9.0
@@ -16,26 +16,30 @@ CATEGORIES= sysutils @@ -16,26 +16,30 @@ CATEGORIES= sysutils
16MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ 16MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
17 17
18MAINTAINER?= filip@joyent.com 18MAINTAINER?= filip@joyent.com
19HOMEPAGE= http://www.rsyslog.com/ 19HOMEPAGE= http://www.rsyslog.com/
20LICENSE= gnu-gpl-v3 20LICENSE= gnu-gpl-v3
21COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module 21COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module
22 22
23DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo 23DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo
24PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches 24PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches
25 25
26BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 26BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
27CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py 27CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
28 28
 29.if ${OPSYS} == "SunOS"
 30CONFIGURE_ARGS+= ac_cv_func_epoll_create=no
 31.endif
 32
29GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
30 34
31USE_LIBTOOL= yes 35USE_LIBTOOL= yes
32USE_TOOLS+= bison flex pkg-config 36USE_TOOLS+= bison flex pkg-config
33PYTHON_FOR_BUILD_ONLY= yes 37PYTHON_FOR_BUILD_ONLY= yes
34 38
35EGDIR= ${PREFIX}/share/examples/rsyslog 39EGDIR= ${PREFIX}/share/examples/rsyslog
36 40
37CONFIGURE_ARGS+= --disable-libgcrypt --disable-testbench \ 41CONFIGURE_ARGS+= --disable-libgcrypt --disable-testbench \
38 --enable-diagtools --enable-usertools 42 --enable-diagtools --enable-usertools
39 43
40BUILDLINK_DEPMETHOD.libestr+= build 44BUILDLINK_DEPMETHOD.libestr+= build
41BUILDLINK_DEPMETHOD.liblogging+= build 45BUILDLINK_DEPMETHOD.liblogging+= build