git: 0ac3a69555cd - main - */*: Remove merged or non-existent USE_PHP directives
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Apr 2023 18:10:51 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0ac3a69555cdc6ac1603f4ac7d6f85c5be19e3ea
commit 0ac3a69555cdc6ac1603f4ac7d6f85c5be19e3ea
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-16 16:10:47 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-16 18:09:23 +0000
*/*: Remove merged or non-existent USE_PHP directives
- Remove USE_PHP=hash which is available in default php installation of
all versions of php
* security/pear-Horde_Crypt_Blowfish: Remove OPTION MHASH
- Remove USE_PHP=json which is available in default php installation of
all versions of php
* devel/pear-PHPTAL: Remove OPTION JSON
* www/ilias: Remove OPTION SCORM2004
- Remove USE_PHP=mssql which is no longer available in php from php80
and later and has been replaced with sqlsrv module which is Windows
only
* www/codeigniter: Remove OPTION MSSQL
* www/moodle311: Remove OPTION MSSQL
* www/moodle39: Remove OPTION MSSQL
* www/moodle40: Remove OPTION MSSQL
* www/moodle41: Remove OPTION MSSQL
- Remove USE_PHP=openssl which is available in default php installation
of all versions of php
* databases/phpmyadmin: Remove OPTION OPENSSL
* databases/phpmyadmin5: Remove OPTION OPENSSL
* security/pear-Horde_Crypt_Blowfish: Remove OPTION OPENSSL
* www/nextcloud: Remove OPTION SSL
* www/owncloud: Remove OPTION SSL
- Remove USE_PHP=pcre which is available in default php installation of
all versions of php
* sysutils/racktables: Remove OPTION PCRE
- Remove USE_PHP=postgresql which should be USE_PHP=pgsql and update
following ports
* www/typo3-11
* www/typo3-12
- Remove USE_PHP=pdf which is no longer available as php module
* databases/phpmyadmin: Remove OPTION PDF
- Remove USE_PHP=spl which is available in default php installation of
all versions of php
- Remove USE_PHP=sqlsrv which was never imported into FreeBSD as that is
Windows only php module
* www/typo3-11: Remove OPTION SQLSRV
* www/typo3-12: Remove OPTION SQLSRV
- Bump where DEFAULT OPTIONS are affected
Sponsored by: Bounce Experts
Approved by: portmgr(blanket)
---
archivers/pear-File_Archive/Makefile | 2 +-
archivers/pecl-rar/Makefile | 3 +--
audio/ampache/Makefile | 2 +-
benchmarks/phoronix-test-suite/Makefile | 10 ++--------
comms/atslog/Makefile | 1 -
databases/adodb5/Makefile | 1 -
databases/dalmp/Makefile | 2 +-
databases/mantis/Makefile | 2 +-
databases/pear-Horde_Memcache/Makefile | 2 +-
databases/pecl-couchbase/Makefile | 1 -
databases/pecl-memcached/Makefile | 4 ++--
databases/pecl-mongodb/Makefile | 4 +---
databases/pecl-redis/Makefile | 4 ++--
databases/pgfouine/Makefile | 4 ++--
databases/phpminiadmin/Makefile | 2 +-
databases/phpmyadmin/Makefile | 15 +++++----------
databases/phpmyadmin5/Makefile | 13 +++++++------
databases/phppgadmin/Makefile | 2 +-
deskutils/moregroupware/Makefile | 2 +-
deskutils/phpicalendar/Makefile | 2 +-
devel/aphpbreakdown/Makefile | 2 +-
devel/arcanist-lib/Makefile | 2 +-
devel/deployer/Makefile | 2 +-
devel/flyspray/Makefile | 2 +-
devel/gitlist/Makefile | 2 +-
devel/pear-Horde_Autoloader_Cache/Makefile | 1 -
devel/pear-Horde_Cache/Makefile | 1 -
devel/pear-Horde_Prefs/Makefile | 1 -
devel/pear-Horde_Token/Makefile | 1 -
devel/pear-Net_Gearman/Makefile | 2 +-
devel/pear-PEAR_Info/Makefile | 1 -
devel/pear-PHPTAL/Makefile | 6 ++----
devel/pear-PHP_CompatInfo/Makefile | 2 +-
devel/pear-PHP_UML/Makefile | 2 +-
devel/pear-Validate_Finance_CreditCard/Makefile | 1 -
devel/pear-XML_Util/Makefile | 1 -
devel/pear/Makefile | 4 ++--
devel/pecl-ds/Makefile | 3 +--
devel/pecl-json_post/Makefile | 3 +--
devel/pecl-swoole/Makefile | 5 ++---
devel/phabricator/Makefile | 2 +-
devel/php-composer/Makefile | 2 +-
devel/php-composer2/Makefile | 2 +-
devel/phpunit10/Makefile | 2 +-
devel/phpunit8/Makefile | 2 +-
devel/phpunit9/Makefile | 2 +-
devel/websvn/Makefile | 2 +-
dns/dns-ui/Makefile | 2 +-
finance/frontaccounting/Makefile | 2 +-
finance/frontaccounting24/Makefile | 2 +-
finance/prestashop/Makefile | 2 +-
ftp/net2ftp/Makefile | 2 +-
mail/nocc/Makefile | 2 +-
mail/pear-Horde_Imap_Client/Makefile | 1 -
mail/phplist/Makefile | 2 +-
mail/postfixadmin/Makefile | 2 +-
mail/postfixadmin33/Makefile | 2 +-
mail/rainloop/Makefile | 2 +-
mail/roundcube/Makefile | 2 +-
mail/snappymail/Makefile | 2 +-
mail/squirrelmail/Makefile | 2 +-
math/pear-Math_BigInteger/Makefile | 1 -
misc/pear-Services_Weather/Makefile | 2 +-
multimedia/zoneminder/Makefile | 2 +-
net-mgmt/cacti/Makefile | 2 +-
net-mgmt/icingaweb2/Makefile | 4 ++--
net-mgmt/klg/Makefile | 2 +-
net-mgmt/librenms/Makefile | 4 ++--
net-mgmt/nagvis/Makefile | 2 +-
net-mgmt/nfsen/Makefile | 2 +-
net-mgmt/observium/Makefile | 2 +-
net-mgmt/ocsinventory-ocsreports/Makefile | 2 +-
net-mgmt/pandorafms_console/Makefile | 2 +-
net-mgmt/phpipam/Makefile | 4 ++--
net-mgmt/pnp/Makefile | 2 +-
net/pear-Horde_Kolab_Server/Makefile | 1 -
net/pear-Net_UserAgent_Mobile/Makefile | 1 -
net/pear-Services_Twitter/Makefile | 2 +-
net/phpldapadmin/Makefile | 2 +-
net/rtg/Makefile | 2 +-
net/self-service-password/Makefile | 2 +-
security/maia/Makefile | 2 +-
security/pear-Crypt_CHAP/Makefile | 2 +-
security/pear-File_SMBPasswd/Makefile | 1 -
security/pear-Horde_Auth/Makefile | 1 -
security/pear-Horde_Crypt/Makefile | 1 -
security/pear-Horde_Crypt_Blowfish/Makefile | 9 ---------
security/pear-Horde_Oauth/Makefile | 1 -
security/pear-Horde_Secret/Makefile | 2 --
security/pecl-scrypt/Makefile | 3 +--
security/snuffleupagus/Makefile | 4 ++--
shells/pear-PHP_Shell/Makefile | 2 +-
sysutils/froxlor/Makefile | 2 +-
sysutils/ldap-account-manager/Makefile | 4 ++--
sysutils/n98-magerun/Makefile | 2 +-
sysutils/pear-File/Makefile | 1 -
sysutils/pear-I18Nv2/Makefile | 2 +-
sysutils/racktables/Makefile | 6 ++----
www/baculum-common/Makefile | 2 +-
www/baikal/Makefile | 2 +-
www/bareos-webui/Makefile | 2 +-
www/bareos18-webui/Makefile | 2 +-
www/bareos19-webui/Makefile | 2 +-
www/bareos20-webui/Makefile | 2 +-
www/bareos21-webui/Makefile | 2 +-
www/bolt/Makefile | 2 +-
www/codeigniter/Makefile | 6 ++----
www/coppermine/Makefile | 2 +-
www/davical/Makefile | 2 +-
www/dokuwiki/Makefile | 2 +-
www/dolibarr/Makefile | 2 +-
www/dolibarr13/Makefile | 2 +-
www/dolibarr14/Makefile | 2 +-
www/dolibarr15/Makefile | 2 +-
www/dolibarr16/Makefile | 2 +-
www/drupal10/Makefile | 2 +-
www/drupal7/Makefile | 2 +-
www/drupal8/Makefile | 2 +-
www/drupal9/Makefile | 2 +-
www/drush/Makefile | 2 +-
www/e107/Makefile | 2 +-
www/elgg/Makefile | 4 ++--
www/fusionpbx/Makefile | 4 ++--
www/gallery2/Makefile | 2 +-
www/glpi/Makefile | 4 ++--
www/groupoffice/Makefile | 4 ++--
www/habari/Makefile | 2 +-
www/hiawatha-monitor/Makefile | 2 +-
www/ilias/Makefile | 5 ++---
www/itop/Makefile | 4 ++--
www/joomla3/Makefile | 2 +-
www/joomla4/Makefile | 2 +-
www/kanboard/Makefile | 4 ++--
www/librespeed/Makefile | 2 +-
www/limesurvey/Makefile | 2 +-
www/matomo/Makefile | 4 ++--
www/mediawiki135/Makefile | 4 ++--
www/mediawiki138/Makefile | 4 ++--
www/mediawiki139/Makefile | 4 ++--
www/moodle311/Makefile | 7 +++----
www/moodle39/Makefile | 7 +++----
www/moodle40/Makefile | 9 ++++-----
www/moodle41/Makefile | 9 ++++-----
www/mythplugin-mythweb/Makefile | 2 +-
www/nextcloud/Makefile | 11 +++++------
www/opencart/Makefile | 2 +-
www/orangehrm/Makefile | 2 +-
www/osticket/Makefile | 2 +-
www/owncloud/Makefile | 8 ++++----
www/pear-Horde_Service_Facebook/Makefile | 2 +-
www/pear-Services_Amazon_S3/Makefile | 3 +--
www/pear-Services_Delicious/Makefile | 1 -
www/pear-Services_ShortURL/Makefile | 2 +-
www/pear-twig/Makefile | 2 +-
www/pecl-http/Makefile | 4 ++--
www/pecl-solr/Makefile | 3 +--
www/pecl-yar/Makefile | 4 ++--
www/phalcon/Makefile | 4 ++--
www/phpbb3/Makefile | 2 +-
www/phpmyfaq/Makefile | 2 +-
www/phpsysinfo/Makefile | 2 +-
www/phpvirtualbox-legacy/Makefile | 2 +-
www/phpvirtualbox/Makefile | 2 +-
www/piwigo/Makefile | 4 ++--
www/privatebin/Makefile | 2 +-
www/rss-bridge/Makefile | 2 +-
www/sabredav/Makefile | 2 +-
www/samdruckerserver/Makefile | 2 +-
www/serendipity/Makefile | 2 +-
www/smarty/Makefile | 1 -
www/smarty2/Makefile | 1 -
www/smarty3/Makefile | 1 -
www/sqstat/Makefile | 2 +-
www/templatelite/Makefile | 1 -
www/thirtybees/Makefile | 2 +-
www/thundercache/Makefile | 2 +-
www/thundersnarf/Makefile | 2 +-
www/tikiwiki/Makefile | 2 +-
www/tivoka/Makefile | 2 +-
www/tt-rss/Makefile | 2 +-
www/typo3-11/Makefile | 10 ++++------
www/typo3-12/Makefile | 12 +++++-------
www/webtrees20/Makefile | 2 +-
www/webtrees21/Makefile | 2 +-
www/wordpress/Makefile | 4 ++--
www/yourls/Makefile | 2 +-
www/zend-framework/Makefile | 5 ++---
www/zenphoto/Makefile | 2 +-
188 files changed, 227 insertions(+), 298 deletions(-)
diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index 843cad967a33..3519e4754949 100644
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@@ -11,7 +11,7 @@ LICENSE= LGPL3
RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}MIME_Type>=0:mail/pear-MIME_Type@${PHP_FLAVOR}
USES= pear
-USE_PHP= bz2 pcre zlib
+USE_PHP= bz2 zlib
NO_ARCH= yes
diff --git a/archivers/pecl-rar/Makefile b/archivers/pecl-rar/Makefile
index e7c380eb5444..cf47a51b4001 100644
--- a/archivers/pecl-rar/Makefile
+++ b/archivers/pecl-rar/Makefile
@@ -12,8 +12,7 @@ LICENSE= PHP301
DEPRECATED= Requires php80 which is set to expire on 2023-11-26
EXPIRATION_DATE= 2023-12-31
-USES= compiler:c11 php:pecl
-USE_PHP= spl:build
+USES= compiler:c11 php:build,pecl
IGNORE_WITH_PHP= 81 82
CONFIGURE_ARGS= --enable-rar
diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile
index afa502269498..61e671212b91 100644
--- a/audio/ampache/Makefile
+++ b/audio/ampache/Makefile
@@ -13,7 +13,7 @@ WWW= https://ampache.org/
LICENSE= AGPLv3+
USES= cpe zip gettext php:flavors mysql
-USE_PHP= pdo pdo_mysql hash session json intl simplexml curl dom xml
+USE_PHP= pdo pdo_mysql session intl simplexml curl dom xml
CONFLICTS_INSTALL= ampache-php* # etc/periodic/daily/500.ampache-cron man/man1/ampache.1.gz
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 4a13952412b4..63d07224ef1f 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= sudo:security/sudo \
USES= php:cli,build,flavors python shebangfix
USE_GITHUB= yes
-USE_PHP= curl dom gd openssl pcntl posix simplexml zip zlib
+USE_PHP= curl dom gd pcntl posix simplexml zip zlib
NO_BUILD= yes
PORTDATA= *
@@ -48,12 +48,6 @@ X11_DESC= Install X11 icons and mimetypes
X11_USES= desktop-file-utils shared-mime-info
X11_CONFIGURE_OFF= WITHOUT_X11=yes
-.include <bsd.port.pre.mk>
-
-.if ${FLAVOR} != php80
-USE_PHP+= json
-.endif
-
post-patch:
@${SED} -i '' -e "s|/usr/local|${LOCALBASE}|g" \
${WRKSRC}/phoronix-test-suite \
@@ -72,4 +66,4 @@ post-patch:
do-install:
(cd ${WRKSRC} && ${CONFIGURE_ARGS} DESTDIR="${STAGEDIR}" ./install-sh ${PREFIX})
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile
index 132fc19a56c0..1e2a558b58f4 100644
--- a/comms/atslog/Makefile
+++ b/comms/atslog/Makefile
@@ -47,7 +47,6 @@ LIBWRAP_CONFIGURE_OFF= --disable-libwrap
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MWWW}
-USE_PHP= pcre
USES+= php:web
.if ${PORT_OPTIONS:MWWWGD}
USE_PHP+= gd
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 2423e7cd68a3..af05d3ccb44e 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -13,7 +13,6 @@ LICENSE_COMB= dual
USES= cpe php:flavors
CPE_VENDOR= ${PORTNAME}_project
-USE_PHP= pcre
USE_GITHUB= yes
GH_PROJECT= ADOdb
diff --git a/databases/dalmp/Makefile b/databases/dalmp/Makefile
index e00afee564e0..b73a5e3237d1 100644
--- a/databases/dalmp/Makefile
+++ b/databases/dalmp/Makefile
@@ -17,7 +17,7 @@ USES= php
NO_BUILD= yes
NO_ARCH= yes
-USE_PHP= pcre mysqli session memcache sqlite3 curl redis
+USE_PHP= mysqli session memcache sqlite3 curl redis
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/databases/mantis/Makefile b/databases/mantis/Makefile
index 7fa8ce06e469..466c346a3a5f 100644
--- a/databases/mantis/Makefile
+++ b/databases/mantis/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
USES= php:flavors
USE_GITHUB= nodefault
-USE_PHP= fileinfo filter hash json mbstring pcre session xml
+USE_PHP= fileinfo filter mbstring session xml
DATADIR= ${WWWDIR}
NO_ARCH= yes
diff --git a/databases/pear-Horde_Memcache/Makefile b/databases/pear-Horde_Memcache/Makefile
index c8c1038ee1b1..44b886b9a6ad 100644
--- a/databases/pear-Horde_Memcache/Makefile
+++ b/databases/pear-Horde_Memcache/Makefile
@@ -7,7 +7,7 @@ COMMENT= Horde Memcache API
WWW= https://pear.horde.org
USES= horde php
-USE_PHP= memcache hash
+USE_PHP= memcache
USE_HORDE_RUN= Horde_Exception
.include <bsd.port.mk>
diff --git a/databases/pecl-couchbase/Makefile b/databases/pecl-couchbase/Makefile
index 0f0adb1f2ea9..ec2524b9c987 100644
--- a/databases/pecl-couchbase/Makefile
+++ b/databases/pecl-couchbase/Makefile
@@ -13,6 +13,5 @@ LICENSE= APACHE20
BUILD_DEPENDS= cmake:devel/cmake-core
USES= compiler:c++17-lang php:build,pecl
-USE_PHP= json:build
.include <bsd.port.mk>
diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index 221ae373880c..a3552dadcd2e 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -12,8 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= libmemcached>=1.0.18:databases/libmemcached
LIB_DEPENDS= libmemcached.so:databases/libmemcached
-USES= php:pecl pkgconfig
-USE_PHP= json:build session:build
+USES= php:build,pecl pkgconfig
+USE_PHP= session:build
CONFIGURE_ARGS= --enable-memcached-json \
--enable-memcached-protocol \
diff --git a/databases/pecl-mongodb/Makefile b/databases/pecl-mongodb/Makefile
index d506d7711289..d2049015a33b 100644
--- a/databases/pecl-mongodb/Makefile
+++ b/databases/pecl-mongodb/Makefile
@@ -8,8 +8,6 @@ WWW= https://docs.mongodb.org/ecosystem/drivers/php/
LICENSE= APACHE20
-USES= gmake php:pecl ssl
-USE_PHP= spl:build
-CFLAGS+= -I${LOCALBASE}/include
+USES= gmake localbase php:build,pecl ssl
.include <bsd.port.mk>
diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile
index 3b9b50c93bac..59c9120a5630 100644
--- a/databases/pecl-redis/Makefile
+++ b/databases/pecl-redis/Makefile
@@ -9,8 +9,8 @@ WWW= https://pecl.php.net/package/redis
LICENSE= PHP301
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= php:pecl
-USE_PHP= hash:build json:build session:build
+USES= php:build,pecl
+USE_PHP= session:build
OPTIONS_DEFINE= IGBINARY
IGBINARY_DESC= Build with Igbinary serializer
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index 309c63790452..76980a3d820d 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -10,8 +10,8 @@ WWW= http://pgfouine.projects.postgresql.org/
USES+= php
-NO_BUILD= Yes
-USE_PHP= gd pcre
+NO_BUILD= yes
+USE_PHP= gd
OPTIONS_DEFINE= DOCS
diff --git a/databases/phpminiadmin/Makefile b/databases/phpminiadmin/Makefile
index 7a40be339371..d287f7cb6426 100644
--- a/databases/phpminiadmin/Makefile
+++ b/databases/phpminiadmin/Makefile
@@ -18,7 +18,7 @@ NO_WRKSUBDIR= yes
NO_BUILD= yes
USES= cpe php
CPE_VENDOR= ${PORTNAME}_project
-USE_PHP= mysqli pcre session
+USE_PHP= mysqli session
NO_ARCH= yes
PLIST_FILES= ${WWWDIR_REL}/phpminiadmin.php
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 4fa070cd4c9f..c522bda70303 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,5 +1,6 @@
PORTNAME= phpMyAdmin
DISTVERSION= 4.9.11
+PORTREVISION= 1
CATEGORIES= databases www
MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages
@@ -27,16 +28,16 @@ NO_BUILD= yes
# could, in principle, also use the PHP dbase extension, but it's not
# available for PHP >= 7.0 and of only minority interest.
-USE_PHP= ctype filter hash iconv json mysqli session spl xml
+USE_PHP= ctype filter iconv mysqli session xml
.endif
# Note: default settings will pull in X11 client support. If you don't
# want this, either turn off GD in the config dialog, or else turn off
# FONTCONFIG in the graphics/gd port options.
-OPTIONS_DEFINE= BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL \
+OPTIONS_DEFINE= BZ2 CURL GD GMP MBSTRING OPCACHE \
SODIUM ZIP ZLIB
-OPTIONS_DEFAULT= BZ2 GD MBSTRING OPENSSL ZIP ZLIB
+OPTIONS_DEFAULT= BZ2 GD MBSTRING ZIP ZLIB
BZ2_DESC= PHP bzip2 library support
CURL_DESC= PHP curl support
@@ -44,9 +45,7 @@ GD_DESC= PHP GD library support (requires X11)
GMP_DESC= PHP GMP library support
MBSTRING_DESC= PHP Multi-byte String support
OPCACHE_DESC= PHP Opcache support
-OPENSSL_DESC= PHP OpenSSL support
-PDF_DESC= PHP PDFlib support
-SODIUM_DESC= PHP libsodium support (only available for PHP >= 7.2)
+SODIUM_DESC= PHP libsodium support
ZIP_DESC= PHP Zip compression support
ZLIB_DESC= PHP ZLIB support
@@ -62,10 +61,6 @@ SUB_LIST+= PKGNAME=${PKGNAME} \
CFG_FILE=${WWWDIR}/${CFG_FILE}
SUB_FILES+= pkg-message
-.if ${FLAVOR} != php80
-OPTIONS_DEFINE+= PDF
-.endif
-
.if !defined(WITHOUT_PHP_DEPENDS)
.for opt in ${OPTIONS_DEFINE}
diff --git a/databases/phpmyadmin5/Makefile b/databases/phpmyadmin5/Makefile
index 0bb6d53ea821..fbf4f1dc15cc 100644
--- a/databases/phpmyadmin5/Makefile
+++ b/databases/phpmyadmin5/Makefile
@@ -1,5 +1,6 @@
PORTNAME= phpMyAdmin
DISTVERSION= 5.2.1
+PORTREVISION= 1
CATEGORIES= databases www
MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages
@@ -23,20 +24,21 @@ NO_BUILD= yes
# Note: composer.json files in the source list pcre as a required
# extension, but pcre is compiled into PHP as standard on FreeBSD.
-# spl, libsodium are only required in the bundled vendor code. PMA
+# The same goes for the spl library.
+# libsodium are only required in the bundled vendor code. PMA
# could, in principle, also use the PHP dbase extension, but it's not
# available for PHP >= 7.0 and of only minority interest.
-USE_PHP= ctype filter hash iconv json mysqli session spl xml xmlwriter
+USE_PHP= ctype filter iconv mysqli session xml xmlwriter
.endif
# Note: default settings will pull in X11 client support. If you don't
# want this, either turn off GD in the config dialog, or else turn off
# FONTCONFIG in the graphics/gd port options.
-OPTIONS_DEFINE= BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL \
+OPTIONS_DEFINE= BZ2 CURL GD GMP MBSTRING OPCACHE \
SODIUM ZIP ZLIB
-OPTIONS_DEFAULT= BZ2 GD MBSTRING OPENSSL ZIP ZLIB
+OPTIONS_DEFAULT= BZ2 GD MBSTRING ZIP ZLIB
BZ2_DESC= PHP bzip2 library support
CURL_DESC= PHP curl support
@@ -44,9 +46,8 @@ GD_DESC= PHP GD library support (requires X11)
GMP_DESC= PHP GMP library support
MBSTRING_DESC= PHP Multi-byte String support
OPCACHE_DESC= PHP Opcache support
-OPENSSL_DESC= PHP OpenSSL support
PDF_DESC= PHP PDFlib support
-SODIUM_DESC= PHP libsodium support (only available for PHP >= 7.2)
+SODIUM_DESC= PHP libsodium support
ZIP_DESC= PHP Zip compression support
ZLIB_DESC= PHP ZLIB support
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index ea44d6341c22..c8106e8d8748 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -19,7 +19,7 @@ GH_ACCOUNT= ReimuHakurei
WRKSRC= ${WRKDIR}/phpPgAdmin-${DISTVERSION}${DISTVERSIONSUFFIX}
.if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP= pgsql pcre session mbstring
+USE_PHP= pgsql session mbstring
.endif
CPE_VENDOR= phppgadmin_project
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
index f9f29375f8f5..a0ce79988bdb 100644
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -12,7 +12,7 @@ WWW= http://moregroupware.sourceforge.net/
USES= gettext php:mod
WANT_PGSQL= server
# php extensions
-USE_PHP= curl gd pcre session xml
+USE_PHP= curl gd session xml
SHAREOWN= ${WWWOWN}
SHAREGRP= ${WWWGRP}
diff --git a/deskutils/phpicalendar/Makefile b/deskutils/phpicalendar/Makefile
index 1b435f3e6c3c..f1add7c4f054 100644
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe php tar:bz2
NO_BUILD= yes
NO_ARCH= yes
-USE_PHP= session pcre
+USE_PHP= session
PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/aphpbreakdown/Makefile b/devel/aphpbreakdown/Makefile
index 4ad20cbd904d..e770343b5672 100644
--- a/devel/aphpbreakdown/Makefile
+++ b/devel/aphpbreakdown/Makefile
@@ -12,7 +12,7 @@ WWW= https://gitlab.code-mesa.com/code-mesa/aphpbreakdown/
LICENSE= BSD2CLAUSE
USES= php:flavors
-USE_PHP= tokenizer phar hash
+USE_PHP= tokenizer phar
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile
index 35298455a620..ca0fcf463952 100644
--- a/devel/arcanist-lib/Makefile
+++ b/devel/arcanist-lib/Makefile
@@ -26,7 +26,7 @@ SHEBANG_FILES= bin/arc \
support/xhpast/*.php \
support/xhpast/bin/*.php
-USE_PHP= curl dom hash json simplexml zlib
+USE_PHP= curl dom simplexml zlib
USE_GITHUB= yes
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/deployer/Makefile b/devel/deployer/Makefile
index cf9b1a3720d0..0b9e24daa307 100644
--- a/devel/deployer/Makefile
+++ b/devel/deployer/Makefile
@@ -14,7 +14,7 @@ WWW= https://deployer.org/
LICENSE= MIT
USES= php:flavors
-USE_PHP= curl iconv json openssl pcntl phar posix zlib
+USE_PHP= curl iconv pcntl phar posix zlib
CONFLICTS_INSTALL= php*-deployer
diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index cf158bea3217..ac914b5a6817 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -10,7 +10,7 @@ WWW= https://www.flyspray.org/
RUN_DEPENDS= ${LOCALBASE}/share/adodb/adodb.inc.php:databases/adodb5
-USE_PHP= pcre session zlib xml gd
+USE_PHP= session zlib xml gd
USES= cpe dos2unix php:web zip
NO_BUILD= yes
diff --git a/devel/gitlist/Makefile b/devel/gitlist/Makefile
index 77e5995eea7c..9cfb6a3ce5ec 100644
--- a/devel/gitlist/Makefile
+++ b/devel/gitlist/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= git:devel/git
NO_BUILD= yes
USES= cpe php:web zip
-USE_PHP= ctype hash json simplexml
+USE_PHP= ctype simplexml
PLIST= ${WRKDIR}/plist
NO_WRKSUBDIR= yes
diff --git a/devel/pear-Horde_Autoloader_Cache/Makefile b/devel/pear-Horde_Autoloader_Cache/Makefile
index 755bec30622c..84379c691e9f 100644
--- a/devel/pear-Horde_Autoloader_Cache/Makefile
+++ b/devel/pear-Horde_Autoloader_Cache/Makefile
@@ -8,7 +8,6 @@ WWW= https://pear.horde.org
USES= horde php cpe
USE_HORDE_RUN= Horde_Autoloader
-USE_PHP= json
CONFLICTS_INSTALL= php*-pear-horde-Horde_Autoloader_Cache
diff --git a/devel/pear-Horde_Cache/Makefile b/devel/pear-Horde_Cache/Makefile
index 1a22090fa8fd..830d4eac2045 100644
--- a/devel/pear-Horde_Cache/Makefile
+++ b/devel/pear-Horde_Cache/Makefile
@@ -11,6 +11,5 @@ USE_HORDE_RUN= Horde_Compress_Fast \
Horde_Exception \
Horde_HashTable \
Horde_Util
-USE_PHP= hash
.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Prefs/Makefile b/devel/pear-Horde_Prefs/Makefile
index 6ff0886866cb..a4ed3be9a4cd 100644
--- a/devel/pear-Horde_Prefs/Makefile
+++ b/devel/pear-Horde_Prefs/Makefile
@@ -12,7 +12,6 @@ USE_HORDE_RUN= Horde_Exception \
Horde_Mime \
Horde_Translation \
Horde_Util
-USE_PHP= json
CONFLICTS_INSTALL= php*-pear-horde-Horde_Prefs
diff --git a/devel/pear-Horde_Token/Makefile b/devel/pear-Horde_Token/Makefile
index 361c106b86f2..0192d3cee6e0 100644
--- a/devel/pear-Horde_Token/Makefile
+++ b/devel/pear-Horde_Token/Makefile
@@ -11,6 +11,5 @@ USE_HORDE_RUN= Horde_Exception \
Horde_Translation \
Horde_Url \
Horde_Util
-USE_PHP= hash
.include <bsd.port.mk>
diff --git a/devel/pear-Net_Gearman/Makefile b/devel/pear-Net_Gearman/Makefile
index a5236ab1e5d5..22ce9cecf350 100644
--- a/devel/pear-Net_Gearman/Makefile
+++ b/devel/pear-Net_Gearman/Makefile
@@ -10,7 +10,7 @@ WWW= https://pear.php.net/package/Net_Gearman
LICENSE= BSD2CLAUSE
USES= pear
-USE_PHP= json mbstring sockets
+USE_PHP= mbstring sockets
NO_ARCH= yes
diff --git a/devel/pear-PEAR_Info/Makefile b/devel/pear-PEAR_Info/Makefile
index dacb9ed8be98..728aae393447 100644
--- a/devel/pear-PEAR_Info/Makefile
+++ b/devel/pear-PEAR_Info/Makefile
@@ -12,7 +12,6 @@ LICENSE= PHP301
RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_Getargs>=1.3.3:devel/pear-Console_Getargs@${PHP_FLAVOR}
USES= pear
-USE_PHP= pcre
NO_ARCH= yes
diff --git a/devel/pear-PHPTAL/Makefile b/devel/pear-PHPTAL/Makefile
index 55d454af0d04..ea588b26344f 100644
--- a/devel/pear-PHPTAL/Makefile
+++ b/devel/pear-PHPTAL/Makefile
@@ -12,17 +12,15 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pear php
-USE_PHP= ctype hash
+USE_PHP= ctype
NO_ARCH= yes
-OPTIONS_DEFINE= GETTEXT JSON SIMPLEXML
+OPTIONS_DEFINE= GETTEXT SIMPLEXML
GETTEXT_DESC= Enable GetText support
-JSON_DESC= Enable JSON support
SIMPLEXML_DESC= Enable SimpleXML support
GETTEXT_USE= PHP=gettext
-JSON_USE= PHP=json
SIMPLEXML_USE= PHP=simplexml
.include <bsd.port.mk>
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index 593c60ccd3b1..a660eb195e76 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -13,7 +13,7 @@ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_Getargs>=1.3.3:devel/pear-Console_Geta
${PEAR_PKGNAMEPREFIX}File_Find>=1.3.0:sysutils/pear-File_Find@${PHP_FLAVOR}
USES= dos2unix pear
-USE_PHP= pcre tokenizer
+USE_PHP= tokenizer
NO_ARCH= yes
diff --git a/devel/pear-PHP_UML/Makefile b/devel/pear-PHP_UML/Makefile
index 68d7db998e1a..659d5eadd66e 100644
--- a/devel/pear-PHP_UML/Makefile
+++ b/devel/pear-PHP_UML/Makefile
@@ -11,7 +11,7 @@ LICENSE= LGPL3
RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=0:devel/pear-Console_CommandLine@${PHP_FLAVOR}
USES= pear
-USE_PHP= spl xsl
+USE_PHP= xsl
NO_ARCH= yes
diff --git a/devel/pear-Validate_Finance_CreditCard/Makefile b/devel/pear-Validate_Finance_CreditCard/Makefile
index 56ef764c13b9..95d986e31f92 100644
--- a/devel/pear-Validate_Finance_CreditCard/Makefile
+++ b/devel/pear-Validate_Finance_CreditCard/Makefile
@@ -10,7 +10,6 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= pear
-USE_PHP= pcre
NO_ARCH= yes
diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index ebc2ed304470..b1b7359cc49a 100644
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@@ -9,7 +9,6 @@ WWW= https://pear.php.net/package/XML_Util
LICENSE= BSD2CLAUSE
USES= pear
-USE_PHP= pcre
NO_ARCH= yes
diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index 77eb05998219..4ec6f3d7dcfd 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -12,12 +12,12 @@ WWW= https://pear.php.net/
LICENSE= PHP301
-USES= cpe php:cli,flavors tar:xz
+USES= cpe php:build,cli,flavors tar:xz
CPE_VENDOR= php
NO_BUILD= yes
NO_ARCH= yes
-USE_PHP= pcre:build xml:build zlib:build
+USE_PHP= xml:build zlib:build
PEARDIR= ${PREFIX}/share/pear
diff --git a/devel/pecl-ds/Makefile b/devel/pecl-ds/Makefile
index 10bf061750e9..986ef4844e92 100644
--- a/devel/pecl-ds/Makefile
+++ b/devel/pecl-ds/Makefile
@@ -9,7 +9,6 @@ WWW= https://pecl.php.net/package/ds
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= localbase php:pecl
-USE_PHP= json:build
+USES= localbase php:build,pecl
.include <bsd.port.mk>
diff --git a/devel/pecl-json_post/Makefile b/devel/pecl-json_post/Makefile
index 4bf282347470..b38d7a27c1f0 100644
--- a/devel/pecl-json_post/Makefile
+++ b/devel/pecl-json_post/Makefile
@@ -9,7 +9,6 @@ WWW= https://pecl.php.net/package/json_post
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= php:pecl
-USE_PHP= json:build
+USES= php:build,pecl
.include <bsd.port.mk>
diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile
index 1779e751ede3..e452fa6ad865 100644
--- a/devel/pecl-swoole/Makefile
+++ b/devel/pecl-swoole/Makefile
@@ -9,8 +9,7 @@ WWW= https://pecl.php.net/package/swoole
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c11 localbase:ldflags php:pecl ssl
-USE_PHP= hash:build pcre
+USES= compiler:c11 localbase:ldflags php:build,pecl ssl
CONFIGURE_ARGS+= --enable-mysqlnd
@@ -26,7 +25,7 @@ CURL_LIB_DEPENDS= libcurl.so:ftp/curl
CURL_CONFIGURE_ON= --enable-swoole-curl
CURL_USE= PHP=curl
JSON_CONFIGURE_ON= --enable-swoole-json
-JSON_USE= PHP=json:build
+JSON_USES= php:build
PGSQL_CONFIGURE_ON= --enable-swoole-pgsql
PGSQL_USES= pgsql
BROTLI_CONFIGURE_ON= --enable-brotli
diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 4a8b304777f5..7b5487bf4521 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -40,7 +40,7 @@ SHEBANG_FILES= resources/timezones/*.php \
scripts/util/*.php \
support/aphlict/server/*.php
-USE_PHP= ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
+USE_PHP= ctype curl fileinfo filter iconv mbstring mysqli \
pcntl posix zip
OPTIONS_DEFINE= GD OPCACHE
diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index e7f47cb427b3..c5046147682f 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
USES= cpe php:flavors
CPE_VENDOR= getcomposer
-USE_PHP= ctype filter intl json mbstring openssl phar
+USE_PHP= ctype filter intl mbstring phar
CONFLICTS_INSTALL= php*-composer php*-composer2
diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile
index c40fe280fb97..2e748fe4962b 100644
--- a/devel/php-composer2/Makefile
+++ b/devel/php-composer2/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
USES= cpe php:flavors
CPE_VENDOR= getcomposer
-USE_PHP= ctype filter intl json mbstring openssl phar
+USE_PHP= ctype filter intl mbstring phar
CONFLICTS_INSTALL= php*-composer php*-composer2
diff --git a/devel/phpunit10/Makefile b/devel/phpunit10/Makefile
index 256430dca733..1e35c7c287eb 100644
--- a/devel/phpunit10/Makefile
+++ b/devel/phpunit10/Makefile
@@ -13,7 +13,7 @@ WWW= https://phpunit.de/ \
LICENSE= BSD3CLAUSE
USES= cpe php:flavors
-USE_PHP= dom json pcre phar spl
+USE_PHP= dom phar
IGNORE_WITH_PHP=80
NO_ARCH= yes
diff --git a/devel/phpunit8/Makefile b/devel/phpunit8/Makefile
index e3a5fc17e146..9a93b99bd0d6 100644
--- a/devel/phpunit8/Makefile
+++ b/devel/phpunit8/Makefile
@@ -15,7 +15,7 @@ CONFLICTS_INSTALL= phpunit7
USES= cpe php:flavors
CPE_VENDOR= phpunit_project
-USE_PHP= dom json spl pcre phar
+USE_PHP= dom phar
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/phpunit9/Makefile b/devel/phpunit9/Makefile
index ec5a8802a1f4..cd0a1597a620 100644
--- a/devel/phpunit9/Makefile
+++ b/devel/phpunit9/Makefile
@@ -13,7 +13,7 @@ WWW= https://phpunit.de/ \
LICENSE= BSD3CLAUSE
USES= cpe php:flavors
-USE_PHP= dom json pcre phar spl
+USE_PHP= dom phar
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/websvn/Makefile b/devel/websvn/Makefile
index 68c4092d6b37..d36310ea46d0 100644
--- a/devel/websvn/Makefile
+++ b/devel/websvn/Makefile
@@ -17,7 +17,7 @@ USES= php:web,flavors cpe
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}php
-USE_PHP= iconv pcre xml mbstring zlib dom
+USE_PHP= iconv xml mbstring zlib dom
NO_ARCH= yes
NO_BUILD= yes
diff --git a/dns/dns-ui/Makefile b/dns/dns-ui/Makefile
index 43cd5fbc18f0..ab4c160fd330 100644
--- a/dns/dns-ui/Makefile
+++ b/dns/dns-ui/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= pgsql php:cli
USE_GITHUB= yes
GH_ACCOUNT= operasoftware
-USE_PHP= curl intl json ldap mbstring pdo_pgsql
+USE_PHP= curl intl ldap mbstring pdo_pgsql
NO_BUILD= yes
SUB_FILES= pkg-message
diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile
index ce2215df8699..1e9c4765ccc2 100644
*** 2102 LINES SKIPPED ***