Index: head/net-mgmt/zabbix2-server/Makefile =================================================================== --- head/net-mgmt/zabbix2-server/Makefile (revision 433628) +++ head/net-mgmt/zabbix2-server/Makefile (revision 433629) @@ -1,166 +1,166 @@ # Created by: Jim Riggs # $FreeBSD$ PORTNAME= zabbix2 -PORTVERSION= 2.0.18 +PORTVERSION= 2.0.20 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LICENSE= GPLv2 LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp CONFLICTS= ${PKGBASE}-1.[0-8]* .if ${PKGNAMESUFFIX} != "-agent" CONFLICTS+= ${PORTNAME}-1.[0-8]* .endif ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif USES= pkgconfig iconv USERS= zabbix GROUPS= zabbix .if ${ZABBIX_BUILD} != "proxy" PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" .else PLIST_SUB+= SERVER="@comment " .endif PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE} MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ --datadir=${ETCDIR} .if ${ZABBIX_BUILD} != "agent" USES+= execinfo CPPFLAGS+= ${EXECINFO_CPPFLAGS} LDFLAGS+= ${EXECINFO_LDFLAGS} SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW 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 LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks JAVAGW_DESC= Support for Java gateway ODBC_DESC= Support for database checks via ODBC OPTIONS_SINGLE= DB ODBC OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC MYSQL_CONFIGURE_WITH= mysql -MYSQL_USE= MYSQL=yes +MYSQL_USES= mysql PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite3 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 IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi JABBER_CONFIGURE_WITH= jabber JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 IODBC_CONFIGURE_WITH= iodbc IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc UNIXODBC_CONFIGURE_WITH= unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo JAVAGW_CONFIGURE_ENABLE= java JAVAGW_USE= JAVA=yes .include post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf .if ${ZABBIX_BUILD} != "agent" .for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} -e 's|/bin/ping|/sbin/ping|g; \ s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \ s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \ ${WRKSRC}/database/${d}/data.sql .endfor .endif @${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} {} + post-install: .if ${PORT_OPTIONS:MJAVAGW} @${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample .endif .if ${ZABBIX_BUILD} != "agent" @${MKDIR} "${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database" @cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/upgrades/ @cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database/ .endif .endif # if ${ZABBIX_BUILD} != "frontend" .include Index: head/net-mgmt/zabbix2-server/distinfo =================================================================== --- head/net-mgmt/zabbix2-server/distinfo (revision 433628) +++ head/net-mgmt/zabbix2-server/distinfo (revision 433629) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472720412 -SHA256 (zabbix-2.0.18.tar.gz) = 4b81406ad25d83a4922177afc2f6cd558ec759df7015161ceb2090c9d6ace4ae -SIZE (zabbix-2.0.18.tar.gz) = 13958980 +TIMESTAMP = 1481879247 +SHA256 (zabbix-2.0.20.tar.gz) = 4019c24133b0017c006cba8a8934192c0ea3d1faf352441bf6a8a1ae0cebec1f +SIZE (zabbix-2.0.20.tar.gz) = 13970300 Index: head/net-mgmt/zabbix2-server/files/patch-configure =================================================================== --- head/net-mgmt/zabbix2-server/files/patch-configure (nonexistent) +++ head/net-mgmt/zabbix2-server/files/patch-configure (revision 433629) @@ -0,0 +1,13 @@ +--- configure.orig 2016-12-07 10:03:38 UTC ++++ configure +@@ -8931,8 +8931,8 @@ $as_echo_n "checking for iODBC support.. + fi + fi + +- if test -f "$_libiodbc_with/include/sql.h"; then +- IODBC_CFLAGS="-I$_libiodbc_with/include" ++ if test -f "$_libiodbc_with/include/libiodbc/sql.h"; then ++ IODBC_CFLAGS="-I$_libiodbc_with/include/libiodbc" + IODBC_LDFLAGS="-L$_libiodbc_with/lib" + IODBC_LIBS="-liodbc" + Property changes on: head/net-mgmt/zabbix2-server/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property