CVS commit: pkgsrc/sysutils

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:54:13 UTC 2025

Modified Files:
        pkgsrc/sysutils/pear-Log: Makefile
        pkgsrc/sysutils/zabbix-frontend: Makefile
        pkgsrc/sysutils/zabbix50-frontend: Makefile
        pkgsrc/sysutils/zabbix60-frontend: Makefile

Log Message:
multiple PHP support

* Use PHP_BASE_VERS in DEPENDS if required.
* Use REPLACE_PHP.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/pear-Log/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/zabbix-frontend/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/zabbix50-frontend/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/zabbix60-frontend/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/pear-Log/Makefile
diff -u pkgsrc/sysutils/pear-Log/Makefile:1.25 pkgsrc/sysutils/pear-Log/Makefile:1.26
--- pkgsrc/sysutils/pear-Log/Makefile:1.25      Wed Jun  2 15:40:36 2021
+++ pkgsrc/sysutils/pear-Log/Makefile   Sat Feb  8 03:54:12 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/06/02 15:40:36 taca Exp $
+# $NetBSD: Makefile,v 1.26 2025/02/08 03:54:12 taca Exp $
 
 DISTNAME=      Log-1.13.3
+PKGREVISION=   1
 CATEGORIES=    sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/sysutils/zabbix-frontend/Makefile
diff -u pkgsrc/sysutils/zabbix-frontend/Makefile:1.11 pkgsrc/sysutils/zabbix-frontend/Makefile:1.12
--- pkgsrc/sysutils/zabbix-frontend/Makefile:1.11       Mon Jan 13 17:17:18 2025
+++ pkgsrc/sysutils/zabbix-frontend/Makefile    Sat Feb  8 03:54:12 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2025/01/13 17:17:18 taca Exp $
+# $NetBSD: Makefile,v 1.12 2025/02/08 03:54:12 taca Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../sysutils/zabbix/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-frontend-/}
@@ -22,15 +22,15 @@ BUILD_DEFS+=                APACHE_GROUP APACHE_USER
 PKG_GROUPS_VARS+=      ${APACHE_GROUP}
 PKG_USERS_VARS=                ${APACHE_USER}
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-bcmath>=5.4.0:../../math/php-bcmath
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=5.4.0:../../devel/php-gettext
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.4.0:../../databases/php-ldap
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=5.4.0:../../databases/php-pgsql
-DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=5.4.0:../../net/php-sockets
-DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=5.4.0:../../devel/php-sysvsem
+DEPENDS+=      ${PHP_PKG_PREFIX}-bcmath>=${PHP_BASE_VERS}:../../math/php-bcmath
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=${PHP_BASE_VERS}:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=${PHP_BASE_VERS}:../../databases/php-pgsql
+DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}:../../net/php-sockets
+DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}:../../devel/php-sysvsem
 
 INSTALLATION_DIRS+=    share/zabbix/frontend
 

Index: pkgsrc/sysutils/zabbix50-frontend/Makefile
diff -u pkgsrc/sysutils/zabbix50-frontend/Makefile:1.12 pkgsrc/sysutils/zabbix50-frontend/Makefile:1.13
--- pkgsrc/sysutils/zabbix50-frontend/Makefile:1.12     Thu Jan 23 20:46:17 2025
+++ pkgsrc/sysutils/zabbix50-frontend/Makefile  Sat Feb  8 03:54:13 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2025/01/23 20:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2025/02/08 03:54:13 taca Exp $
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 PHP_VERSIONS_ACCEPTED= 74
 
@@ -19,33 +19,33 @@ EGDIR=              share/examples/${PKGBASE}
 USE_TOOLS+=            pax
 NO_BUILD=              yes
 
-REPLACE_SH+=   ui/locale/*.sh
+CHECK_PORTABILITY_SKIP=        configure
+
+REPLACE_SH+=   ui/locale/add_new_language.sh ui/locale/make_mo.sh \
+               ui/locale/update_po.sh
 
-.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 BUILD_DEFS+=           APACHE_GROUP APACHE_USER
 PKG_GROUPS_VARS+=      ${APACHE_GROUP}
 PKG_USERS_VARS=                ${APACHE_USER}
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-bcmath>=7.2.0:../../math/php-bcmath
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=7.2.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=7.2.0:../../devel/php-gettext
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=7.2.0:../../databases/php-ldap
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-bcmath>=${PHP_BASE_VERS}:../../math/php-bcmath
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=${PHP_BASE_VERS}:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 .if ${ZABBIX_DB_TYPE} == "mysql"
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=7.2.0:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
 .endif
 .if ${ZABBIX_DB_TYPE} == "pgsql"
-DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=7.2.0:../../databases/php-pgsql
+DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=${PHP_BASE_VERS}:../../databases/php-pgsql
 .endif
-DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=7.2.0:../../net/php-sockets
-DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=7.2.0:../../devel/php-sysvsem
+DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}:../../net/php-sockets
+DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}:../../devel/php-sysvsem
 
 INSTALLATION_DIRS+=    ${EGDIR} share/zabbix
 
-do-configure:
-
 do-install:
        rm -f ${WRKSRC}/ui/locale/*.orig
        cd ${WRKSRC}/ui; ${PAX} -rw . ${DESTDIR}${PREFIX}/share/zabbix/

Index: pkgsrc/sysutils/zabbix60-frontend/Makefile
diff -u pkgsrc/sysutils/zabbix60-frontend/Makefile:1.8 pkgsrc/sysutils/zabbix60-frontend/Makefile:1.9
--- pkgsrc/sysutils/zabbix60-frontend/Makefile:1.8      Mon Jan 13 17:22:19 2025
+++ pkgsrc/sysutils/zabbix60-frontend/Makefile  Sat Feb  8 03:54:13 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2025/01/13 17:22:19 taca Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/08 03:54:13 taca Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../sysutils/zabbix60-server/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-frontend-${ZABBIX_DB_TYPE}-/}
@@ -27,19 +27,19 @@ BUILD_DEFS+=                APACHE_GROUP APACHE_USER
 PKG_GROUPS_VARS+=      ${APACHE_GROUP}
 PKG_USERS_VARS=                ${APACHE_USER}
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-bcmath>=7.2.0:../../math/php-bcmath
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=7.2.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=7.2.0:../../devel/php-gettext
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=7.2.0:../../databases/php-ldap
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-bcmath>=${PHP_BASE_VERS}:../../math/php-bcmath
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=${PHP_BASE_VERS}:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 .if ${ZABBIX_DB_TYPE} == "mysql"
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=7.2.0:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
 .endif
 .if ${ZABBIX_DB_TYPE} == "pgsql"
-DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=7.2.0:../../databases/php-pgsql
+DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=${PHP_BASE_VERS}:../../databases/php-pgsql
 .endif
-DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=7.2.0:../../net/php-sockets
-DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=7.2.0:../../devel/php-sysvsem
+DEPENDS+=      ${PHP_PKG_PREFIX}-sockets>=${PHP_BASE_VERS}:../../net/php-sockets
+DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}:../../devel/php-sysvsem
 
 INSTALLATION_DIRS+=    ${EGDIR} share/zabbix