CVS commit: pkgsrc/sysutils

["Juraj Lutter" <otis%netbsd.org@localhost>]

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.

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"