pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www



Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 04:04:41 UTC 2025

Modified Files:
        pkgsrc/www/mserv-php: Makefile
        pkgsrc/www/pear-HTML_Common: Makefile
        pkgsrc/www/pear-HTML_Select: Makefile
        pkgsrc/www/pear-HTML_TreeMenu: Makefile
        pkgsrc/www/pear-HTTP: Makefile
        pkgsrc/www/pear-HTTP_Request: Makefile
        pkgsrc/www/pear-HTTP_Request2: Makefile
        pkgsrc/www/php-apcu: Makefile PLIST.extras
        pkgsrc/www/php-apcu4: Makefile
        pkgsrc/www/php-apcu_bc: Makefile
        pkgsrc/www/php-basercms: Makefile
        pkgsrc/www/php-concrete-cms: Makefile
        pkgsrc/www/php-contao-manager: Makefile
        pkgsrc/www/php-dotclear: Makefile
        pkgsrc/www/php-glpi: Makefile
        pkgsrc/www/php-http4: Makefile
        pkgsrc/www/php-ja-wordpress: Makefile
        pkgsrc/www/php-nextcloud: Makefile
        pkgsrc/www/php-nextcloud29: Makefile
        pkgsrc/www/php-owncloud: 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.13 -r1.14 pkgsrc/www/mserv-php/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/pear-HTML_Common/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/pear-HTML_Select/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/pear-HTML_TreeMenu/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/pear-HTTP/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/pear-HTTP_Request/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/pear-HTTP_Request2/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/www/php-apcu/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/php-apcu/PLIST.extras
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/php-apcu4/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/php-apcu_bc/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/php-basercms/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/php-concrete-cms/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/php-contao-manager/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/php-dotclear/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/php-glpi/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/php-http4/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/php-ja-wordpress/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/www/php-nextcloud/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/php-nextcloud29/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/php-owncloud/Makefile

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

Modified files:

Index: pkgsrc/www/mserv-php/Makefile
diff -u pkgsrc/www/mserv-php/Makefile:1.13 pkgsrc/www/mserv-php/Makefile:1.14
--- pkgsrc/www/mserv-php/Makefile:1.13  Mon Feb 19 15:43:36 2024
+++ pkgsrc/www/mserv-php/Makefile       Sat Feb  8 04:04:39 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2024/02/19 15:43:36 taca Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/08 04:04:39 taca Exp $
 
 DISTNAME=      mserv-php-090
 PKGNAME=       mserv-php-0.90
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    audio www
 MASTER_SITES=  # 404: http://dougiamas.com/mserv/src/
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/www/pear-HTML_Common/Makefile
diff -u pkgsrc/www/pear-HTML_Common/Makefile:1.18 pkgsrc/www/pear-HTML_Common/Makefile:1.19
--- pkgsrc/www/pear-HTML_Common/Makefile:1.18   Sun Oct 28 06:30:56 2012
+++ pkgsrc/www/pear-HTML_Common/Makefile        Sat Feb  8 04:04:39 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2012/10/28 06:30:56 asau Exp $
+# $NetBSD: Makefile,v 1.19 2025/02/08 04:04:39 taca Exp $
 
 DISTNAME=      HTML_Common-1.2.5
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/pear-HTML_Select/Makefile
diff -u pkgsrc/www/pear-HTML_Select/Makefile:1.16 pkgsrc/www/pear-HTML_Select/Makefile:1.17
--- pkgsrc/www/pear-HTML_Select/Makefile:1.16   Sun Oct 28 06:30:56 2012
+++ pkgsrc/www/pear-HTML_Select/Makefile        Sat Feb  8 04:04:39 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/10/28 06:30:56 asau Exp $
+# $NetBSD: Makefile,v 1.17 2025/02/08 04:04:39 taca Exp $
 
 DISTNAME=      HTML_Select-1.3.1
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/pear-HTML_TreeMenu/Makefile
diff -u pkgsrc/www/pear-HTML_TreeMenu/Makefile:1.3 pkgsrc/www/pear-HTML_TreeMenu/Makefile:1.4
--- pkgsrc/www/pear-HTML_TreeMenu/Makefile:1.3  Sun Oct 28 06:30:56 2012
+++ pkgsrc/www/pear-HTML_TreeMenu/Makefile      Sat Feb  8 04:04:39 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/10/28 06:30:56 asau Exp $
+# $NetBSD: Makefile,v 1.4 2025/02/08 04:04:39 taca Exp $
 
 DISTNAME=      HTML_TreeMenu-1.2.2
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/pear-HTTP/Makefile
diff -u pkgsrc/www/pear-HTTP/Makefile:1.7 pkgsrc/www/pear-HTTP/Makefile:1.8
--- pkgsrc/www/pear-HTTP/Makefile:1.7   Wed Jul  3 07:28:23 2019
+++ pkgsrc/www/pear-HTTP/Makefile       Sat Feb  8 04:04:39 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2019/07/03 07:28:23 nia Exp $
+# $NetBSD: Makefile,v 1.8 2025/02/08 04:04:39 taca Exp $
 
 DISTNAME=      HTTP-1.4.1
