aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-mgmt/zabbix22-agent/Makefile5
-rw-r--r--net-mgmt/zabbix22-server/Makefile10
-rw-r--r--net-mgmt/zabbix3-agent/Makefile5
-rw-r--r--net-mgmt/zabbix3-server/Makefile8
-rw-r--r--net-mgmt/zabbix32-agent/Makefile5
-rw-r--r--net-mgmt/zabbix32-server/Makefile8
-rw-r--r--net-mgmt/zabbix34-agent/Makefile5
-rw-r--r--net-mgmt/zabbix34-server/Makefile8
-rw-r--r--net-mgmt/zabbix4-agent/Makefile5
-rw-r--r--net-mgmt/zabbix4-server/Makefile8
10 files changed, 37 insertions, 30 deletions
diff --git a/net-mgmt/zabbix22-agent/Makefile b/net-mgmt/zabbix22-agent/Makefile
index 85a5c7405cc4..ab3376334ca2 100644
--- a/net-mgmt/zabbix22-agent/Makefile
+++ b/net-mgmt/zabbix22-agent/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= zabbix22
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMESUFFIX= -agent
@@ -9,6 +10,8 @@ MASTERDIR= ${.CURDIR}/../zabbix22-server
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONS_DEFINE= IPV6
+OPTIONS_DEFINE= CURL IPV6
+OPTIONS_DEFAULT= CURL
+
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
index d77ddf685492..98aecaccf255 100644
--- a/net-mgmt/zabbix22-server/Makefile
+++ b/net-mgmt/zabbix22-server/Makefile
@@ -28,7 +28,7 @@ USE_RC_SUBR= zabbix_${ZABBIX_BUILD}
USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d
.endif
-USES= pkgconfig iconv
+USES= pkgconfig iconv localbase
USERS= zabbix
GROUPS= zabbix
@@ -64,7 +64,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
OPTIONS_DEFAULT= MYSQL FPING JABBER CURL UNIXODBC
OPTIONS_SUB= yes
-CURL_DESC= Support for web monitoring
FPING_DESC= Build/install fping for ping checks
IPMI_DESC= Support for IPMI checks
JABBER_DESC= Support for Jabber media type
@@ -89,9 +88,6 @@ SQLITE_USES+= sqlite:3
ORACLE_CONFIGURE_WITH= oracle
-CURL_CONFIGURE_WITH= libcurl
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-
LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes
@@ -113,6 +109,10 @@ UNIXODBC_CONFIGURE_WITH= unixodbc
UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+CURL_DESC= Support for web monitoring
+CURL_CONFIGURE_WITH= libcurl
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+
IPV6_CONFIGURE_ENABLE= ipv6
NMAP_RUN_DEPENDS= nmap:security/nmap \
diff --git a/net-mgmt/zabbix3-agent/Makefile b/net-mgmt/zabbix3-agent/Makefile
index 89c7386ed750..7123b415fc8a 100644
--- a/net-mgmt/zabbix3-agent/Makefile
+++ b/net-mgmt/zabbix3-agent/Makefile
@@ -2,13 +2,14 @@
# $FreeBSD$
PORTNAME= zabbix3
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMESUFFIX= -agent
MASTERDIR= ${.CURDIR}/../zabbix3-server
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONS_DEFINE= IPV6
-OPTIONS_DEFAULT= OPENSSL
+OPTIONS_DEFINE= CURL IPV6
+OPTIONS_DEFAULT= CURL OPENSSL
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
index 0c97e0e07a5b..63af0aecec41 100644
--- a/net-mgmt/zabbix3-server/Makefile
+++ b/net-mgmt/zabbix3-server/Makefile
@@ -67,7 +67,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL
OPTIONS_SUB= yes
-CURL_DESC= Support for web monitoring
FPING_DESC= Build/install fping for ping checks
IPMI_DESC= Support for IPMI checks
JABBER_DESC= Support for Jabber media type
@@ -93,9 +92,6 @@ SQLITE_USES+= sqlite:3
ORACLE_CONFIGURE_WITH= oracle
-CURL_CONFIGURE_WITH= libcurl
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-
LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes
@@ -120,6 +116,10 @@ OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= OPENSSL GNUTLS
.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+CURL_DESC= Support for web monitoring
+CURL_CONFIGURE_WITH= libcurl
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+
IPV6_CONFIGURE_ENABLE= ipv6
NMAP_RUN_DEPENDS= nmap:security/nmap \
diff --git a/net-mgmt/zabbix32-agent/Makefile b/net-mgmt/zabbix32-agent/Makefile
index 512d87316118..7ec54b97e939 100644
--- a/net-mgmt/zabbix32-agent/Makefile
+++ b/net-mgmt/zabbix32-agent/Makefile
@@ -2,13 +2,14 @@
# $FreeBSD$
PORTNAME= zabbix32
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMESUFFIX= -agent
MASTERDIR= ${.CURDIR}/../zabbix32-server
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONS_DEFINE= IPV6
-OPTIONS_DEFAULT= OPENSSL
+OPTIONS_DEFINE= CURL IPV6
+OPTIONS_DEFAULT= CURL OPENSSL
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile
index 5369f48a9a93..654dec1ec67a 100644
--- a/net-mgmt/zabbix32-server/Makefile
+++ b/net-mgmt/zabbix32-server/Makefile
@@ -71,7 +71,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL
OPTIONS_SUB= yes
-CURL_DESC= Support for web monitoring
FPING_DESC= Build/install fping for ping checks
IPMI_DESC= Support for IPMI checks
JABBER_DESC= Support for Jabber media type
@@ -97,9 +96,6 @@ SQLITE_USES+= sqlite:3
ORACLE_CONFIGURE_WITH= oracle
-CURL_CONFIGURE_WITH= libcurl
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-
LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes
@@ -124,6 +120,10 @@ OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= OPENSSL GNUTLS
.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+CURL_DESC= Support for web monitoring
+CURL_CONFIGURE_WITH= libcurl
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+
IPV6_CONFIGURE_ENABLE= ipv6
NMAP_RUN_DEPENDS= nmap:security/nmap \
diff --git a/net-mgmt/zabbix34-agent/Makefile b/net-mgmt/zabbix34-agent/Makefile
index 4aa11083980d..c822a33833dd 100644
--- a/net-mgmt/zabbix34-agent/Makefile
+++ b/net-mgmt/zabbix34-agent/Makefile
@@ -2,13 +2,14 @@
# $FreeBSD$
PORTNAME= zabbix34
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMESUFFIX= -agent
MASTERDIR= ${.CURDIR}/../zabbix34-server
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONS_DEFINE= IPV6
-OPTIONS_DEFAULT= OPENSSL
+OPTIONS_DEFINE= CURL IPV6
+OPTIONS_DEFAULT= CURL OPENSSL
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix34-server/Makefile b/net-mgmt/zabbix34-server/Makefile
index 53de73a004bd..c730907aac8f 100644
--- a/net-mgmt/zabbix34-server/Makefile
+++ b/net-mgmt/zabbix34-server/Makefile
@@ -73,7 +73,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL
OPTIONS_SUB= yes
-CURL_DESC= Support for web monitoring
FPING_DESC= Build/install fping for ping checks
IPMI_DESC= Support for IPMI checks
JABBER_DESC= Support for Jabber media type
@@ -99,9 +98,6 @@ SQLITE_USES+= sqlite:3
ORACLE_CONFIGURE_WITH= oracle
-CURL_CONFIGURE_WITH= libcurl
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-
LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes
@@ -126,6 +122,10 @@ OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= OPENSSL GNUTLS
.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+CURL_DESC= Support for web monitoring
+CURL_CONFIGURE_WITH= libcurl
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+
IPV6_CONFIGURE_ENABLE= ipv6
NMAP_RUN_DEPENDS= nmap:security/nmap \
diff --git a/net-mgmt/zabbix4-agent/Makefile b/net-mgmt/zabbix4-agent/Makefile
index 22e4c1ab076b..85e4bdcd3143 100644
--- a/net-mgmt/zabbix4-agent/Makefile
+++ b/net-mgmt/zabbix4-agent/Makefile
@@ -2,13 +2,14 @@
# $FreeBSD$
PORTNAME= zabbix4
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMESUFFIX= -agent
MASTERDIR= ${.CURDIR}/../zabbix4-server
PLIST= ${PKGDIR}/pkg-plist.agent
-OPTIONS_DEFINE= IPV6
-OPTIONS_DEFAULT= OPENSSL
+OPTIONS_DEFINE= CURL IPV6
+OPTIONS_DEFAULT= CURL OPENSSL
.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix4-server/Makefile b/net-mgmt/zabbix4-server/Makefile
index a2c2d9bec013..5d04c9584221 100644
--- a/net-mgmt/zabbix4-server/Makefile
+++ b/net-mgmt/zabbix4-server/Makefile
@@ -71,7 +71,6 @@ OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL
OPTIONS_SUB= yes
-CURL_DESC= Support for web monitoring
FPING_DESC= Build/install fping for ping checks
IPMI_DESC= Support for IPMI checks
JABBER_DESC= Support for Jabber media type
@@ -96,9 +95,6 @@ SQLITE_USES+= sqlite:3
ORACLE_CONFIGURE_WITH= oracle
-CURL_CONFIGURE_WITH= libcurl
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-
LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes
@@ -120,6 +116,10 @@ OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= OPENSSL GNUTLS
.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
+CURL_DESC= Support for web monitoring
+CURL_CONFIGURE_WITH= libcurl
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+
IPV6_CONFIGURE_ENABLE= ipv6
NMAP_RUN_DEPENDS= nmap:security/nmap \