Mon Feb 20 10:10:42 2023 UTC ()
zabbix50: Fix build by switching back to pcre

Zabbix 5.0 does not require/support pcre2, so switch back to pcre.

Reported by:	wiz


(otis)
diff -r1.17 -r1.18 pkgsrc/sysutils/zabbix50-agent/Makefile
diff -r1.16 -r1.17 pkgsrc/sysutils/zabbix50-proxy/Makefile
diff -r1.17 -r1.18 pkgsrc/sysutils/zabbix50-server/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/zabbix50-agent/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix50-agent/Makefile 2023/02/12 21:02:49 1.17
+++ pkgsrc/sysutils/zabbix50-agent/Makefile 2023/02/20 10:10:41 1.18
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.17 2023/02/12 21:02:49 otis Exp $ 1# $NetBSD: Makefile,v 1.18 2023/02/20 10:10:41 otis Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../sysutils/zabbix50-server/Makefile.common" 4.include "../../sysutils/zabbix50-server/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/-/-agent-/} 6PKGNAME= ${DISTNAME:S/-/-agent-/}
7COMMENT= Enterprise-class Monitoring Solution for Everyone 7COMMENT= Enterprise-class Monitoring Solution for Everyone
8 8
9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches 9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches
10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix50-server/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix50-server/distinfo
11 11
12CONFLICTS+= zabbix-[0-9]* 12CONFLICTS+= zabbix-[0-9]*
13CONFLICTS+= zabbix-agent-[0-9]* 13CONFLICTS+= zabbix-agent-[0-9]*
14 14
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --enable-agent 17CONFIGURE_ARGS+= --enable-agent
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
19CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE} 19CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE}
20CONFIGURE_ARGS+= --with-libcurl 20CONFIGURE_ARGS+= --with-libcurl
21CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} 21CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
22CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 22CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
23 23
24EGDIR= share/examples/${PKGBASE} 24EGDIR= share/examples/${PKGBASE}
25CONF_FILES+= ${EGDIR}/zabbix_agentd.conf ${PKG_SYSCONFDIR}/zabbix_agentd.conf 25CONF_FILES+= ${EGDIR}/zabbix_agentd.conf ${PKG_SYSCONFDIR}/zabbix_agentd.conf
26 26
27RCD_SCRIPTS= zabbix_agentd 27RCD_SCRIPTS= zabbix_agentd
28SMF_NAME= zabbix-agent 28SMF_NAME= zabbix-agent
29 29
30INSTALLATION_DIRS+= ${EGDIR} share/${PKGBASE} 30INSTALLATION_DIRS+= ${EGDIR} share/${PKGBASE}
31 31
32SUBST_CLASSES+= fix-paths 32SUBST_CLASSES+= fix-paths
33SUBST_STAGE.fix-paths= pre-configure 33SUBST_STAGE.fix-paths= pre-configure
34SUBST_MESSAGE.fix-paths= Fixing absolute paths. 34SUBST_MESSAGE.fix-paths= Fixing absolute paths.
@@ -40,15 +40,15 @@ SUBST_CLASSES+= fix-pkgbase @@ -40,15 +40,15 @@ SUBST_CLASSES+= fix-pkgbase
40SUBST_STAGE.fix-pkgbase= pre-configure 40SUBST_STAGE.fix-pkgbase= pre-configure
41SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE. 41SUBST_MESSAGE.fix-pkgbase= Fixing PKGBASE.
42SUBST_FILES.fix-pkgbase= src/zabbix_agent/Makefile.in 42SUBST_FILES.fix-pkgbase= src/zabbix_agent/Makefile.in
43SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g' 43SUBST_SED.fix-pkgbase= -e 's,%%PKGBASE%%,${PKGBASE},g'
44 44
45PLIST_SUBST+= PKGBASE=${PKGBASE} 45PLIST_SUBST+= PKGBASE=${PKGBASE}
46 46
47.include "../../mk/bsd.prefs.mk" 47.include "../../mk/bsd.prefs.mk"
48 48
49.include "options.mk" 49.include "options.mk"
50 50
51.include "../../security/openssl/buildlink3.mk" 51.include "../../security/openssl/buildlink3.mk"
52.include "../../www/curl/buildlink3.mk" 52.include "../../www/curl/buildlink3.mk"
53.include "../../devel/pcre2/buildlink3.mk" 53.include "../../devel/pcre/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/zabbix50-proxy/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix50-proxy/Makefile 2023/02/12 21:02:50 1.16
+++ pkgsrc/sysutils/zabbix50-proxy/Makefile 2023/02/20 10:10:41 1.17
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.16 2023/02/12 21:02:50 otis Exp $ 1# $NetBSD: Makefile,v 1.17 2023/02/20 10:10:41 otis Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../sysutils/zabbix50-server/Makefile.common" 4.include "../../sysutils/zabbix50-server/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/} 6PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/}
7COMMENT= Enterprise-class Monitoring Solution for Everyone 7COMMENT= Enterprise-class Monitoring Solution for Everyone
8 8
9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches 9PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches
10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix50-server/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/zabbix50-server/distinfo
11 11
12CONFLICTS+= zabbix-[0-9]* 12CONFLICTS+= zabbix-[0-9]*
13CONFLICTS+= zabbix-proxy-[0-9]* 13CONFLICTS+= zabbix-proxy-[0-9]*
14 14
15DEPENDS+= fping-[0-9]*:../../net/fping 15DEPENDS+= fping-[0-9]*:../../net/fping
16 16
17USE_TOOLS+= aclocal autoconf automake pax pkg-config 17USE_TOOLS+= aclocal autoconf automake pax pkg-config
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --enable-proxy 19CONFIGURE_ARGS+= --enable-proxy
20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
21CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE} 21CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE}
22CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 22CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
23CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} 23CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
24CONFIGURE_ARGS+= --with-libcurl 24CONFIGURE_ARGS+= --with-libcurl
25CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} 25CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent}
26CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} 26CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
27CONFIGURE_ARGS+= --with-libxml2 27CONFIGURE_ARGS+= --with-libxml2
28CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 28CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
29CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 29CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
30 30
31EGDIR= share/examples/${PKGBASE} 31EGDIR= share/examples/${PKGBASE}
32CONF_FILES+= ${EGDIR}/zabbix_proxy.conf ${PKG_SYSCONFDIR}/zabbix_proxy.conf 32CONF_FILES+= ${EGDIR}/zabbix_proxy.conf ${PKG_SYSCONFDIR}/zabbix_proxy.conf
33 33
34RCD_SCRIPTS= zabbix_proxy 34RCD_SCRIPTS= zabbix_proxy
35SMF_NAME= zabbix-proxy 35SMF_NAME= zabbix-proxy
36 36
37INSTALLATION_DIRS+= ${EGDIR} share/${PKGBASE} 37INSTALLATION_DIRS+= ${EGDIR} share/${PKGBASE}
38 38
39SUBST_CLASSES+= fix-paths 39SUBST_CLASSES+= fix-paths
@@ -67,15 +67,15 @@ post-install: @@ -67,15 +67,15 @@ post-install:
67 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/images.sql 67 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/images.sql
68 ${MV} ${DESTDIR}${PREFIX}/bin/zabbix_js \ 68 ${MV} ${DESTDIR}${PREFIX}/bin/zabbix_js \
69 ${DESTDIR}${PREFIX}/bin/zabbix_proxy_js 69 ${DESTDIR}${PREFIX}/bin/zabbix_proxy_js
70 70
71.include "options.mk" 71.include "options.mk"
72 72
73.include "../../converters/libiconv/buildlink3.mk" 73.include "../../converters/libiconv/buildlink3.mk"
74.include "../../databases/openldap-client/buildlink3.mk" 74.include "../../databases/openldap-client/buildlink3.mk"
75.include "../../devel/libevent/buildlink3.mk" 75.include "../../devel/libevent/buildlink3.mk"
76.include "../../devel/zlib/buildlink3.mk" 76.include "../../devel/zlib/buildlink3.mk"
77.include "../../security/openssl/buildlink3.mk" 77.include "../../security/openssl/buildlink3.mk"
78.include "../../textproc/libxml2/buildlink3.mk" 78.include "../../textproc/libxml2/buildlink3.mk"
79.include "../../www/curl/buildlink3.mk" 79.include "../../www/curl/buildlink3.mk"
80.include "../../devel/pcre2/buildlink3.mk" 80.include "../../devel/pcre/buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/zabbix50-server/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix50-server/Makefile 2023/02/12 21:02:50 1.17
+++ pkgsrc/sysutils/zabbix50-server/Makefile 2023/02/20 10:10:41 1.18
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.17 2023/02/12 21:02:50 otis Exp $ 1# $NetBSD: Makefile,v 1.18 2023/02/20 10:10:41 otis Exp $
2# used by sysutils/zabbix50-proxy/Makefile 2# used by sysutils/zabbix50-proxy/Makefile
3# used by sysutils/zabbix50-agent/Makefile 3# used by sysutils/zabbix50-agent/Makefile
4# 4#
5PKGREVISION= 1 5PKGREVISION= 1
6.include "Makefile.common" 6.include "Makefile.common"
7 7
8PKGNAME= ${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/} 8PKGNAME= ${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/}
9COMMENT= Enterprise-class Monitoring Solution for Everyone 9COMMENT= Enterprise-class Monitoring Solution for Everyone
10 10
11CONFLICTS+= zabbix-[0-9]* 11CONFLICTS+= zabbix-[0-9]*
12CONFLICTS+= zabbix-server-[0-9]* 12CONFLICTS+= zabbix-server-[0-9]*
13 13
14DEPENDS+= fping-[0-9]*:../../net/fping 14DEPENDS+= fping-[0-9]*:../../net/fping
15 15
16USE_TOOLS+= aclocal autoconf automake pax pkg-config 16USE_TOOLS+= aclocal autoconf automake pax pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --enable-server 18CONFIGURE_ARGS+= --enable-server
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE} 20CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/${PKGBASE}
21CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 21CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
22CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} 22CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
23CONFIGURE_ARGS+= --with-libcurl 23CONFIGURE_ARGS+= --with-libcurl
24CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} 24CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent}
25CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2} 25CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
26CONFIGURE_ARGS+= --with-libxml2 26CONFIGURE_ARGS+= --with-libxml2
27CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 27CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
29 29
30EGDIR= share/examples/${PKGBASE} 30EGDIR= share/examples/${PKGBASE}
31CONF_FILES+= ${EGDIR}/zabbix_server.conf ${PKG_SYSCONFDIR}/zabbix_server.conf 31CONF_FILES+= ${EGDIR}/zabbix_server.conf ${PKG_SYSCONFDIR}/zabbix_server.conf
32 32
33RCD_SCRIPTS= zabbix_server 33RCD_SCRIPTS= zabbix_server
34SMF_NAME= zabbix-server 34SMF_NAME= zabbix-server
35 35
36MISCDIRS= images snmptrap 36MISCDIRS= images snmptrap
37 37
38INSTALLATION_DIRS+= ${EGDIR} 38INSTALLATION_DIRS+= ${EGDIR}
@@ -75,15 +75,15 @@ post-install: @@ -75,15 +75,15 @@ post-install:
75 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/misc/${MISCDIR} 75 ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/misc/${MISCDIR}
76.endfor 76.endfor
77 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile* 77 ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile*
78 78
79.include "options.mk" 79.include "options.mk"
80 80
81.include "../../converters/libiconv/buildlink3.mk" 81.include "../../converters/libiconv/buildlink3.mk"
82.include "../../databases/openldap-client/buildlink3.mk" 82.include "../../databases/openldap-client/buildlink3.mk"
83.include "../../devel/libevent/buildlink3.mk" 83.include "../../devel/libevent/buildlink3.mk"
84.include "../../devel/zlib/buildlink3.mk" 84.include "../../devel/zlib/buildlink3.mk"
85.include "../../security/openssl/buildlink3.mk" 85.include "../../security/openssl/buildlink3.mk"
86.include "../../textproc/libxml2/buildlink3.mk" 86.include "../../textproc/libxml2/buildlink3.mk"
87.include "../../www/curl/buildlink3.mk" 87.include "../../www/curl/buildlink3.mk"
88.include "../../devel/pcre2/buildlink3.mk" 88.include "../../devel/pcre/buildlink3.mk"
89.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"