CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sat, 8 Feb 2025 03:33:12 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:33:12 UTC 2025

Modified Files:
        pkgsrc/databases/php-redis4: Makefile
        pkgsrc/databases/php-rrd: Makefile
        pkgsrc/databases/php-rrd1: Makefile
        pkgsrc/databases/phpldapadmin: Makefile
        pkgsrc/databases/phpmyadmin: Makefile
        pkgsrc/databases/phpmyadmin5: Makefile
        pkgsrc/databases/phppgadmin: Makefile

Log Message:
multiple PHP support

* Use PHP_BASE_VERS in DEPENDS if required.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/php-redis4/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/php-rrd/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/php-rrd1/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/databases/phpldapadmin/Makefile
cvs rdiff -u -r1.169 -r1.170 pkgsrc/databases/phpmyadmin/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/phpmyadmin5/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/databases/phppgadmin/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/php-redis4/Makefile
diff -u pkgsrc/databases/php-redis4/Makefile:1.1 pkgsrc/databases/php-redis4/Makefile:1.2
--- pkgsrc/databases/php-redis4/Makefile:1.1    Sun Mar  7 12:58:28 2021
+++ pkgsrc/databases/php-redis4/Makefile        Sat Feb  8 03:33:11 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2021/03/07 12:58:28 taca Exp $
+# $NetBSD: Makefile,v 1.2 2025/02/08 03:33:11 taca Exp $
 #
 
 MODNAME=       redis
+PKGREVISION=   1
 PKGMODNAME=    redis
 PECL_VERSION=  4.3.0
 PECL_LEGACY_VERSION_SCHEME=    yes

Index: pkgsrc/databases/php-rrd/Makefile
diff -u pkgsrc/databases/php-rrd/Makefile:1.30 pkgsrc/databases/php-rrd/Makefile:1.31
--- pkgsrc/databases/php-rrd/Makefile:1.30      Fri Dec 27 08:19:29 2024
+++ pkgsrc/databases/php-rrd/Makefile   Sat Feb  8 03:33:11 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2024/12/27 08:19:29 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2025/02/08 03:33:11 taca Exp $
 
 MODNAME=       rrd
 PECL_VERSION=  2.0.3
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/databases/php-rrd1/Makefile
diff -u pkgsrc/databases/php-rrd1/Makefile:1.5 pkgsrc/databases/php-rrd1/Makefile:1.6
--- pkgsrc/databases/php-rrd1/Makefile:1.5      Fri Dec 27 08:19:29 2024
+++ pkgsrc/databases/php-rrd1/Makefile  Sat Feb  8 03:33:12 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2024/12/27 08:19:29 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2025/02/08 03:33:12 taca Exp $
 
 MODNAME=       rrd
 PECL_VERSION=  1.1.3
-PKGREVISION=   26
+PKGREVISION=   27
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/databases/phpldapadmin/Makefile
diff -u pkgsrc/databases/phpldapadmin/Makefile:1.48 pkgsrc/databases/phpldapadmin/Makefile:1.49
--- pkgsrc/databases/phpldapadmin/Makefile:1.48 Wed May  8 21:32:18 2024
+++ pkgsrc/databases/phpldapadmin/Makefile      Sat Feb  8 03:33:12 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2024/05/08 21:32:18 khorben Exp $
+# $NetBSD: Makefile,v 1.49 2025/02/08 03:33:12 taca Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=leenooks/}
 GITHUB_PROJECT=        phpLDAPadmin
@@ -15,8 +16,8 @@ LICENSE=      gnu-gpl-v2
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/php/phpversion.mk"
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=4.1.2:../../databases/php-ldap
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=4.1.2:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=${PHP_BASE_VERS}:../../databases/php-ldap
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
 
 USE_TOOLS+=    pax
 

Index: pkgsrc/databases/phpmyadmin/Makefile
diff -u pkgsrc/databases/phpmyadmin/Makefile:1.169 pkgsrc/databases/phpmyadmin/Makefile:1.170
--- pkgsrc/databases/phpmyadmin/Makefile:1.169  Fri Apr 22 18:06:05 2022
+++ pkgsrc/databases/phpmyadmin/Makefile        Sat Feb  8 03:33:12 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.169 2022/04/22 18:06:05 tm Exp $
+# $NetBSD: Makefile,v 1.170 2025/02/08 03:33:12 taca Exp $
 
 DISTNAME=      phpMyAdmin-4.9.10-all-languages
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
+PKGREVISION=   1
 CATEGORIES=    databases www
 MASTER_SITES=  https://files.phpmyadmin.net/phpMyAdmin/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -11,21 +12,13 @@ HOMEPAGE=   https://www.phpmyadmin.net/
 COMMENT=       Set of PHP-scripts to adminstrate MySQL over the WWW
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=5.3.0:../../archivers/php-bz2
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.3.0:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=5.3.0:../../devel/php-gettext
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.3.0:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
-
-.include "../../lang/php/phpversion.mk"
-
-.if ${PKG_PHP_VERSION} < 71
-DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
-.else
-DEPENDS+=      ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
-.endif
+DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=${PHP_BASE_VERS}:../../archivers/php-bz2
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
 
 USE_LANGUAGES= # none
 USE_TOOLS+=    pax