+PKGREVISION=   1
 CATEGORIES+=   www
 
 MAINTAINER=    brook%nmsu.edu@localhost pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/pear-HTTP_Request/Makefile
diff -u pkgsrc/www/pear-HTTP_Request/Makefile:1.13 pkgsrc/www/pear-HTTP_Request/Makefile:1.14
--- pkgsrc/www/pear-HTTP_Request/Makefile:1.13  Sun Oct 28 06:30:57 2012
+++ pkgsrc/www/pear-HTTP_Request/Makefile       Sat Feb  8 04:04:39 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/10/28 06:30:57 asau Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/08 04:04:39 taca Exp $
 
 DISTNAME=      HTTP_Request-1.4.4
-#CATEGORIES+=  www
+PKGREVISION=   1
+CATEGORIES+=   www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       PHP classes to provides an easy way to perform HTTP requests

Index: pkgsrc/www/pear-HTTP_Request2/Makefile
diff -u pkgsrc/www/pear-HTTP_Request2/Makefile:1.6 pkgsrc/www/pear-HTTP_Request2/Makefile:1.7
--- pkgsrc/www/pear-HTTP_Request2/Makefile:1.6  Sat Nov  4 15:25:50 2023
+++ pkgsrc/www/pear-HTTP_Request2/Makefile      Sat Feb  8 04:04:39 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2023/11/04 15:25:50 taca Exp $
+# $NetBSD: Makefile,v 1.7 2025/02/08 04:04:39 taca Exp $
 #
 
 DISTNAME=      HTTP_Request2-2.6.0
+PKGREVISION=   1
 CATEGORIES+=   www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/php-apcu/Makefile
diff -u pkgsrc/www/php-apcu/Makefile:1.26 pkgsrc/www/php-apcu/Makefile:1.27
--- pkgsrc/www/php-apcu/Makefile:1.26   Sun Sep 22 14:58:18 2024
+++ pkgsrc/www/php-apcu/Makefile        Sat Feb  8 04:04:39 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2024/09/22 14:58:18 taca Exp $
+# $NetBSD: Makefile,v 1.27 2025/02/08 04:04:39 taca Exp $
 
 MODNAME=       apcu
 PECL_VERSION=  5.1.24
+PKGREVISION=   1
 CATEGORIES+=   sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/php-apcu/PLIST.extras
