summaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2011-06-26 05:03:09 +0000
committerMartin Wilke <miwi@FreeBSD.org>2011-06-26 05:03:09 +0000
commit6cabe7558676bced91f24202d29a3f9e1b484fae (patch)
tree23dfbc66c04c48338e0f1b6e3fd9f71b9ef930ab /net-mgmt
parent- Update to 1.1.4 (diff)
- Reenable BIND support
PR: ports/157130 Submitted by: Benjamin Lee <ben@b1c1l1.com> Approved by: maintainer
Notes
Notes: svn path=/head/; revision=276417
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/collectd/Makefile15
-rw-r--r--net-mgmt/collectd5/Makefile15
2 files changed, 6 insertions, 24 deletions
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 0386fb175af2..a11522f9d088 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= collectd
PORTVERSION= 4.10.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
@@ -145,20 +145,11 @@ PLIST_SUB+= CGI="@comment "
.endif
.if defined(WITH_BIND)
-.if ${OSVERSION} < 800000
-BROKEN= Need bind 9.5+
-.endif
-# check if MK_BIND is set to no (by /etc/src.conf or /etc/make.conf)
-.if exists(${DESTDIR}/usr/lib/libbind9.a) || exists(${LOCALBASE}/lib/libbind9.a)
CONFIGURE_ARGS+=--enable-bind
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
PLIST_SUB+= BIND=""
.else
-# libind9 does not exists
-CONFIGURE_ARGS+=--disable-bind
-PLIST_SUB+= BIND="@comment "
-.endif
-.else
-# WITHOUT_BIND
CONFIGURE_ARGS+=--disable-bind
PLIST_SUB+= BIND="@comment "
.endif
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 0386fb175af2..a11522f9d088 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -7,7 +7,7 @@
PORTNAME= collectd
PORTVERSION= 4.10.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
@@ -145,20 +145,11 @@ PLIST_SUB+= CGI="@comment "
.endif
.if defined(WITH_BIND)
-.if ${OSVERSION} < 800000
-BROKEN= Need bind 9.5+
-.endif
-# check if MK_BIND is set to no (by /etc/src.conf or /etc/make.conf)
-.if exists(${DESTDIR}/usr/lib/libbind9.a) || exists(${LOCALBASE}/lib/libbind9.a)
CONFIGURE_ARGS+=--enable-bind
+LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
PLIST_SUB+= BIND=""
.else
-# libind9 does not exists
-CONFIGURE_ARGS+=--disable-bind
-PLIST_SUB+= BIND="@comment "
-.endif
-.else
-# WITHOUT_BIND
CONFIGURE_ARGS+=--disable-bind
PLIST_SUB+= BIND="@comment "
.endif