From owner-svn-ports-head@FreeBSD.ORG Mon Jan 6 20:00:47 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47FF0E99; Mon, 6 Jan 2014 20:00:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19E2C1591; Mon, 6 Jan 2014 20:00:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06K0k8w016541; Mon, 6 Jan 2014 20:00:46 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06K0kXu016540; Mon, 6 Jan 2014 20:00:46 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401062000.s06K0kXu016540@svn.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 6 Jan 2014 20:00:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338928 - head/net-mgmt/zabbix22-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2014 20:00:47 -0000 Author: rakuco Date: Mon Jan 6 20:00:46 2014 New Revision: 338928 URL: http://svnweb.freebsd.org/changeset/ports/338928 Log: - Add VMware support by adding libxml2 - Add ICONV_PREFIX to the configure arguments (PR: ports/185197) PR: ports/185412 Submitted by: Pakhom Golynga (maintainer) Modified: head/net-mgmt/zabbix22-server/Makefile Modified: head/net-mgmt/zabbix22-server/Makefile ============================================================================== --- head/net-mgmt/zabbix22-server/Makefile Mon Jan 6 19:31:52 2014 (r338927) +++ head/net-mgmt/zabbix22-server/Makefile Mon Jan 6 20:00:46 2014 (r338928) @@ -3,7 +3,7 @@ PORTNAME= zabbix22 PORTVERSION= 2.2.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -16,7 +16,7 @@ LICENSE= GPLv2 CONFLICTS= ${PKGBASE}-1.[0-8]* -IGNORE_WITH_PHP= 5 52 +IGNORE_WITH_PHP= 52 IGNORE_WITH_MYSQL= 41 .if ${PKGNAMESUFFIX} != "-agent" @@ -59,7 +59,8 @@ MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ - --datadir=${ETCDIR} + --datadir=${ETCDIR} \ + --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \ @@ -71,7 +72,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 ODBC JAVAGW MYSQL LIBXML2 OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring @@ -85,6 +86,7 @@ ODBC_DESC= Support for database checks v 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 @@ -174,6 +176,11 @@ PLIST_SUB+= JAVAGW="" PLIST_SUB+= JAVAGW="@comment " .endif +.if ${PORT_OPTIONS:MLIBXML2} +LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 +CONFIGURE_ARGS+= --with-libxml2 +.endif + post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'