diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-05-05 16:24:00 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-05-05 16:24:00 +0000 |
| commit | f4f46a920e21b409b3f3b16873c6cef1eb4af378 (patch) | |
| tree | 111c3e996440f35b3a05e66700954340c9919761 /net-mgmt | |
| parent | 4007e179a6cb2c28428cd709099b5c1ff6b65402 (diff) | |
| download | ports-f4f46a920e21b409b3f3b16873c6cef1eb4af378.tar.gz ports-f4f46a920e21b409b3f3b16873c6cef1eb4af378.zip | |
Notes
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix2-server/Makefile | 16 | ||||
| -rw-r--r-- | net-mgmt/zabbix22-server/Makefile | 16 |
2 files changed, 8 insertions, 24 deletions
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index 2a9d792f62c2..f21636d566fe 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW MYSQL +OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW MYSQL OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring @@ -79,12 +79,9 @@ NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway -IODBC_DESC= Use iODBC for ODBC support -UNIXODBC_DESC= Use UnixODBC for ODBC support -OPTIONS_SINGLE= DB ODBC -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_SINGLE= DB +OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE ODBC .include <bsd.port.options.mk> @@ -140,12 +137,7 @@ LIB_DEPENDS+= libssh2.so:${PORTSDIR}/security/libssh2 CONFIGURE_ARGS+= --with-ssh2 .endif -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc .endif diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index 222947b45d3e..b3ee00ed8856 100644 --- a/net-mgmt/zabbix22-server/Makefile +++ b/net-mgmt/zabbix22-server/Makefile @@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW LIBXML2 +OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2 OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring @@ -81,13 +81,10 @@ NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway -IODBC_DESC= Use iODBC for ODBC support -UNIXODBC_DESC= Use UnixODBC for ODBC support LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) -OPTIONS_SINGLE= DB ODBC -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_SINGLE= DB +OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE ODBC .include <bsd.port.options.mk> @@ -143,12 +140,7 @@ LIB_DEPENDS+= libssh2.so:${PORTSDIR}/security/libssh2 CONFIGURE_ARGS+= --with-ssh2 .endif -.if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc -.endif - -.if ${PORT_OPTIONS:MUNIXODBC} +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc .endif |