pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Switch to use lang/php/json.mk.
details: https://anonhg.NetBSD.org/pkgsrc/rev/48bb4eaa6094
branches: trunk
changeset: 448327:48bb4eaa6094
user: taca <taca%pkgsrc.org@localhost>
date: Sun Mar 07 13:21:56 2021 +0000
description:
Switch to use lang/php/json.mk.
diffstat:
benchmarks/phoronix-test-suite/Makefile | 6 ++----
databases/php-mongodb/Makefile | 5 ++---
databases/phpmyadmin/Makefile | 5 ++---
devel/arcanist/Makefile | 6 ++----
devel/mantis/Makefile | 6 ++----
devel/php-composer/Makefile | 5 ++---
mail/roundcube/Makefile | 5 ++---
net/cacti/Makefile | 5 ++---
net/icingaweb2/Makefile | 5 ++---
net/php-baikal/Makefile | 5 ++---
sysutils/zabbix-frontend/Makefile | 5 ++---
sysutils/zabbix50-frontend/Makefile | 5 ++---
www/mediawiki/Makefile | 5 ++---
www/php-nextcloud/Makefile | 5 ++---
www/php-owncloud/Makefile | 6 ++----
www/php-soycms/Makefile | 5 ++---
www/php-tt-rss/Makefile | 5 ++---
17 files changed, 34 insertions(+), 55 deletions(-)
diffs (truncated from 420 to 300 lines):
diff -r b05efb02562e -r 48bb4eaa6094 benchmarks/phoronix-test-suite/Makefile
--- a/benchmarks/phoronix-test-suite/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/benchmarks/phoronix-test-suite/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
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"
diff -r b05efb02562e -r 48bb4eaa6094 databases/php-mongodb/Makefile
--- a/databases/php-mongodb/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/databases/php-mongodb/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
.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"
diff -r b05efb02562e -r 48bb4eaa6094 databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/databases/phpmyadmin/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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}-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 @@
${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"
diff -r b05efb02562e -r 48bb4eaa6094 devel/arcanist/Makefile
--- a/devel/arcanist/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/devel/arcanist/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
${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"
diff -r b05efb02562e -r 48bb4eaa6094 devel/mantis/Makefile
--- a/devel/mantis/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/devel/mantis/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
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"
diff -r b05efb02562e -r 48bb4eaa6094 devel/php-composer/Makefile
--- a/devel/php-composer/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/devel/php-composer/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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_FILES.fix-paths= composer
SUBST_VARS.fix-paths= PREFIX
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b05efb02562e -r 48bb4eaa6094 mail/roundcube/Makefile
--- a/mail/roundcube/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/mail/roundcube/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
${DESTDIR}${PREFIX}/${EGDIR}/defaults.inc.php
.include "Makefile.common"
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b05efb02562e -r 48bb4eaa6094 net/cacti/Makefile
--- a/net/cacti/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/net/cacti/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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+= ${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}
diff -r b05efb02562e -r 48bb4eaa6094 net/icingaweb2/Makefile
--- a/net/icingaweb2/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/net/icingaweb2/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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}-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 @@
GENERATE_PLIST+= printf "${EGDIR:S.${PREFIX}/..}/%s\n" ${CONFS};
+.include "../../lang/php/json.mk"
.include "../../mk/bsd.pkg.mk"
-.include "../../lang/php/phpversion.mk"
diff -r b05efb02562e -r 48bb4eaa6094 net/php-baikal/Makefile
--- a/net/php-baikal/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/net/php-baikal/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
cd ${WRKSRC} && pax -rw -pmp * \
${DESTDIR}${PREFIX}/${BAIKALDIR}
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b05efb02562e -r 48bb4eaa6094 sysutils/zabbix-frontend/Makefile
--- a/sysutils/zabbix-frontend/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/sysutils/zabbix-frontend/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
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"
diff -r b05efb02562e -r 48bb4eaa6094 sysutils/zabbix50-frontend/Makefile
--- a/sysutils/zabbix50-frontend/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/sysutils/zabbix50-frontend/Makefile Sun Mar 07 13:21:56 2021 +0000
@@ -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 @@
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 @@
${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"
diff -r b05efb02562e -r 48bb4eaa6094 www/mediawiki/Makefile
--- a/www/mediawiki/Makefile Sun Mar 07 13:20:56 2021 +0000
+++ b/www/mediawiki/Makefile Sun Mar 07 13:21:56 2021 +0000
Home |
Main Index |
Thread Index |
Old Index