diff -u pkgsrc/www/php-apcu/PLIST.extras:1.7 pkgsrc/www/php-apcu/PLIST.extras:1.8
--- pkgsrc/www/php-apcu/PLIST.extras:1.7        Sun Dec 12 15:25:53 2021
+++ pkgsrc/www/php-apcu/PLIST.extras    Sat Feb  8 04:04:39 2025
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST.extras,v 1.7 2021/12/12 15:25:53 taca Exp $
-include/php/ext/apcu/apc.h
-include/php/ext/apcu/apc_api.h
-include/php/ext/apcu/apc_arginfo.h
-include/php/ext/apcu/apc_cache.h
-include/php/ext/apcu/apc_globals.h
-include/php/ext/apcu/apc_iterator.h
-include/php/ext/apcu/apc_lock.h
-include/php/ext/apcu/apc_mutex.h
-include/php/ext/apcu/apc_serializer.h
-include/php/ext/apcu/apc_sma.h
-include/php/ext/apcu/apc_stack.h
-include/php/ext/apcu/php_apc.h
-include/php/ext/apcu/php_apc_legacy_arginfo.h
+@comment $NetBSD: PLIST.extras,v 1.8 2025/02/08 04:04:39 taca Exp $
+${PHP_INCDIR}/ext/apcu/apc.h
+${PHP_INCDIR}/ext/apcu/apc_api.h
+${PHP_INCDIR}/ext/apcu/apc_arginfo.h
+${PHP_INCDIR}/ext/apcu/apc_cache.h
+${PHP_INCDIR}/ext/apcu/apc_globals.h
+${PHP_INCDIR}/ext/apcu/apc_iterator.h
+${PHP_INCDIR}/ext/apcu/apc_lock.h
+${PHP_INCDIR}/ext/apcu/apc_mutex.h
+${PHP_INCDIR}/ext/apcu/apc_serializer.h
+${PHP_INCDIR}/ext/apcu/apc_sma.h
+${PHP_INCDIR}/ext/apcu/apc_stack.h
+${PHP_INCDIR}/ext/apcu/php_apc.h
+${PHP_INCDIR}/ext/apcu/php_apc_legacy_arginfo.h

Index: pkgsrc/www/php-apcu4/Makefile
diff -u pkgsrc/www/php-apcu4/Makefile:1.3 pkgsrc/www/php-apcu4/Makefile:1.4
--- pkgsrc/www/php-apcu4/Makefile:1.3   Sun Sep 11 17:03:28 2016
+++ pkgsrc/www/php-apcu4/Makefile       Sat Feb  8 04:04:40 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/09/11 17:03:28 taca Exp $
+# $NetBSD: Makefile,v 1.4 2025/02/08 04:04:40 taca Exp $
 
 MODNAME=       apcu
 PECL_VERSION=  4.0.11
+PKGREVISION=   1
 CATEGORIES+=   sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/php-apcu_bc/Makefile
diff -u pkgsrc/www/php-apcu_bc/Makefile:1.10 pkgsrc/www/php-apcu_bc/Makefile:1.11
--- pkgsrc/www/php-apcu_bc/Makefile:1.10        Wed Dec 29 06:05:19 2021
+++ pkgsrc/www/php-apcu_bc/Makefile     Sat Feb  8 04:04:40 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2021/12/29 06:05:19 taca Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/08 04:04:40 taca Exp $
 
 MODNAME=       apcu_bc
 PKGMODNAME=    apc
 PECL_VERSION=  1.0.5
+PKGREVISION=   1
 CATEGORIES+=   sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/www/php-basercms/Makefile
diff -u pkgsrc/www/php-basercms/Makefile:1.10 pkgsrc/www/php-basercms/Makefile:1.11
--- pkgsrc/www/php-basercms/Makefile:1.10       Mon Nov  4 22:10:11 2019
+++ pkgsrc/www/php-basercms/Makefile    Sat Feb  8 04:04:40 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2019/11/04 22:10:11 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/08 04:04:40 taca Exp $
 
 BASERVER=      3.0.16
+PKGREVISION=   1
 DISTNAME=      basercms-${BASERVER}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
@@ -12,8 +13,8 @@ HOMEPAGE=     https://basercms.net/
 COMMENT=       Easy to use Content Management System for Japan/Japanese
 LICENSE=       mit
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
 
 WRKSRC=                        ${WRKDIR}/basercms
 USE_LANGUAGES=         # none

Index: pkgsrc/www/php-concrete-cms/Makefile
diff -u pkgsrc/www/php-concrete-cms/Makefile:1.8 pkgsrc/www/php-concrete-cms/Makefile:1.9
--- pkgsrc/www/php-concrete-cms/Makefile:1.8    Wed Jan 29 15:17:43 2025
+++ pkgsrc/www/php-concrete-cms/Makefile        Sat Feb  8 04:04:40 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2025/01/29 15:17:43 taca Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/08 04:04:40 taca Exp $
 #
 
 DISTNAME=      concrete-cms-${GITHUB_RELEASE}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=concretecms/}
 GITHUB_PROJECT=        concretecms

Index: pkgsrc/www/php-contao-manager/Makefile
diff -u pkgsrc/www/php-contao-manager/Makefile:1.6 pkgsrc/www/php-contao-manager/Makefile:1.7
--- pkgsrc/www/php-contao-manager/Makefile:1.6  Sun Jan 19 13:50:09 2025
+++ pkgsrc/www/php-contao-manager/Makefile      Sat Feb  8 04:04:40 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2025/01/19 13:50:09 taca Exp $
+# $NetBSD: Makefile,v 1.7 2025/02/08 04:04:40 taca Exp $
 #
 
 DISTNAME=      ${CM_NAME}.phar
 PKGNAME=       ${PHP_PKG_PREFIX}-${CM_NAME}-${CM_VERSION}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://download.contao.org/contao-manager/stable/
 DIST_SUBDIR=   ${CM_NAME}/${CM_VERSION}

Index: pkgsrc/www/php-dotclear/Makefile
diff -u pkgsrc/www/php-dotclear/Makefile:1.10 pkgsrc/www/php-dotclear/Makefile:1.11
--- pkgsrc/www/php-dotclear/Makefile:1.10       Sun May 12 14:36:46 2024
+++ pkgsrc/www/php-dotclear/Makefile    Sat Feb  8 04:04:40 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2024/05/12 14:36:46 taca Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/08 04:04:40 taca Exp $
 
 DISTNAME=      dotclear-2.25.3
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  https://download.dotclear.org/latest/ \
@@ -13,12 +14,8 @@ LICENSE=     gnu-gpl-v2
 
 PHP_VERSIONS_ACCEPTED= 82 81 74
 
-.include "../../lang/php/phpversion.mk"
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
-.if ${PKG_PHP_MAJOR_VERS} < 8
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
-.endif
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 NO_BUILD=      yes
@@ -94,4 +91,5 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/nginx.conf ${DESTDIR}${EGDIR}/nginx.conf
        ${INSTALL_DATA} ${WRKSRC}/php-fpm.conf ${DESTDIR}${EGDIR}/php-fpm.conf
 
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-glpi/Makefile
diff -u pkgsrc/www/php-glpi/Makefile:1.20 pkgsrc/www/php-glpi/Makefile:1.21
--- pkgsrc/www/php-glpi/Makefile:1.20   Mon Feb 19 15:43:36 2024
+++ pkgsrc/www/php-glpi/Makefile        Sat Feb  8 04:04:40 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2024/02/19 15:43:36 taca Exp $
+# $NetBSD: Makefile,v 1.21 2025/02/08 04:04:40 taca Exp $
 
 DISTNAME=      glpi-${GLPI_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 GLPI_VERSION=  10.0.12
 CATEGORIES=    www
 
@@ -14,29 +14,23 @@ HOMEPAGE=   https://glpi-project.org/
 COMMENT=       IT inventory management software
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=7.4:../../archivers/php-bz2
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=7.4:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=7.4:../../graphics/php-exif
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=7.4:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=7.4:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-imap>=7.4:../../mail/php-imap
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=7.4:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=7.4:../../databases/php-ldap
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.4:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=7.4:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=7.4:../../devel/php-opcache
-DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=7.4:../../security/php-sodium
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=7.4:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=7.4:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-bz2>=${PHP_BASE_VERS}:../../archivers/php-bz2
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-imap>=${PHP_BASE_VERS}:../../mail/php-imap
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+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}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
+DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=${PHP_BASE_VERS}:../../security/php-sodium
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 DEPENDS+=      freefont-ttf-[0-9]*:../../fonts/freefont-ttf
 
-.include "../../lang/php/phpversion.mk"
-
-.if ${PKG_PHP_VERSION} == 74
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=7.4:../../textproc/php-json
-.endif
-
 NO_BUILD=      yes
 USE_LANGUAGES= # none
 
@@ -80,10 +74,7 @@ SUBST_FILES.path+=   inc/downstream.php
 SUBST_FILES.path+=     config/crontab.sample
 SUBST_FILES.path+=     config/httpd-glpi.conf
 
-REPLACE_INTERPRETER+=  php
-REPLACE.php.old=       .*php
-REPLACE.php.new=       ${PREFIX}/bin/php
-REPLACE_FILES.php=     bin/console
+REPLACE_PHP+=          bin/console
 
 OWN_DIRS_PERMS+=       ${GLPI_DIR}/marketplace ${APACHE_USER} \
                                ${APACHE_GROUP} 0750
@@ -109,6 +100,7 @@ do-install:
        cd ${WRKSRC} && rm -r files
        cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${GLPI_DIR}
 
+.include "../../lang/php/json.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../lang/php/phpversion.mk"

Index: pkgsrc/www/php-http4/Makefile
diff -u pkgsrc/www/php-http4/Makefile:1.17 pkgsrc/www/php-http4/Makefile:1.18
--- pkgsrc/www/php-http4/Makefile:1.17  Thu Nov 14 22:22:09 2024
+++ pkgsrc/www/php-http4/Makefile       Sat Feb  8 04:04:40 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2024/11/14 22:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2025/02/08 04:04:40 taca Exp $
 
 MODNAME=               http
 PECL_VERSION=          4.2.4
+PKGREVISION=           6
 CATEGORIES+=           www
 
 PECL_DISTNAME=         pecl_http-${PECL_VERSION}
@@ -9,7 +10,6 @@ PECL_DISTNAME=         pecl_http-${PECL_VERSION
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://pecl.php.net/package/pecl_http
 COMMENT=               PHP extension for extended HTTP support
-PKGREVISION=           5
 LICENSE=               2-clause-bsd AND isc
 
 CONFLICTS=             php-http-[0-9]*

Index: pkgsrc/www/php-ja-wordpress/Makefile
diff -u pkgsrc/www/php-ja-wordpress/Makefile:1.25 pkgsrc/www/php-ja-wordpress/Makefile:1.26
--- pkgsrc/www/php-ja-wordpress/Makefile:1.25   Sun Jan 26 11:38:15 2025
+++ pkgsrc/www/php-ja-wordpress/Makefile        Sat Feb  8 04:04:41 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2025/01/26 11:38:15 mef Exp $
+# $NetBSD: Makefile,v 1.26 2025/02/08 04:04:41 taca Exp $
 
 DISTNAME=              wordpress-${VERSION}-ja
 PKGNAME=               ${PHP_PKG_PREFIX}-ja-wordpress-${VERSION}
 VERSION=               6.7.1
+PKGREVISION=           1
 CATEGORIES=            www
 MASTER_SITES=          https://ja.wordpress.org/
 
@@ -43,11 +44,11 @@ OWN_DIRS_PERMS+=    ${WPHOME}/wp-content/up
 
 INSTALLATION_DIRS+=    ${DOCDIR} ${WPHOME} ${EGDIR}
 
-DEPENDS+=              ${PHP_PKG_PREFIX}-mysqli>=5.6.20:../../databases/php-mysqli
-DEPENDS+=              ${PHP_PKG_PREFIX}-gd>=5.6.20:../../graphics/php-gd
-DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=5.6.20:../../www/php-curl
-DEPENDS+=              ${PHP_PKG_PREFIX}-zip>=5.6.20:../../archivers/php-zip
-DEPENDS+=              ${PHP_PKG_PREFIX}-zlib>=5.6.20:../../archivers/php-zlib
+DEPENDS+=              ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+DEPENDS+=              ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=              ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=              ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 SUBST_CLASSES+=                conf
 SUBST_MESSAGE.conf=    Fixing pathnames in configuration file.

Index: pkgsrc/www/php-nextcloud/Makefile
diff -u pkgsrc/www/php-nextcloud/Makefile:1.79 pkgsrc/www/php-nextcloud/Makefile:1.80
--- pkgsrc/www/php-nextcloud/Makefile:1.79      Mon Nov 11 03:47:28 2024
+++ pkgsrc/www/php-nextcloud/Makefile   Sat Feb  8 04:04:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2024/11/11 03:47:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.80 2025/02/08 04:04:41 taca Exp $
 #
 
 # The nextcloud update process only works from one version to the
@@ -11,6 +11,7 @@
 # later 18.x.y, to 19.0.0, and to later 19.x.y, but it is not ok to
 # update to 20.
 DISTNAME=      nextcloud-30.0.2
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  https://download.nextcloud.com/server/releases/
@@ -21,18 +22,18 @@ HOMEPAGE=   https://nextcloud.com/
 COMMENT=       File sharing web service server
 LICENSE=       gnu-agpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=8.0.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=8.0.0:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=8.0.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=8.0.0:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=8.0.0:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=8.0.0:../../databases/php-pdo
-DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=8.0.0:../../devel/php-posix
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=8.0.0:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=8.0.0:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=8.0.0:../../security/php-sodium
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=8.0.0:../../graphics/php-exif
-DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=8.0.0:../../devel/php-sysvsem
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+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}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
+DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}:../../devel/php-posix
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=${PHP_BASE_VERS}:../../security/php-sodium
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}:../../devel/php-sysvsem
 
 .include "options.mk"
 

Index: pkgsrc/www/php-nextcloud29/Makefile
diff -u pkgsrc/www/php-nextcloud29/Makefile:1.1 pkgsrc/www/php-nextcloud29/Makefile:1.2
--- pkgsrc/www/php-nextcloud29/Makefile:1.1     Thu Oct 24 15:27:15 2024
+++ pkgsrc/www/php-nextcloud29/Makefile Sat Feb  8 04:04:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/10/24 15:27:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2025/02/08 04:04:41 taca Exp $
 #
 
 # The nextcloud update process only works from one version to the
@@ -12,6 +12,7 @@
 # update to 20.
 DISTNAME=      nextcloud-29.0.8
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://download.nextcloud.com/server/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -21,18 +22,18 @@ HOMEPAGE=   https://nextcloud.com/
 COMMENT=       File sharing web service server, 29 release branch
 LICENSE=       gnu-agpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=8.0.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=8.0.0:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=8.0.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=8.0.0:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=8.0.0:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=8.0.0:../../databases/php-pdo
-DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=8.0.0:../../devel/php-posix
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=8.0.0:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=8.0.0:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=8.0.0:../../security/php-sodium
-DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=8.0.0:../../graphics/php-exif
-DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=8.0.0:../../devel/php-sysvsem
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+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}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
+DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}:../../devel/php-posix
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=${PHP_BASE_VERS}:../../security/php-sodium
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
+DEPENDS+=      ${PHP_PKG_PREFIX}-sysvsem>=${PHP_BASE_VERS}:../../devel/php-sysvsem
 
 .include "options.mk"
 

Index: pkgsrc/www/php-owncloud/Makefile
diff -u pkgsrc/www/php-owncloud/Makefile:1.83 pkgsrc/www/php-owncloud/Makefile:1.84
--- pkgsrc/www/php-owncloud/Makefile:1.83       Mon Aug 14 05:25:30 2023
+++ pkgsrc/www/php-owncloud/Makefile    Sat Feb  8 04:04:41 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.83 2023/08/14 05:25:30 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2025/02/08 04:04:41 taca Exp $
 #
 
 DISTNAME=      owncloud-10.9.1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  http://download.owncloud.org/community/
 EXTRACT_SUFX=  .tar.bz2
@@ -13,15 +13,15 @@ HOMEPAGE=   https://owncloud.org/
 COMMENT=       Web services under your control
 LICENSE=       gnu-agpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=5.4.0:../../converters/php-iconv
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=5.4.0:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.4.0:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=5.4.0:../../databases/php-pdo
-DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=5.4.0:../../devel/php-posix
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+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}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
+DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}:../../devel/php-posix
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
 
 .include "options.mk"
 



Home | Main Index | Thread Index | Old Index