Received: by mail.netbsd.org (Postfix, from userid 605) id A85CD84EF7; Sun, 12 Feb 2023 21:03:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D88CD84D13 for ; Sun, 12 Feb 2023 21:03:08 +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 uoO3C5jOQ-P1 for ; Sun, 12 Feb 2023 21:03:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0107284CEF for ; Sun, 12 Feb 2023 21:03:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id ECC1CFA90; Sun, 12 Feb 2023 21:03:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1676235787151710" MIME-Version: 1.0 Date: Sun, 12 Feb 2023 21:03:07 +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: <20230212210307.ECC1CFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1676235787151710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: otis Date: Sun Feb 12 21:03:07 UTC 2023 Modified Files: pkgsrc/sysutils/zabbix60-agent: Makefile pkgsrc/sysutils/zabbix60-frontend: Makefile pkgsrc/sysutils/zabbix60-java: Makefile pkgsrc/sysutils/zabbix60-proxy: Makefile pkgsrc/sysutils/zabbix60-server: Makefile Log Message: zabbix60: Switch to PCRE2 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-agent/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-frontend/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-java/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-proxy/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix60-server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1676235787151710 Content-Disposition: inline Content-Length: 5034 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/zabbix60-agent/Makefile diff -u pkgsrc/sysutils/zabbix60-agent/Makefile:1.1 pkgsrc/sysutils/zabbix60-agent/Makefile:1.2 --- pkgsrc/sysutils/zabbix60-agent/Makefile:1.1 Sun Feb 12 18:37:31 2023 +++ pkgsrc/sysutils/zabbix60-agent/Makefile Sun Feb 12 21:03:07 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2023/02/12 18:37:31 otis Exp $ +# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ +PKGREVISION= 1 .include "../../sysutils/zabbix60-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-agent-/} @@ -17,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-libpcre=${BUILDLINK_PREFIX.pcre} +CONFIGURE_ARGS+= --with-libpcre2=${buildlink_prefix.pcre2} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} EGDIR= share/examples/${PKGBASE} @@ -49,5 +50,5 @@ PLIST_SUBST+= PKGBASE=${PKGBASE} .include "../../security/openssl/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/pcre2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/zabbix60-frontend/Makefile diff -u pkgsrc/sysutils/zabbix60-frontend/Makefile:1.1 pkgsrc/sysutils/zabbix60-frontend/Makefile:1.2 --- pkgsrc/sysutils/zabbix60-frontend/Makefile:1.1 Sun Feb 12 18:37:31 2023 +++ pkgsrc/sysutils/zabbix60-frontend/Makefile Sun Feb 12 21:03:07 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2023/02/12 18:37:31 otis Exp $ +# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ +PKGREVISION= 1 .include "../../sysutils/zabbix60-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-frontend-${ZABBIX_DB_TYPE}-/} Index: pkgsrc/sysutils/zabbix60-java/Makefile diff -u pkgsrc/sysutils/zabbix60-java/Makefile:1.1 pkgsrc/sysutils/zabbix60-java/Makefile:1.2 --- pkgsrc/sysutils/zabbix60-java/Makefile:1.1 Sun Feb 12 18:37:32 2023 +++ pkgsrc/sysutils/zabbix60-java/Makefile Sun Feb 12 21:03:07 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2023/02/12 18:37:32 otis Exp $ +# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ +PKGREVISION= 1 .include "../../sysutils/zabbix60-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-java-/} Index: pkgsrc/sysutils/zabbix60-proxy/Makefile diff -u pkgsrc/sysutils/zabbix60-proxy/Makefile:1.1 pkgsrc/sysutils/zabbix60-proxy/Makefile:1.2 --- pkgsrc/sysutils/zabbix60-proxy/Makefile:1.1 Sun Feb 12 18:37:32 2023 +++ pkgsrc/sysutils/zabbix60-proxy/Makefile Sun Feb 12 21:03:07 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2023/02/12 18:37:32 otis Exp $ +# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ +PKGREVISION= 1 .include "../../sysutils/zabbix60-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/} @@ -22,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-libpcre=${BUILDLINK_PREFIX.pcre} +CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} CONFIGURE_ARGS+= --with-libxml2 CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} @@ -74,5 +75,5 @@ post-install: .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/pcre2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/zabbix60-server/Makefile diff -u pkgsrc/sysutils/zabbix60-server/Makefile:1.1 pkgsrc/sysutils/zabbix60-server/Makefile:1.2 --- pkgsrc/sysutils/zabbix60-server/Makefile:1.1 Sun Feb 12 18:37:32 2023 +++ pkgsrc/sysutils/zabbix60-server/Makefile Sun Feb 12 21:03:07 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2023/02/12 18:37:32 otis Exp $ +# $NetBSD: Makefile,v 1.2 2023/02/12 21:03:07 otis Exp $ # used by sysutils/zabbix60-proxy/Makefile # used by sysutils/zabbix60-agent/Makefile # +PKGREVISION= 1 .include "Makefile.common" PKGNAME= ${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/} @@ -21,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-libpcre=${BUILDLINK_PREFIX.pcre} +CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} CONFIGURE_ARGS+= --with-libxml2 CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} @@ -82,5 +83,5 @@ post-install: .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/pcre2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1676235787151710--