@@ -55,15 +48,12 @@ PMCONFFILE= ${PKG_SYSCONFDIR}/config.inc
 PMDIR=         ${PREFIX}/share/phpmyadmin
 PMVARDIR=      ${VARBASE}/phpmyadmin
 
-REPLACE_INTERPRETER+=  php
-REPLACE.php.old=       /usr/bin/env php
-REPLACE.php.new=       ${PREFIX}/bin/php
-REPLACE_FILES.php=     vendor/phpmyadmin/sql-parser/bin/highlight-query
-REPLACE_FILES.php+=    vendor/bin/highlight-query
-REPLACE_FILES.php+=    vendor/phpmyadmin/sql-parser/bin/lint-query
-REPLACE_FILES.php+=    vendor/bin/lint-query
-REPLACE_FILES.php+=    vendor/phpmyadmin/sql-parser/bin/tokenize-query
-REPLACE_FILES.php+=    vendor/bin/tokenize-query
+REPLACE_PHP+=  vendor/phpmyadmin/sql-parser/bin/highlight-query
+REPLACE_PHP+=  vendor/bin/highlight-query
+REPLACE_PHP+=  vendor/phpmyadmin/sql-parser/bin/lint-query
+REPLACE_PHP+=  vendor/bin/lint-query
+REPLACE_PHP+=  vendor/phpmyadmin/sql-parser/bin/tokenize-query
+REPLACE_PHP+=  vendor/bin/tokenize-query
 
 REPLACE_SH+=   vendor/twig/twig/drupal_test.sh
 
@@ -85,6 +75,14 @@ SUBST_STAGE.paths=   post-configure
 INSTALLATION_DIRS+=    ${PREFIX}/share/doc/phpmyadmin \
                        ${PREFIX}/share/examples/phpmyadmin
 
+.include "../../lang/php/phpversion.mk"
+
+.if ${PHP_VER} < 71
+DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=${PHP_BASE_VERS}:../../security/php-mcrypt
+.else
+DEPENDS+=      ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
+.endif
+
 post-extract:
        ${CP} ${FILESDIR}/phpmyadmin.conf ${WRKDIR}
 

Index: pkgsrc/databases/phpmyadmin5/Makefile
diff -u pkgsrc/databases/phpmyadmin5/Makefile:1.4 pkgsrc/databases/phpmyadmin5/Makefile:1.5
--- pkgsrc/databases/phpmyadmin5/Makefile:1.4   Wed Apr 17 10:38:33 2024
+++ pkgsrc/databases/phpmyadmin5/Makefile       Sat Feb  8 03:33:12 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2024/04/17 10:38:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/02/08 03:33:12 taca Exp $
 
 DISTNAME=      phpMyAdmin-5.1.3-all-languages
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
 CATEGORIES=    databases www
 MASTER_SITES=  https://files.phpmyadmin.net/phpMyAdmin/${PKGVERSION_NOREV}/
@@ -12,16 +13,16 @@ COMMENT=    Set of PHP-scripts to adminstra
 LICENSE=       gnu-gpl-v2
 
 # Required
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=7.2.5:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=7.2.5:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
 
 # Suggest
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=7.2.5:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=7.2.5:../../archivers/php-bz2
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=7.2.5:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.2.5:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=7.2.5:../../devel/php-gettext
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=7.2.5:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=${PHP_BASE_VERS}:../../archivers/php-bz2
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=${PHP_BASE_VERS}:../../devel/php-gettext
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
 
 PHP_VERSIONS_INCOMPATIBLE=     56
 

Index: pkgsrc/databases/phppgadmin/Makefile
diff -u pkgsrc/databases/phppgadmin/Makefile:1.40 pkgsrc/databases/phppgadmin/Makefile:1.41
--- pkgsrc/databases/phppgadmin/Makefile:1.40   Mon Oct 16 13:02:26 2023
+++ pkgsrc/databases/phppgadmin/Makefile        Sat Feb  8 03:33:12 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2023/10/16 13:02:26 hauke Exp $
+# $NetBSD: Makefile,v 1.41 2025/02/08 03:33:12 taca Exp $
 
 DISTNAME=      phpPgAdmin-7.13.0
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/PgAdmin/pgadmin/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=phppgadmin/}
 GITHUB_PROJECT=        phppgadmin
@@ -12,8 +12,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/phppgadmin/phppgadmin
 COMMENT=       Set of PHP scripts to administer PostgreSQL over the WWW
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=7.2.0:../../databases/php-pgsql
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-pgsql>=${PHP_BASE_VERS}:../../databases/php-pgsql
 
 PHP_VERSIONS_INCOMPATIBLE=     56

Prev by Date: CVS commit: pkgsrc/databases/php-redis
Next by Date: CVS commit: pkgsrc/databases
Previous by Thread: CVS commit: pkgsrc/databases/php-redis
Next by Thread: CVS commit: pkgsrc/databases
Indexes:

Home | Main Index | Thread Index | Old Index