CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sun, 7 Mar 2021 13:21:59 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Mar  7 13:21:58 UTC 2021

Modified Files:
        pkgsrc/benchmarks/phoronix-test-suite: Makefile
        pkgsrc/databases/php-mongodb: Makefile
        pkgsrc/databases/phpmyadmin: Makefile
        pkgsrc/devel/arcanist: Makefile
        pkgsrc/devel/mantis: Makefile
        pkgsrc/devel/php-composer: Makefile
        pkgsrc/mail/roundcube: Makefile
        pkgsrc/net/cacti: Makefile
        pkgsrc/net/icingaweb2: Makefile
        pkgsrc/net/php-baikal: Makefile
        pkgsrc/sysutils/zabbix-frontend: Makefile
        pkgsrc/sysutils/zabbix50-frontend: Makefile
        pkgsrc/www/mediawiki: Makefile
        pkgsrc/www/php-nextcloud: Makefile
        pkgsrc/www/php-owncloud: Makefile
        pkgsrc/www/php-soycms: Makefile
        pkgsrc/www/php-tt-rss: Makefile

Log Message:
Switch to use lang/php/json.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/benchmarks/phoronix-test-suite/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/php-mongodb/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/databases/phpmyadmin/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/arcanist/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/mantis/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/php-composer/Makefile
cvs rdiff -u -r1.93 -r1.94 pkgsrc/mail/roundcube/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/net/cacti/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/icingaweb2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/php-baikal/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix-frontend/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix50-frontend/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/mediawiki/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/www/php-nextcloud/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/www/php-owncloud/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/php-soycms/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/php-tt-rss/Makefile

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

Modified files:

Index: pkgsrc/benchmarks/phoronix-test-suite/Makefile
diff -u pkgsrc/benchmarks/phoronix-test-suite/Makefile:1.10 pkgsrc/benchmarks/phoronix-test-suite/Makefile:1.11
--- pkgsrc/benchmarks/phoronix-test-suite/Makefile:1.10 Mon Dec  9 14:20:54 2019
+++ pkgsrc/benchmarks/phoronix-test-suite/Makefile      Sun Mar  7 13:21:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/12/09 14:20:54 taca Exp $
+# $NetBSD: Makefile,v 1.11 2021/03/07 13:21:56 taca Exp $
 #
 
 DISTNAME=      phoronix-test-suite-${PTS_VERSION}
@@ -14,7 +14,6 @@ LICENSE=      gnu-gpl-v3
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.3:../../www/php-curl
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-pcntl>=5.3:../../devel/php-pcntl
 DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=5.3:../../devel/php-posix
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.3:../../archivers/php-zip
@@ -47,8 +46,7 @@ do-install:
        cd ${WRKSRC}/ && DESTDIR=${DESTDIR:Q} PKGMANDIR=${PKGMANDIR:Q} \
                ./install-sh ${PREFIX:Q}
 
-.include "../../lang/php/phpversion.mk"
-.include "${PHPPKGSRCDIR}/buildlink3.mk"
+.include "../../lang/php/json.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/databases/php-mongodb/Makefile
diff -u pkgsrc/databases/php-mongodb/Makefile:1.10 pkgsrc/databases/php-mongodb/Makefile:1.11
--- pkgsrc/databases/php-mongodb/Makefile:1.10  Sun Jan  3 08:07:51 2021
+++ pkgsrc/databases/php-mongodb/Makefile       Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/01/03 08:07:51 taca Exp $
+# $NetBSD: Makefile,v 1.11 2021/03/07 13:21:57 taca Exp $
 
 MODNAME=       mongodb
 PECL_VERSION=  1.9.0
@@ -9,8 +9,6 @@ HOMEPAGE=       http://docs.mongodb.org/ecosys
 COMMENT=       MongoDB database driver
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
-
 PHP_VERSIONS_INCOMPATIBLE=     56
 
 USE_TOOLS+=            pkg-config
