diff options
author | Cy Schubert <cy@FreeBSD.org> | 2014-08-13 17:42:42 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2014-08-13 17:42:42 +0000 |
commit | 0515b26fdf6268acd9b551c0bdda8920a945da91 (patch) | |
tree | 6b6c8292df0a37eb5245f5106abf1962bdc9811c | |
parent | dc18a214201ac15257473aa0c4c436204980204d (diff) | |
download | freebsd-ports-0515b26fdf6268acd9b551c0bdda8920a945da91.zip |
PCRE is no longer an option. PCRE support is dragged in by glib as well
as starting with 3.6 PCRE is a requirement.
Submitted by: Peter Czanik <peter.czanik@balabit.com> (syslog-ng upline)
-rw-r--r-- | sysutils/syslog-ng-devel/Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index dd7d9b732c64..c236edf1009a 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= syslog-ng PORTVERSION= 3.6.0a2 +PORTREVISION= 1 PKGNAMESUFFIX= -devel CATEGORIES= sysutils DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) @@ -12,7 +13,8 @@ MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/open-source-editi MAINTAINER= cy@FreeBSD.org COMMENT= Powerful syslogd replacement -LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog +LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog \ + libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ @@ -22,15 +24,14 @@ WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION) MAKE_JOBS_UNSAFE= yes OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 PCRE SMTP JSON GEOIP DOCS REDIS -OPTIONS_DEFAULT= PORTS_SSL PCRE +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS +OPTIONS_DEFAULT= PORTS_SSL SYS_SSL_DESC= Build with OpenSSL support (from system) PORTS_SSL_DESC= Build with OpenSSL support (from ports) TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support SPOOF_DESC= Build with spoof source support IPV6_DESC= Build with IPV6 support -PCRE_DESC= Build with PCRE support SMTP_DESC= Build with SMTP support JSON_DESC= Build with JSON-C support GEOIP_DESC= Build with GeoIP support @@ -47,7 +48,8 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking \ --enable-debug \ - --datadir=${PREFIX}/share/syslog-ng/ + --datadir=${PREFIX}/share/syslog-ng/ \ + --enable-pcre BROKEN_sparc64= Does not compile on sparc64: gcc core dump @@ -89,13 +91,6 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if ${PORT_OPTIONS:MPCRE} -CONFIGURE_ARGS+= --enable-pcre -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -.else -CONFIGURE_ARGS+= --disable-pcre -.endif - .if ${PORT_OPTIONS:MGEOIP} CONFIGURE_ARGS+= --enable-geoip LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP |