zabbix60: Switch to PCRE2

This commit is contained in:
otis 2023-02-12 21:03:07 +00:00
parent f9b6a60518
commit c4642e293f
5 changed files with 16 additions and 11 deletions

View file

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

View file

@ -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}-/}

View file

@ -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-/}

View file

@ -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=${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-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"

View file

@ -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=${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-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"