@@ -21,5 +19,6 @@ CONFIGURE_ARGS+=      --with-openssl-dir=${BU
 .include "../../security/openssl/buildlink3.mk"
 .include "../../databases/mongo-c-driver/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
+.include "../../lang/php/json.mk"
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/phpmyadmin/Makefile
diff -u pkgsrc/databases/phpmyadmin/Makefile:1.165 pkgsrc/databases/phpmyadmin/Makefile:1.166
--- pkgsrc/databases/phpmyadmin/Makefile:1.165  Wed Nov 11 11:56:14 2020
+++ pkgsrc/databases/phpmyadmin/Makefile        Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2020/11/11 11:56:14 tm Exp $
+# $NetBSD: Makefile,v 1.166 2021/03/07 13:21:57 taca Exp $
 
 DISTNAME=      phpMyAdmin-4.9.7-all-languages
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
@@ -18,7 +18,6 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-mbstring>=5.
 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
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
 
 .include "../../lang/php/phpversion.mk"
 
@@ -97,5 +96,5 @@ do-install:
                        ${DESTDIR}${PREFIX}/share/doc/phpmyadmin
        ${INSTALL_DATA} ${WRKDIR}/phpmyadmin.conf ${DESTDIR}${EXDIR}/apache.conf
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/arcanist/Makefile
diff -u pkgsrc/devel/arcanist/Makefile:1.15 pkgsrc/devel/arcanist/Makefile:1.16
--- pkgsrc/devel/arcanist/Makefile:1.15 Fri Jan  1 09:05:06 2021
+++ pkgsrc/devel/arcanist/Makefile      Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/01/01 09:05:06 taca Exp $
+# $NetBSD: Makefile,v 1.16 2021/03/07 13:21:57 taca Exp $
 
 DISTNAME=              arcanist-20170609
 PKGREVISION=           3
@@ -17,7 +17,6 @@ EXTRACT_USING=                bsdtar
 USE_TOOLS+=            bsdtar pax
 
 DEPENDS+=              ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
-DEPENDS+=              ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=              libphutil-[0-9]*:../../devel/libphutil
 
 CONFLICTS+=            arc-[0-9]*
@@ -46,6 +45,5 @@ do-install:
                ${DESTDIR}${PREFIX}/bin/arc
 
 .include "../../lang/python/application.mk"
-.include "../../lang/php/phpversion.mk"
-.include "${PHPPKGSRCDIR}/buildlink3.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/mantis/Makefile
diff -u pkgsrc/devel/mantis/Makefile:1.57 pkgsrc/devel/mantis/Makefile:1.58
--- pkgsrc/devel/mantis/Makefile:1.57   Sat Mar  6 13:42:07 2021
+++ pkgsrc/devel/mantis/Makefile        Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2021/03/06 13:42:07 taca Exp $
+# $NetBSD: Makefile,v 1.58 2021/03/07 13:21:57 taca Exp $
 
 DISTNAME=      mantisbt-2.24.5
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/mantisbt/mantis/}
@@ -10,8 +10,6 @@ HOMEPAGE=     https://www.mantisbt.org/
 COMMENT=       PHP/MySQL/web based bugtracking system
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-
 NO_BUILD=      YES
 
 USE_TOOLS+=    bash:run pax
@@ -68,5 +66,5 @@ do-install:
        cd ${DESTDIR}${MANTIS_HOME} && \
                ${FIND} . -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/php-composer/Makefile
diff -u pkgsrc/devel/php-composer/Makefile:1.17 pkgsrc/devel/php-composer/Makefile:1.18
--- pkgsrc/devel/php-composer/Makefile:1.17     Fri Feb 26 00:46:27 2021
+++ pkgsrc/devel/php-composer/Makefile  Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/02/26 00:46:27 tpaul Exp $
+# $NetBSD: Makefile,v 1.18 2021/03/07 13:21:57 taca Exp $
 
 VERSION=       2.0.11
 PKGNAME=       ${PHP_PKG_PREFIX}-composer-${VERSION}
