Date: Wed, 13 May 2020 02:06:53 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535076 - in head/net-mgmt: zabbix3-server zabbix4-server zabbix44-server Message-ID: <202005130206.04D26re2009990@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Wed May 13 02:06:53 2020 New Revision: 535076 URL: https://svnweb.freebsd.org/changeset/ports/535076 Log: net-mgmt/zabbix*-server: Fix build with LIBXML2 option PR: 245613 Submitted by: Juraj Lutter <juraj@lutter.sk> Reported by: Christian Ullrich <chris@chrullrich.net> Approved by: maintainer timeout (pg@pakhom.spb.ru, > 3 weeks) Modified: head/net-mgmt/zabbix3-server/Makefile head/net-mgmt/zabbix4-server/Makefile head/net-mgmt/zabbix44-server/Makefile Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Wed May 13 00:18:54 2020 (r535075) +++ head/net-mgmt/zabbix3-server/Makefile Wed May 13 02:06:53 2020 (r535076) @@ -21,6 +21,7 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" +CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d @@ -125,7 +126,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo -LIBXML2_CONFIGURE_WITH= libxml2 +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl @@ -186,6 +187,9 @@ post-patch: ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + + +pre-configure: + @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: Modified: head/net-mgmt/zabbix4-server/Makefile ============================================================================== --- head/net-mgmt/zabbix4-server/Makefile Wed May 13 00:18:54 2020 (r535075) +++ head/net-mgmt/zabbix4-server/Makefile Wed May 13 02:06:53 2020 (r535076) @@ -23,7 +23,7 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} +CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache LIB_DEPENDS+= libevent.so:devel/libevent USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else @@ -125,7 +125,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo -LIBXML2_CONFIGURE_WITH= libxml2 +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl @@ -180,6 +180,9 @@ post-patch: .endif @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + + +pre-configure: + @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: .if ${ZABBIX_BUILD} == "java" Modified: head/net-mgmt/zabbix44-server/Makefile ============================================================================== --- head/net-mgmt/zabbix44-server/Makefile Wed May 13 00:18:54 2020 (r535075) +++ head/net-mgmt/zabbix44-server/Makefile Wed May 13 02:06:53 2020 (r535076) @@ -25,7 +25,7 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} +CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache LIB_DEPENDS+= libevent.so:devel/libevent USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else @@ -123,7 +123,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo -LIBXML2_CONFIGURE_WITH= libxml2 +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl @@ -178,6 +178,9 @@ post-patch: .endif @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + + +pre-configure: + @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: .if ${ZABBIX_BUILD} == "java"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005130206.04D26re2009990>