Received: by mail.netbsd.org (Postfix, from userid 605) id ADA1684EAE; Mon, 20 Feb 2023 10:10:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DBF4284EA9 for ; Mon, 20 Feb 2023 10:10:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id YxKHPQyS7zyO for ; Mon, 20 Feb 2023 10:10:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 36AB884E7F for ; Mon, 20 Feb 2023 10:10:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2E5DDFA90; Mon, 20 Feb 2023 10:10:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1676887842212550" MIME-Version: 1.0 Date: Mon, 20 Feb 2023 10:10:42 +0000 From: "Juraj Lutter" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: otis@netbsd.org X-Mailer: log_accum Message-Id: <20230220101042.2E5DDFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1676887842212550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: otis Date: Mon Feb 20 10:10:42 UTC 2023 Modified Files: pkgsrc/sysutils/zabbix50-agent: Makefile pkgsrc/sysutils/zabbix50-proxy: Makefile pkgsrc/sysutils/zabbix50-server: Makefile Log Message: zabbix50: Fix build by switching back to pcre Zabbix 5.0 does not require/support pcre2, so switch back to pcre. Reported by: wiz To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/zabbix50-agent/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/zabbix50-proxy/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/zabbix50-server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1676887842212550 Content-Disposition: inline Content-Length: 3763 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/zabbix50-agent/Makefile diff -u pkgsrc/sysutils/zabbix50-agent/Makefile:1.17 pkgsrc/sysutils/zabbix50-agent/Makefile:1.18 --- pkgsrc/sysutils/zabbix50-agent/Makefile:1.17 Sun Feb 12 21:02:49 2023 +++ pkgsrc/sysutils/zabbix50-agent/Makefile Mon Feb 20 10:10:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2023/02/12 21:02:49 otis Exp $ +# $NetBSD: Makefile,v 1.18 2023/02/20 10:10:41 otis Exp $ PKGREVISION= 1 .include "../../sysutils/zabbix50-server/Makefile.common" @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --enable-agent CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE} CONFIGURE_ARGS+= --with-libcurl -CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} +CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} EGDIR= share/examples/${PKGBASE} @@ -50,5 +50,5 @@ PLIST_SUBST+= PKGBASE=${PKGBASE} .include "../../security/openssl/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../devel/pcre2/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/zabbix50-proxy/Makefile diff -u pkgsrc/sysutils/zabbix50-proxy/Makefile:1.16 pkgsrc/sysutils/zabbix50-proxy/Makefile:1.17 --- pkgsrc/sysutils/zabbix50-proxy/Makefile:1.16 Sun Feb 12 21:02:50 2023 +++ pkgsrc/sysutils/zabbix50-proxy/Makefile Mon Feb 20 10:10:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2023/02/12 21:02:50 otis Exp $ +# $NetBSD: Makefile,v 1.17 2023/02/20 10:10:41 otis Exp $ PKGREVISION= 1 .include "../../sysutils/zabbix50-server/Makefile.common" @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-iconv=${BUILDLIN CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} CONFIGURE_ARGS+= --with-libcurl CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} -CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} +CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-libxml2 CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} @@ -77,5 +77,5 @@ post-install: .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../devel/pcre2/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/zabbix50-server/Makefile diff -u pkgsrc/sysutils/zabbix50-server/Makefile:1.17 pkgsrc/sysutils/zabbix50-server/Makefile:1.18 --- pkgsrc/sysutils/zabbix50-server/Makefile:1.17 Sun Feb 12 21:02:50 2023 +++ pkgsrc/sysutils/zabbix50-server/Makefile Mon Feb 20 10:10:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2023/02/12 21:02:50 otis Exp $ +# $NetBSD: Makefile,v 1.18 2023/02/20 10:10:41 otis Exp $ # used by sysutils/zabbix50-proxy/Makefile # used by sysutils/zabbix50-agent/Makefile # @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-iconv=${BUILDLIN CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} CONFIGURE_ARGS+= --with-libcurl CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} -CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} +CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-libxml2 CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} @@ -85,5 +85,5 @@ post-install: .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../devel/pcre2/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1676887842212550--