@@ -17,7 +17,6 @@ NO_BUILD=     yes
 AUTO_MKDIRS=   yes
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip-[0-9]*:../../archivers/php-zip
 
 do-extract:
@@ -35,5 +34,5 @@ SUBST_MESSAGE.fix-paths=      Fixing absolute
 SUBST_FILES.fix-paths=         composer
 SUBST_VARS.fix-paths=          PREFIX
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/roundcube/Makefile
diff -u pkgsrc/mail/roundcube/Makefile:1.93 pkgsrc/mail/roundcube/Makefile:1.94
--- pkgsrc/mail/roundcube/Makefile:1.93 Sun Jun  7 22:07:04 2020
+++ pkgsrc/mail/roundcube/Makefile      Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2020/06/07 22:07:04 taca Exp $
+# $NetBSD: Makefile,v 1.94 2021/03/07 13:21:57 taca Exp $
 
 DISTNAME=      roundcubemail-${RC_VERS}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/:S/-complete//}
@@ -10,7 +10,6 @@ LICENSE=      gnu-gpl-v3 AND mit AND gnu-lgpl
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=${PHP_BASE_VERS}:../../graphics/php-exif
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Net_Sieve>=1.3.2:../../net/pear-Net_Sieve
@@ -113,5 +112,5 @@ do-install:
                ${DESTDIR}${PREFIX}/${EGDIR}/defaults.inc.php
 
 .include "Makefile.common"
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/cacti/Makefile
diff -u pkgsrc/net/cacti/Makefile:1.51 pkgsrc/net/cacti/Makefile:1.52
--- pkgsrc/net/cacti/Makefile:1.51      Thu Nov  5 09:08:50 2020
+++ pkgsrc/net/cacti/Makefile   Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2020/11/05 09:08:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2021/03/07 13:21:57 taca Exp $
 
 DISTNAME=      cacti-1.2.11
 PKGREVISION=   4
@@ -15,7 +15,6 @@ USE_TOOLS+=           pax
 NO_BUILD=              yes
 
 #DEPENDS+=             ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
