zabbix50: Fix build by switching back to pcre

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

Reported by:	wiz
This commit is contained in:
otis 2023-02-20 10:10:41 +00:00
parent 06bd9105f0
commit 2ede03edce
3 changed files with 9 additions and 9 deletions

View file

@ -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"

View file

@ -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=${BUILDLINK_PREFIX.iconv}
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"

View file

@ -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=${BUILDLINK_PREFIX.iconv}
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"