-DEPENDS+=              ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=              ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
 DEPENDS+=              ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 DEPENDS+=              ${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
@@ -28,7 +27,7 @@ DEPENDS+=             ${PHP_PKG_PREFIX}-gettext-[0-
 DEPENDS+=              ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-[0-9]*:../../www/ap-php
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/apache.mk"
 
 PKG_USERS=                     ${CACTI_USER}:${CACTI_GROUP}

Index: pkgsrc/net/icingaweb2/Makefile
diff -u pkgsrc/net/icingaweb2/Makefile:1.1 pkgsrc/net/icingaweb2/Makefile:1.2
--- pkgsrc/net/icingaweb2/Makefile:1.1  Tue Jan 19 08:12:05 2021
+++ pkgsrc/net/icingaweb2/Makefile      Sun Mar  7 13:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/01/19 08:12:05 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/07 13:21:57 taca Exp $
 
 DISTNAME=      icingaweb2-2.8.2
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -15,7 +15,6 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-gd-[0-9]*:..
 DEPENDS+=      ${PHP_PKG_PREFIX}-gettext-[0-9]*:../../devel/php-gettext
 DEPENDS+=      ${PHP_PKG_PREFIX}-imagick-[0-9]*:../../graphics/php-imagick
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl-[0-9]*:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 # For php-*sql see options.mk
 
@@ -283,5 +282,5 @@ PLIST_SUBST+=       EGDIR="${EGDIR:S.${PREFIX}
 
 GENERATE_PLIST+=       printf "${EGDIR:S.${PREFIX}/..}/%s\n" ${CONFS};
 
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"
-.include "../../lang/php/phpversion.mk"

Index: pkgsrc/net/php-baikal/Makefile
diff -u pkgsrc/net/php-baikal/Makefile:1.17 pkgsrc/net/php-baikal/Makefile:1.18
--- pkgsrc/net/php-baikal/Makefile:1.17 Fri Nov 27 16:05:19 2020
+++ pkgsrc/net/php-baikal/Makefile      Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/11/27 16:05:19 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2021/03/07 13:21:58 taca Exp $
 
 DISTNAME=      baikal-0.7.2
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ HOMEPAGE=     https://sabre.io/baikal/
 COMMENT=       Lightweight CalDAV+CardDAV server
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=5.3.1:../../databases/php-pdo
 DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_sqlite>=5.3.1:../../databases/php-pdo_sqlite
 
@@ -82,5 +81,5 @@ do-install:
        cd ${WRKSRC} && pax -rw -pmp * \
                ${DESTDIR}${PREFIX}/${BAIKALDIR}
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/zabbix-frontend/Makefile
diff -u pkgsrc/sysutils/zabbix-frontend/Makefile:1.6 pkgsrc/sysutils/zabbix-frontend/Makefile:1.7
--- pkgsrc/sysutils/zabbix-frontend/Makefile:1.6        Sat Jun 20 12:43:46 2020
+++ pkgsrc/sysutils/zabbix-frontend/Makefile    Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/06/20 12:43:46 gdt Exp $
+# $NetBSD: Makefile,v 1.7 2021/03/07 13:21:58 taca Exp $
 
 #PKGREVISION= 1
 .include "../../sysutils/zabbix/Makefile.common"
@@ -23,7 +23,6 @@ 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}-json>=5.4.0:../../textproc/php-json
 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
@@ -37,5 +36,5 @@ do-install:
        rm -f ${WRKSRC}/frontends/php/locale/*.orig
        cd ${WRKSRC}/frontends; ${PAX} -rw php ${DESTDIR}${PREFIX}/share/zabbix/
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/zabbix50-frontend/Makefile
diff -u pkgsrc/sysutils/zabbix50-frontend/Makefile:1.1 pkgsrc/sysutils/zabbix50-frontend/Makefile:1.2
--- pkgsrc/sysutils/zabbix50-frontend/Makefile:1.1      Tue Nov  3 22:48:55 2020
+++ pkgsrc/sysutils/zabbix50-frontend/Makefile  Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/11/03 22:48:55 otis Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/07 13:21:58 taca Exp $
 
 .include "../../sysutils/zabbix50-server/Makefile.common"
 
@@ -25,7 +25,6 @@ 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}-json>=7.2.0:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=7.2.0:../../databases/php-ldap
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
 .if ${ZABBIX_DB_TYPE} == "mysql"
@@ -47,6 +46,6 @@ do-install:
        ${INSTALL_DATA} ${FILESDIR}/httpd-zabbix.conf ${DESTDIR}${PREFIX}/${EGDIR}
        ${INSTALL_DATA} ${FILESDIR}/php-fpm-zabbix.conf ${DESTDIR}${PREFIX}/${EGDIR}
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/configure/replace-interpreter.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/mediawiki/Makefile
diff -u pkgsrc/www/mediawiki/Makefile:1.83 pkgsrc/www/mediawiki/Makefile:1.84
--- pkgsrc/www/mediawiki/Makefile:1.83  Fri Oct  2 01:51:10 2020
+++ pkgsrc/www/mediawiki/Makefile       Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2020/10/02 01:51:10 wen Exp $
+# $NetBSD: Makefile,v 1.84 2021/03/07 13:21:58 taca Exp $
 
 DISTNAME=      mediawiki-${VER}.${PVER}
 CATEGORIES=    www
@@ -11,7 +11,6 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.5.9:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=5.5.9:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.5.9:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.5.9:../../converters/php-mbstring
 
 EGDIR=                 share/examples/mediawiki
@@ -92,5 +91,5 @@ do-install:
        ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \
          ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-nextcloud/Makefile
diff -u pkgsrc/www/php-nextcloud/Makefile:1.50 pkgsrc/www/php-nextcloud/Makefile:1.51
--- pkgsrc/www/php-nextcloud/Makefile:1.50      Sat Feb 27 19:04:55 2021
+++ pkgsrc/www/php-nextcloud/Makefile   Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2021/02/27 19:04:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2021/03/07 13:21:58 taca Exp $
 #
 
 # The nextcloud update process only works from one version to the
@@ -23,7 +23,6 @@ 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}-json>=5.4.0:../../textproc/php-json
 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
@@ -70,6 +69,6 @@ do-install:
        cd ${WRKDIR} && ${FIND} nextcloud -type f \! -name '*.orig' -print | \
                pax -rw -pmp ${DESTDIR}${PREFIX}/share
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-owncloud/Makefile
diff -u pkgsrc/www/php-owncloud/Makefile:1.77 pkgsrc/www/php-owncloud/Makefile:1.78
--- pkgsrc/www/php-owncloud/Makefile:1.77       Thu Mar  4 16:42:44 2021
+++ pkgsrc/www/php-owncloud/Makefile    Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2021/03/04 16:42:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.78 2021/03/07 13:21:58 taca Exp $
 #
 
 DISTNAME=      owncloud-10.6.0
@@ -15,7 +15,6 @@ 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}-json>=5.4.0:../../textproc/php-json
 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
@@ -61,7 +60,6 @@ do-install:
        cd ${WRKDIR} && ${FIND} owncloud -type f \! -name '*.orig' -print | \
                pax -rw -pmp ${DESTDIR}${PREFIX}/share
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../lang/python/application.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-soycms/Makefile
diff -u pkgsrc/www/php-soycms/Makefile:1.5 pkgsrc/www/php-soycms/Makefile:1.6
--- pkgsrc/www/php-soycms/Makefile:1.5  Sun Jan 14 10:19:38 2018
+++ pkgsrc/www/php-soycms/Makefile      Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/01/14 10:19:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2021/03/07 13:21:58 taca Exp $
 
 DISTNAME=      soycms_1.4.0c_mysql
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/_/-/:S/_mysql//}
@@ -16,7 +16,6 @@ LICENSE=      gnu-gpl-v2
 DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=5.3.0:../../databases/php-pdo
 DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_mysql>=5.3.0:../../databases/php-pdo_mysql
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.3.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.3.0:../../archivers/php-zip
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
 
@@ -52,5 +51,5 @@ do-install:
        cd ${WRKSRC} && pax -rw -pmp * \
                ${DESTDIR}${PREFIX}/${SOYDIR}
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/php-tt-rss/Makefile
diff -u pkgsrc/www/php-tt-rss/Makefile:1.12 pkgsrc/www/php-tt-rss/Makefile:1.13
--- pkgsrc/www/php-tt-rss/Makefile:1.12 Sun Sep  3 08:53:17 2017
+++ pkgsrc/www/php-tt-rss/Makefile      Sun Mar  7 13:21:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/09/03 08:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/07 13:21:58 taca Exp $
 
 TTRVER=                1.12
 DISTNAME=      Tiny-Tiny-RSS-${TTRVER}
@@ -13,7 +13,6 @@ COMMENT=      Tiny Tiny RSS is an open source
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
 
 .include "options.mk"
@@ -54,5 +53,5 @@ do-install:
        cd ${WRKSRC} && pax -rw -pmp * \
                ${DESTDIR}${PREFIX}/share/tt-rss
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc/lang/php
Next by Date: CVS commit: pkgsrc/www/php-http
Previous by Thread: CVS commit: pkgsrc/lang/php
Next by Thread: CVS commit: pkgsrc/www/php-http
Indexes:

Home | Main Index | Thread Index | Old Index