svn commit: r463917 - in head: . Mk/Uses archivers/pear-File_Archive archivers/pear-Horde_Compress archivers/pear-Horde_Compress_Fast archivers/pear-Horde_Pack archivers/php-horde_lz4 archivers/php...
Mathieu Arnold
mat at FreeBSD.org
Thu Mar 8 19:48:46 UTC 2018
Author: mat
Date: Thu Mar 8 19:48:41 2018
New Revision: 463917
URL: https://svnweb.freebsd.org/changeset/ports/463917
Log:
Introduce PHP flavors.
Ports using USES=php:phpize, php:ext, php:zend, and php:pecl are now
flavored. They will automatically get flavors (php56, php70, php71, php72)
depending of the versions they support (set with IGNORE_WITH_PHP). As a
consequence, ports using USES=pear and USES=horde are also flavored.
PR: 226242
Submitted by: mat
Exp-run by: antoine
Approved by: portmgr
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D14208
Added:
head/databases/php-memcache/
- copied from r463916, head/databases/php70-memcache/
head/databases/php-memcached/
- copied from r463916, head/databases/php70-memcached/
head/ftp/php-fastdfs/
- copied from r463916, head/ftp/php56-fastdfs/
head/www/unit-php/
- copied from r463916, head/www/unit-php56/
Deleted:
head/databases/php70-memcache/
head/databases/php70-memcached/
head/databases/php71-memcache/
head/databases/php72-memcache/
head/ftp/php56-fastdfs/
head/ftp/php70-fastdfs/
head/ftp/php71-fastdfs/
head/ftp/php72-fastdfs/
head/www/unit-php56/
head/www/unit-php70/
head/www/unit-php71/
head/www/unit-php72/
Modified:
head/CHANGES
head/MOVED
head/Mk/Uses/horde.mk
head/Mk/Uses/pear.mk
head/Mk/Uses/php.mk
head/UPDATING
head/archivers/pear-File_Archive/Makefile
head/archivers/pear-Horde_Compress/Makefile
head/archivers/pear-Horde_Compress_Fast/Makefile
head/archivers/pear-Horde_Pack/Makefile
head/archivers/php-horde_lz4/Makefile
head/archivers/php-snappy/Makefile
head/chinese/php-opencc/Makefile
head/chinese/phpbb-tw/Makefile
head/converters/php5-bsdconv/Makefile
head/databases/Makefile
head/databases/pear-DB_DataObject/Makefile
head/databases/pear-DB_DataObject_FormBuilder/Makefile
head/databases/pear-DB_Pager/Makefile
head/databases/pear-DB_QueryTool/Makefile
head/databases/pear-DB_Sqlite_Tools/Makefile
head/databases/pear-DB_Table/Makefile
head/databases/pear-DB_ldap/Makefile
head/databases/pear-DB_ldap2/Makefile
head/databases/pear-DoctrineCommon/Makefile
head/databases/pear-DoctrineDBAL/Makefile
head/databases/pear-DoctrineORM/Makefile
head/databases/pear-Horde_Db/Makefile
head/databases/pear-Horde_HashTable/Makefile
head/databases/pear-Horde_Mongo/Makefile
head/databases/pear-MDB/Makefile
head/databases/pear-MDB2_Driver_mysql/Makefile
head/databases/pear-MDB2_Driver_mysqli/Makefile
head/databases/pear-MDB2_Driver_pgsql/Makefile
head/databases/pear-MDB2_Schema/Makefile
head/databases/pear-MDB_QueryTool/Makefile
head/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
head/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
head/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
head/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
head/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
head/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
head/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
head/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
head/databases/pear-XML_Query2XML/Makefile
head/databases/pecl-memcached2/Makefile
head/databases/pecl-rrd1/Makefile
head/databases/php-mdcached/Makefile
head/databases/php-memcache/Makefile
head/databases/php-memcached/Makefile
head/databases/php5-pdo_cassandra/Makefile
head/databases/php5-tarantool/Makefile
head/databases/php7-tarantool/Makefile
head/deskutils/egroupware/Makefile
head/deskutils/horde-groupware/Makefile
head/deskutils/horde-kronolith/Makefile
head/deskutils/horde-mnemo/Makefile
head/deskutils/horde-nag/Makefile
head/devel/gitphp/Makefile
head/devel/horde-content/Makefile
head/devel/horde-timeobjects/Makefile
head/devel/horde-whups/Makefile
head/devel/pear-Config/Makefile
head/devel/pear-Date_Holidays/Makefile
head/devel/pear-Date_Holidays_Austria/Makefile
head/devel/pear-Date_Holidays_Brazil/Makefile
head/devel/pear-Date_Holidays_Denmark/Makefile
head/devel/pear-Date_Holidays_Discordian/Makefile
head/devel/pear-Date_Holidays_EnglandWales/Makefile
head/devel/pear-Date_Holidays_Germany/Makefile
head/devel/pear-Date_Holidays_Iceland/Makefile
head/devel/pear-Date_Holidays_Ireland/Makefile
head/devel/pear-Date_Holidays_Italy/Makefile
head/devel/pear-Date_Holidays_Japan/Makefile
head/devel/pear-Date_Holidays_Netherlands/Makefile
head/devel/pear-Date_Holidays_Norway/Makefile
head/devel/pear-Date_Holidays_PHPdotNet/Makefile
head/devel/pear-Date_Holidays_Romania/Makefile
head/devel/pear-Date_Holidays_Slovenia/Makefile
head/devel/pear-Date_Holidays_Sweden/Makefile
head/devel/pear-Date_Holidays_UNO/Makefile
head/devel/pear-Date_Holidays_USA/Makefile
head/devel/pear-Date_Holidays_Ukraine/Makefile
head/devel/pear-FSM/Makefile
head/devel/pear-File_Iterator/Makefile
head/devel/pear-HTML_BBCodeParser/Makefile
head/devel/pear-HTML_CSS/Makefile
head/devel/pear-HTML_Page2/Makefile
head/devel/pear-HTML_QuickForm/Makefile
head/devel/pear-HTML_QuickForm2/Makefile
head/devel/pear-HTML_QuickForm_Controller/Makefile
head/devel/pear-HTML_QuickForm_Livesearch/Makefile
head/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
head/devel/pear-HTML_QuickForm_SelectFilter/Makefile
head/devel/pear-HTML_QuickForm_advmultiselect/Makefile
head/devel/pear-HTML_Select/Makefile
head/devel/pear-HTML_Select_Common/Makefile
head/devel/pear-HTML_Table/Makefile
head/devel/pear-HTML_Template_Flexy/Makefile
head/devel/pear-Horde_Cache/Makefile
head/devel/pear-Horde_Core/Makefile
head/devel/pear-Horde_Nls/Makefile
head/devel/pear-Horde_Queue/Makefile
head/devel/pear-I18N/Makefile
head/devel/pear-Net_Gearman/Makefile
head/devel/pear-PEAR_Info/Makefile
head/devel/pear-PEAR_PackageFileManager/Makefile
head/devel/pear-PEAR_PackageFileManager2/Makefile
head/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
head/devel/pear-PHPUnit_MockObject/Makefile
head/devel/pear-PHP_Beautifier/Makefile
head/devel/pear-PHP_CodeBrowser/Makefile
head/devel/pear-PHP_CodeCoverage/Makefile
head/devel/pear-PHP_CompatInfo/Makefile
head/devel/pear-PHP_Depend/Makefile
head/devel/pear-PHP_PMD/Makefile
head/devel/pear-PHP_Timer/Makefile
head/devel/pear-PHP_TokenStream/Makefile
head/devel/pear-PHP_UML/Makefile
head/devel/pear-PhpDocumentor/Makefile
head/devel/pear-Pirum/Makefile
head/devel/pear-SebastianBergmann_FinderFacade/Makefile
head/devel/pear-SebastianBergmann_Git/Makefile
head/devel/pear-SebastianBergmann_PHPCPD/Makefile
head/devel/pear-SebastianBergmann_PHPLOC/Makefile
head/devel/pear-SebastianBergmann_Version/Makefile
head/devel/pear-Structures_DataGrid/Makefile
head/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
head/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
head/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
head/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
head/devel/pear-Symfony_Component_Console/Makefile
head/devel/pear-Symfony_Component_Finder/Makefile
head/devel/pear-TheSeer_DirectoryScanner/Makefile
head/devel/pear-TheSeer_fDOMDocument/Makefile
head/devel/pear-TheSeer_fXSL/Makefile
head/devel/pear-TheSeer_phpDox/Makefile
head/devel/pear-VFS/Makefile
head/devel/pear-Validate/Makefile
head/devel/pear-Validate_Finance/Makefile
head/devel/pear-Validate_US/Makefile
head/devel/pear-VersionControl_SVN/Makefile
head/devel/pear-XML_NITF/Makefile
head/devel/pear-XML_RSS/Makefile
head/devel/pear-XML_Serializer/Makefile
head/devel/pear-XML_Transformer/Makefile
head/devel/pear-XML_Tree/Makefile
head/devel/pear-channel-doctrine/Makefile
head/devel/pear-channel-ezc/Makefile
head/devel/pear-channel-horde/Makefile
head/devel/pear-channel-htmlpurifier.org/Makefile
head/devel/pear-channel-openpear/Makefile
head/devel/pear-channel-pdepend/Makefile
head/devel/pear-channel-phing/Makefile
head/devel/pear-channel-phpdoc/Makefile
head/devel/pear-channel-phpmd/Makefile
head/devel/pear-channel-phpunit/Makefile
head/devel/pear-channel-pirum/Makefile
head/devel/pear-channel-symfony/Makefile
head/devel/pear-channel-symfony2/Makefile
head/devel/pear-channel-theseer/Makefile
head/devel/pear-channel-twig/Makefile
head/devel/pear-ezc_Base/Makefile
head/devel/pear-ezc_ConsoleTools/Makefile
head/devel/pear-htmlpurifier/Makefile
head/devel/pear-pdepend-staticReflection/Makefile
head/devel/pear-phing/Makefile
head/devel/pear/Makefile
head/devel/pear/bsd.pear.channel.mk
head/devel/pecl-APCu4/Makefile
head/devel/pecl-grpc/Makefile
head/devel/pecl-jsmin2/Makefile
head/devel/pecl-msgpack0/Makefile
head/devel/pecl-propro2/Makefile
head/devel/pecl-raphf2/Makefile
head/devel/pecl-weakref2/Makefile
head/devel/pecl-yac/Makefile
head/devel/phabricator/Makefile
head/devel/php-jq/Makefile
head/devel/php-maxminddb/Makefile
head/devel/php-memoize/Makefile
head/devel/php-scalar_objects/Makefile
head/devel/php-uprofiler/Makefile
head/devel/php5-blitz-devel/Makefile
head/devel/php5-blitz/Makefile
head/devel/php5-dav/Makefile
head/devel/php5-ice/Makefile
head/devel/php5-pinba/Makefile
head/devel/php5-thrift/Makefile
head/devel/phpbt/Makefile
head/devel/phpunit/Makefile
head/dns/pear-File_DNS/Makefile
head/finance/php-tclink/Makefile
head/ftp/Makefile
head/ftp/horde-gollem/Makefile
head/ftp/php-fastdfs/Makefile
head/graphics/pear-Horde_Image/Makefile
head/graphics/pear-Image_Barcode/Makefile
head/graphics/pear-Image_Canvas/Makefile
head/graphics/pear-Image_Graph/Makefile
head/graphics/pecl-qrencode/Makefile
head/graphics/pecl-qrencode/pkg-descr
head/graphics/php-facedetect/Makefile
head/graphics/php-geos/Makefile
head/graphics/php-libpuzzle/Makefile
head/graphics/php-magickwand/Makefile
head/graphics/php5-ffmpeg/Makefile
head/japanese/php5-mecab/Makefile
head/lang/php56/Makefile.ext
head/lang/php70/Makefile.ext
head/lang/php71/Makefile.ext
head/lang/php72/Makefile.ext
head/mail/horde-imp/Makefile
head/mail/horde-ingo/Makefile
head/mail/horde-turba/Makefile
head/mail/horde-webmail/Makefile
head/mail/pear-Horde_Imap_Client/Makefile
head/mail/pear-Horde_Mail/Makefile
head/mail/pear-Horde_Mail_Autoconfig/Makefile
head/mail/pear-Horde_Mapi/Makefile
head/mail/pear-Horde_Smtp/Makefile
head/mail/pear-MIME_Type/Makefile
head/mail/pear-Mail/Makefile
head/mail/pear-Mail_Queue/Makefile
head/mail/pear-Mail_mimeDecode/Makefile
head/mail/pear-Net_Cyrus/Makefile
head/mail/pear-Net_IMAP/Makefile
head/mail/pear-Net_LMTP/Makefile
head/mail/pecl-mailparse2/Makefile
head/mail/phplist/Makefile
head/mail/squirrelmail-change_sqlpass-plugin/Makefile
head/mail/squirrelmail-sasql-plugin/Makefile
head/math/pecl-bitset2/Makefile
head/math/pecl-stats2/Makefile
head/misc/pear-Services_Weather/Makefile
head/multimedia/php-pHash/Makefile
head/multimedia/zoneminder/Makefile
head/net-im/pecl-stomp2/Makefile
head/net-mgmt/icingaweb2/Makefile
head/net-mgmt/klg/Makefile
head/net-mgmt/librenms/Makefile
head/net-mgmt/nagiosql/Makefile
head/net-mgmt/observium/Makefile
head/net-mgmt/phpipam/Makefile
head/net-mgmt/phpweathermap/Makefile
head/net/pear-Auth_RADIUS/Makefile
head/net/pear-Horde_Kolab_Server/Makefile
head/net/pear-Net_CDDB/Makefile
head/net/pear-Net_DNSBL/Makefile
head/net/pear-Net_Dict/Makefile
head/net/pear-Net_Finger/Makefile
head/net/pear-Net_Geo/Makefile
head/net/pear-Net_GeoIP/Makefile
head/net/pear-Net_NNTP/Makefile
head/net/pear-Net_Nmap/Makefile
head/net/pear-Net_POP3/Makefile
head/net/pear-Net_SMS/Makefile
head/net/pear-Net_SMTP/Makefile
head/net/pear-Net_Sieve/Makefile
head/net/pear-Net_Vpopmaild/Makefile
head/net/pear-Net_Whois/Makefile
head/net/pear-SOAP/Makefile
head/net/pear-Services_Twitter/Makefile
head/net/pear-XML_RPC2/Makefile
head/net/pecl-oauth2/Makefile
head/security/base/Makefile
head/security/maia/Makefile
head/security/mailzu/Makefile
head/security/nextcloud-passman/Makefile
head/security/nextcloud-twofactor_totp/Makefile
head/security/nextcloud-twofactor_u2f/Makefile
head/security/pear-Auth/Makefile
head/security/pear-Auth_SASL/Makefile
head/security/pear-Crypt_GPG/Makefile
head/security/pear-File_Passwd/Makefile
head/security/pear-File_SMBPasswd/Makefile
head/security/pear-Horde_Crypt/Makefile
head/security/pear-Horde_Crypt_Blowfish/Makefile
head/security/pear-LiveUser/Makefile
head/security/pear-LiveUser_Admin/Makefile
head/security/pecl-ssh2-0/Makefile
head/security/php-suhosin/Makefile
head/security/snuffleupagus/Makefile
head/sysutils/pear-Cache/Makefile
head/sysutils/pear-Horde_Log/Makefile
head/sysutils/pear-Horde_Vfs/Makefile
head/sysutils/pear-Log/Makefile
head/sysutils/pear-Translation2/Makefile
head/textproc/libmrss-php/Makefile
head/textproc/pear-File_MARC/Makefile
head/textproc/pear-Numbers_Words/Makefile
head/textproc/pear-Spreadsheet_Excel_Writer/Makefile
head/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
head/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
head/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
head/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
head/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
head/textproc/pear-Symfony_Component_Yaml/Makefile
head/textproc/pear-Text_Highlighter/Makefile
head/textproc/pear-Text_Template/Makefile
head/textproc/pear-Validate_ISPN/Makefile
head/textproc/pear-XML_Beautifier/Makefile
head/textproc/pear-XML_DTD/Makefile
head/textproc/pear-XML_Wddx/Makefile
head/textproc/pear-YAML/Makefile
head/textproc/pecl-xdiff2/Makefile
head/textproc/pecl-yaml1/Makefile
head/textproc/php-mecab/Makefile
head/www/Makefile
head/www/hastymail2-devel/Makefile
head/www/hastymail2/Makefile
head/www/horde-ansel/Makefile
head/www/horde-base/Makefile
head/www/horde-passwd/Makefile
head/www/horde-trean/Makefile
head/www/horde-wicked/Makefile
head/www/ilias/Makefile
head/www/magento/Makefile
head/www/mediawiki123/Makefile
head/www/mediawiki127/Makefile
head/www/mediawiki128/Makefile
head/www/mediawiki129/Makefile
head/www/mediawiki130/Makefile
head/www/nextcloud-calendar/Makefile
head/www/nextcloud-contacts/Makefile
head/www/nextcloud-notes/Makefile
head/www/nextcloud-tasks/Makefile
head/www/nextcloud/Makefile
head/www/nibbleblog/Makefile
head/www/owncloud/Makefile
head/www/pear-HTTP_Client/Makefile
head/www/pear-HTTP_Download/Makefile
head/www/pear-HTTP_FloodControl/Makefile
head/www/pear-HTTP_Header/Makefile
head/www/pear-HTTP_Request/Makefile
head/www/pear-HTTP_Request2/Makefile
head/www/pear-HTTP_Server/Makefile
head/www/pear-HTTP_WebDAV_Client/Makefile
head/www/pear-Services_Amazon/Makefile
head/www/pear-Services_Amazon_S3/Makefile
head/www/pear-Services_Blogging/Makefile
head/www/pear-Services_Compete/Makefile
head/www/pear-Services_Delicious/Makefile
head/www/pear-Services_Facebook/Makefile
head/www/pear-Services_GeoNames/Makefile
head/www/pear-Services_OpenSearch/Makefile
head/www/pear-Services_ShortURL/Makefile
head/www/pear-Services_W3C_CSSValidator/Makefile
head/www/pear-Services_W3C_HTMLValidator/Makefile
head/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
head/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
head/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
head/www/pear-UDDI/Makefile
head/www/pear-XML_GRDDL/Makefile
head/www/pear-twig/Makefile
head/www/pecl-http/Makefile
head/www/pecl-http2/Makefile
head/www/pecl-yaf2/Makefile
head/www/pecl-yar/Makefile
head/www/pecl-yar1/Makefile
head/www/phalcon/Makefile
head/www/php-screw/Makefile
head/www/php-templates/Makefile
head/www/php56-opcache/Makefile
head/www/php70-opcache/Makefile
head/www/php71-opcache/Makefile
head/www/php72-opcache/Makefile
head/www/phpbb/Makefile
head/www/smarty2/Makefile
head/www/smarty3/Makefile
head/www/unit-php/Makefile
head/www/xcache/Makefile
Modified: head/CHANGES
==============================================================================
--- head/CHANGES Thu Mar 8 19:32:19 2018 (r463916)
+++ head/CHANGES Thu Mar 8 19:48:41 2018 (r463917)
@@ -10,6 +10,43 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20180308:
+AUTHOR: mat at FreeBSD.org
+
+ Ports using USES=php:phpize, php:ext, php:zend, and php:pecl are now
+ flavored. They will automatically get flavors (php56, php70, php71, php72)
+ depending of the versions they support (set with IGNORE_WITH_PHP). As a
+ consequence, ports using USES=pear and USES=horde are also flavored.
+
+ As all packages must have different package names, the following variables
+ must be used in PKGNAMEPREFIX/SUFFIX:
+
+ Variable + Values +
+ --------------------------------------------------------------------------------------
+ PHP_PKGNAMEPREFIX | php56- php72- | PHP Extensions
+ | | and modules
+ --------------------------------------------------------------------------------------
+ PHP_PKGNAMESUFFIX | -php56 -php72 | PHP Applications
+ --------------------------------------------------------------------------------------
+ PECL_PKGNAMEPREFIX | php56-pecl- | PECL extensions
+ | | automatic
+ --------------------------------------------------------------------------------------
+ PEAR_PKGNAMEPREFIX | php56-pear- | PEAR modules
+ | | without PEAR_CHANNEL
+ PEAR_<channel>_PKGNAMEPREFIX | php56-pear-channel- | with PEAR_CHANNEL
+ | | automatic
+
+ In all the ports with PHP dependencies, the *_DEPENDS entries MUST end with
+ the flavor so that the framework knows which to build/use. This is done by
+ appending '@${PHP_FLAVOR}' after the origin. For example:
+
+ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR} \
+ ${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR} \
+
+ PHP applications (for example, www/wordpress) can also get flavors, add the
+ flavors keyword to USES=php, for example: USES=php:flavors, and add
+ ${PHP_PKGNAMESUFFIX} to its PKGNAMESUFFIX.
+
20180125:
AUTHOR: mat at FreeBSD.org
Modified: head/MOVED
==============================================================================
--- head/MOVED Thu Mar 8 19:32:19 2018 (r463916)
+++ head/MOVED Thu Mar 8 19:48:41 2018 (r463917)
@@ -10157,3 +10157,15 @@ devel/boaconstructor||2018-03-02|Has expired: Abandonw
audio/amp||2018-03-02|Has expired: No more upstream
devel/alf||2018-03-02|Has expired: Abandonware, unused in the ports tree
net/remmina-plugin-gnome|net/remmina-plugin-secret|2018-03-04|Renamed upstream
+databases/php70-memcache|databases/php-memcache at php70|2018-03-08|Merge into a flavorized version
+databases/php71-memcache|databases/php-memcache at php71|2018-03-08|Merge into a flavorized version
+databases/php72-memcache|databases/php-memcache at php72|2018-03-08|Merge into a flavorized version
+ftp/php56-fastdfs|ftp/php-fastdfs at php56|2018-03-08|Merge into flavorized version
+ftp/php70-fastdfs|ftp/php-fastdfs at php70|2018-03-08|Merge into flavorized version
+ftp/php71-fastdfs|ftp/php-fastdfs at php71|2018-03-08|Merge into flavorized version
+ftp/php72-fastdfs|ftp/php-fastdfs at php72|2018-03-08|Merge into flavorized version
+www/unit-php56|www/unit-php at php56|2018-03-08|Merge into flavorized version
+www/unit-php70|www/unit-php at php70|2018-03-08|Merge into flavorized version
+www/unit-php71|www/unit-php at php71|2018-03-08|Merge into flavorized version
+www/unit-php72|www/unit-php at php72|2018-03-08|Merge into flavorized version
+databases/php70-memcached|databases/php-memcached|2018-03-08|Move to flavorized version.
Modified: head/Mk/Uses/horde.mk
==============================================================================
--- head/Mk/Uses/horde.mk Thu Mar 8 19:32:19 2018 (r463916)
+++ head/Mk/Uses/horde.mk Thu Mar 8 19:48:41 2018 (r463917)
@@ -11,10 +11,6 @@ _INCLUDE_USES_HORDE_MK= yes
MASTER_SITES?= http://pear.horde.org/get/
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
-
-PKGNAMEPREFIX?= pear-
HORDE_DIR?= www/horde
CONFLICTS+= horde3-*.[0-9]*
@@ -142,7 +138,7 @@ horde-turba-DEPEND= ${LOCALBASE}/${HORDE_DIR}/turba/i
. if !defined(horde-${DEP}-DEPEND)
UNKNOWN_HORDE_PACKAGES+= ${DEP}
. else
-RUN_DEPENDS+= ${horde-${DEP}-DEPEND}
+RUN_DEPENDS+= ${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
. endif
. endfor
.endif
@@ -152,7 +148,7 @@ RUN_DEPENDS+= ${horde-${DEP}-DEPEND}
. if !defined(horde-${DEP}-DEPEND)
UNKNOWN_HORDE_PACKAGES+= ${DEP}
. else
-BUILD_DEPENDS+= ${horde-${DEP}-DEPEND}
+BUILD_DEPENDS+= ${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
. endif
. endfor
.endif
Modified: head/Mk/Uses/pear.mk
==============================================================================
--- head/Mk/Uses/pear.mk Thu Mar 8 19:32:19 2018 (r463916)
+++ head/Mk/Uses/pear.mk Thu Mar 8 19:48:41 2018 (r463917)
@@ -4,43 +4,62 @@
#
# Feature: pear
# Usage: USES=pear
-# Valid ARGS: none
+# Valid ARGS: env
#
+# - env : Only provide the environment variables, no fetch/build/install
+# targets.
+#
# MAINTAINER= portmgr at FreeBSD.org
.if !defined(_INCLUDE_USES_PEAR_MK)
_INCLUDE_USES_PEAR_MK= yes
_USES_POST+= pear
-.if !empty(pear_ARGS)
-IGNORE+= USES=pear takes not arguments
-.endif
+_valid_pear_ARGS= env
+# Sanity check
+. for arg in ${pear_ARGS}
+. if empty(_valid_pear_ARGS:M${arg})
+IGNORE= Incorrect 'USES+= pear:${cmake_ARGS}' usage: argument [${arg}] is not recognized
+. endif
+. endfor
+
+php_ARGS+= flavors
+.include "${USESDIR}/php.mk"
+
+. if empty(pear_ARGS:Menv)
MASTER_SITES?= http://pear.php.net/get/
EXTRACT_SUFX?= .tgz
DIST_SUBDIR?= PEAR
-BUILD_DEPENDS+= pear:devel/pear
-RUN_DEPENDS+= pear:devel/pear
-
-.if !defined(USE_PHPIZE)
+. if !defined(USE_PHPIZE)
NO_BUILD= yes
-.endif
+. endif
+. endif
-.if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != ""
-PKGNAMEPREFIX?= pear-${PEAR_CHANNEL}-
+BUILD_DEPENDS+= pear:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS+= pear:devel/pear@${PHP_FLAVOR}
+
+PEAR_PKGNAMEPREFIX= php${PHP_VER}-pear-
+
+. if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != ""
+PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX= php${PHP_VER}-pear-${PEAR_CHANNEL}-
+PKGNAMEPREFIX?= ${PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX}
PEARPKGREF= ${PEAR_CHANNEL}/${PORTNAME}
-.else
-PKGNAMEPREFIX?= pear-
+PEAR_CHANNEL_VER?= >=0
+BUILD_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
+RUN_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
+. else
+PKGNAMEPREFIX?= ${PEAR_PKGNAMEPREFIX}
PEARPKGREF= ${PORTNAME}
-.endif
+. endif
-.if exists(${LOCALBASE}/bin/php-config)
+. if exists(${LOCALBASE}/bin/php-config)
PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix
-.else
+. else
PHP_BASE= ${LOCALBASE}
-.endif
+. endif
PEAR= ${LOCALBASE}/bin/pear
LPEARDIR= share/pear
LPKGREGDIR= ${LPEARDIR}/packages/${PKGNAME}
@@ -58,32 +77,36 @@ EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR}
SQLSDIR= ${PHP_BASE}/${LSQLSDIR}
SCRIPTFILESDIR= ${LOCALBASE}/bin
TESTSDIR= ${PHP_BASE}/${LTESTSDIR}
-.if defined(CATEGORY) && !empty(CATEGORY)
+. if defined(CATEGORY) && !empty(CATEGORY)
LINSTDIR= ${LPEARDIR}/${CATEGORY}
-.else
+. else
LINSTDIR= ${LPEARDIR}
-.endif
+. endif
INSTDIR= ${PHP_BASE}/${LINSTDIR}
SUB_LIST+= PKG_NAME=${PEARPKGREF}
-.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist)
+. if empty(pear_ARGS:Menv)
+. if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist)
PLIST= ${WRKDIR}/PLIST
-.endif
+. endif
+PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install
+PKGDEINSTALL?= ${WRKDIR}/pear-deinstall
+. endif
+
PLIST_SUB+= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
SCRIPTFILESDIR=${LCRIPTSDIR}
-PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install
-PKGDEINSTALL?= ${WRKDIR}/pear-deinstall
-
.endif
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK)
_INCLUDE_USES_PEAR_POST_MK= yes
+. if empty(pear_ARGS:Menv)
+
_USES_install+= 250:pear-pre-install
pear-pre-install:
-.if exists(${LOCALBASE}/lib/php.DIST_PHP) \
+. if exists(${LOCALBASE}/lib/php.DIST_PHP) \
|| exists(${PHP_BASE}/lib/php.DIST_PHP) \
|| exists(${LOCALBASE}/.PEAR.pkg) \
|| exists(${PHP_BASE}/.PEAR.pkg)
@@ -92,7 +115,7 @@ pear-pre-install:
@${ECHO_MSG} " Please deinstall your installed pear- ports."
@${ECHO_MSG} ""
@${FALSE}
-.endif
+. endif
DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \
| ( while read r; do \
@@ -108,16 +131,16 @@ DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\
done \
) | ${SORT} -ur
-.if !defined(USE_PHPIZE)
+. if !defined(USE_PHPIZE)
_USES_install+= 260:do-autogenerate-plist
do-autogenerate-plist:
@${ECHO_MSG} "===> Generating packing list with pear"
@${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
@cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null
-.for R in .channels .depdb .depdblock .filemap .lock .registry
+. for R in .channels .depdb .depdblock .filemap .lock .registry
@${RM} -r ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
@${RM} -r ${WRKDIR}/inst/${R}
-.endfor
+. endfor
@FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
${GREP} -v -E "^${PREFIX}/"` || exit 0; \
${ECHO_CMD} $${FILES}; if ${TEST} -n "$${FILES}"; then \
@@ -131,11 +154,11 @@ do-autogenerate-plist:
do-install:
@cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml
# Clean up orphans re-generated by pear-install
-.for R in .channels .depdb .depdblock .filemap .lock .registry
+. for R in .channels .depdb .depdblock .filemap .lock .registry
@${RM} -r ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R}
@${RM} -r ${STAGEDIR}/${R}
-.endfor
-.endif
+. endfor
+. endif
_USES_install+= 270:do-generate-deinstall-script
do-generate-deinstall-script:
@@ -148,5 +171,7 @@ pear-post-install:
show-depends: patch
@${PEAR} package-dependencies ${WRKDIR}/package.xml
+
+. endif
.endif
Modified: head/Mk/Uses/php.mk
==============================================================================
--- head/Mk/Uses/php.mk Thu Mar 8 19:32:19 2018 (r463916)
+++ head/Mk/Uses/php.mk Thu Mar 8 19:48:41 2018 (r463917)
@@ -16,6 +16,9 @@
# - web : Want the Apache Module or the CGI version of PHP.
# - embed : Want the embedded library version of PHP.
# - pecl : Fetches from PECL.
+# - flavors : Generates flavors for supported versions.
+# (implied by phpize,ext,zend,pecl)
+# - noflavors: Prevents generation of flavor.
#
# If the port requires a predefined set of PHP extensions, they can be
# listed in this way:
@@ -43,7 +46,6 @@
#
# The port can set these options in its Makefile before bsd.port.pre.mk:
#
-# DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed.
# IGNORE_WITH_PHP=N - The port doesn't work with PHP version N.
#
# You may combine multiple WANT_PHP_* knobs.
@@ -58,10 +60,6 @@ PHP_Include_MAINTAINER= ale at FreeBSD.org
_INCLUDE_USES_PHP_MK= yes
-. if defined(DEFAULT_PHP_VER)
-WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
-. endif
-
. if defined(USE_PHPIZE) && empty(php_ARGS:Mphpize)
php_ARGS+= phpize
. endif
@@ -84,6 +82,9 @@ php_ARGS+= embed
. if ${php_ARGS:Mbuild} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
DEV_WARNING+= "USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed"
. endif
+. if ${php_ARGS:Mflavors} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} )
+DEV_WARNINGS+= "USES=php:flavors is included in phpize, ext, zend and pecl, so it is not needed."
+. endif
. if ${php_ARGS:Mphpize} && ( ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
DEV_WARNING+= "USES=php:phpize is included in USES=php:ext and USES=php:zend, so it is not needed"
. endif
@@ -94,26 +95,91 @@ DEV_WARNING+= "USES=php:ext is included in USES=php:ze
DEV_WARNING+= "USES=php:ext is included in USES=php:pecl, so it is not needed"
. endif
+. if ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} ) && !${php_ARGS:Mnoflavors}
+php_ARGS+= flavors
+. endif
+
+. if ${php_ARGS:Mnoflavors} && ${php_ARGS:Mflavors}
+php_ARGS:= ${php_ARGS:Nflavors}
+. endif
+
+
. if ${php_ARGS:Mpecl}
php_ARGS+= ext
+. if !defined(USE_GITHUB)
EXTRACT_SUFX= .tgz
MASTER_SITES= http://pecl.php.net/get/
-PKGNAMEPREFIX= pecl-
+. endif
+PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX}
DIST_SUBDIR= PECL
. endif
PHPBASE?= ${LOCALBASE}
+
+_ALL_PHP_VERSIONS= 56 70 71 72
+
+# Make the already installed PHP the default one.
. if exists(${PHPBASE}/etc/php.conf)
.include "${PHPBASE}/etc/php.conf"
. if !defined(PHP_EXT_DIR)
PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p'
. endif
+_INSTALLED_PHP_VER:= ${PHP_VER}
+# If we have an installed version of PHP, and this does not support it, set
+# IGNORE to fail early as you cannot install two different versions of PHP at
+# the same time anyway.
+. if defined(IGNORE_WITH_PHP) && ${IGNORE_WITH_PHP:M${_INSTALLED_PHP_VER}}
+IGNORE= does not work with PHP versions "${IGNORE_WITH_PHP}" and "${_INSTALLED_PHP_VER}" is installed.
+. endif
+
. else
-DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//}
+PHP_VER?= ${PHP_DEFAULT:S/.//}
+. endif # .if exists(${PHPBASE}/etc/php.conf)
+# Use the "default" php version as th first version for flavors, so that it
+# gets to be the default flavor.
+_ALL_FLAVOR_VERSIONS= ${PHP_VER} ${_ALL_PHP_VERSIONS:N${PHP_VER}}
+
+# If we want flavors, fill in FLAVORS with the allowed PHP versions, if some
+# cannot be used, or all of them if they all can.
+# Then if there is no flavor set, use the first one as the default.
+. if ${php_ARGS:Mflavors}
+. if empty(FLAVORS)
+. if defined(IGNORE_WITH_PHP)
+. for _v in ${_ALL_FLAVOR_VERSIONS}
+. if empty(IGNORE_WITH_PHP:M${_v})
+# Avoid a leading space in FLAVORS.
+. if empty(FLAVORS)
+FLAVORS:= php${_v}
+. else
+FLAVORS:= ${FLAVORS} php${_v}
+. endif
+. endif
+. endfor
+. else # defined(IGNORE_WITH_PHP)
+FLAVORS:= ${_ALL_FLAVOR_VERSIONS:S/^/php/}
+. endif # defined(IGNORE_WITH_PHP)
+. endif
+. if empty(FLAVOR)
+FLAVOR= ${FLAVORS:[1]}
+. endif
+. endif
+
+# This variable is for dependencies lines, so you write:
+# ${PHP_PKGNAMEPREFIX}foo:devel/php-foo@${PHP_FLAVOR}
+PHP_FLAVOR= php${PHP_VER}
+
+# So, we have PHP flavors, set PHP_VER accordingly.
+. if ${FLAVOR:Mphp[0-9][0-9]}
+PHP_VER= ${FLAVOR:S/^php//}
+. endif
+
+# If lang/php is not installed, or if we have a php flavor but want a non
+# default one, we need to overwrite those.
+. if empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || \
+ (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]})
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-PHP_VER?= ${DEFAULT_PHP_VER}
. if ${PHP_VER} == 72
PHP_EXT_DIR= 20170718
PHP_EXT_INC= pcre spl
@@ -132,6 +198,8 @@ PHP_EXT_DIR= 20131226
PHP_EXT_INC= pcre spl
. endif
+# Try to figure out what the PHP_EXT_DIR should be WRT the
+# installed Apache port.
HTTPD?= ${LOCALBASE}/sbin/httpd
. if exists(${HTTPD})
APACHE_THR!= ${HTTPD} -V | ${AWK} '/threaded/ {print $2}'
@@ -148,9 +216,13 @@ PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts
PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug
. endif
PHP_SAPI?= ""
-. endif # .if exists(${PHPBASE}/etc/php.conf)
-PHP_EXT_INC?= ""
+. endif # empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]})
+# Set a few PKGNAME(PRE|SUF)FIX to be used in ports.
+PHP_PKGNAMEPREFIX= php${PHP_VER}-
+PHP_PKGNAMESUFFIX= -php${PHP_VER}
+PECL_PKGNAMEPREFIX= php${PHP_VER}-pecl-
+
. if defined(IGNORE_WITH_PHP)
. for VER in ${IGNORE_WITH_PHP}
. if ${PHP_VER} == "${VER}"
@@ -220,7 +292,7 @@ BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PHP_PORT} \
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config
-configure-message: phpize-message do-phpize
+_USES_configure+= 190:phpize-message 250:do-phpize
phpize-message:
@${ECHO_MSG} "===> PHPizing for ${PKGNAME}"
@@ -308,9 +380,9 @@ _USE_PHP_VER72= ${_USE_PHP_ALL} sodium
bcmath_DEPENDS= math/php${PHP_VER}-bcmath
. if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72
-bitset_DEPENDS= math/pecl-bitset
+bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR}
. else
-bitset_DEPENDS= math/pecl-bitset2
+bitset_DEPENDS= math/pecl-bitset2@${PHP_FLAVOR}
. endif
bz2_DEPENDS= archivers/php${PHP_VER}-bz2
calendar_DEPENDS= misc/php${PHP_VER}-calendar
@@ -329,31 +401,31 @@ gettext_DEPENDS=devel/php${PHP_VER}-gettext
gmp_DEPENDS= math/php${PHP_VER}-gmp
hash_DEPENDS= security/php${PHP_VER}-hash
iconv_DEPENDS= converters/php${PHP_VER}-iconv
-igbinary_DEPENDS= converters/pecl-igbinary
+igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR}
imap_DEPENDS= mail/php${PHP_VER}-imap
interbase_DEPENDS= databases/php${PHP_VER}-interbase
. if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72
intl_DEPENDS= devel/php${PHP_VER}-intl
. else
-intl_DEPENDS= devel/pecl-intl
+intl_DEPENDS= devel/pecl-intl@${PHP_FLAVOR}
. endif
json_DEPENDS= devel/php${PHP_VER}-json
ldap_DEPENDS= net/php${PHP_VER}-ldap
mbstring_DEPENDS= converters/php${PHP_VER}-mbstring
. if ${PHP_VER} >= 72
-mcrypt_DEPENDS= security/pecl-mcrypt
+mcrypt_DEPENDS= security/pecl-mcrypt@${PHP_FLAVOR}
. else
mcrypt_DEPENDS= security/php${PHP_VER}-mcrypt
. endif
. if ${PHP_VER} >= 70
-memcache_DEPENDS= databases/php${PHP_VER}-memcache
+memcache_DEPENDS= databases/php-memcache@${PHP_FLAVOR}
. else
-memcache_DEPENDS= databases/pecl-memcache
+memcache_DEPENDS= databases/pecl-memcache@${PHP_FLAVOR}
. endif
. if ${PHP_VER} >= 70
-memcached_DEPENDS= databases/pecl-memcached
+memcached_DEPENDS= databases/pecl-memcached@${PHP_FLAVOR}
. else
-memcached_DEPENDS= databases/pecl-memcached2
+memcached_DEPENDS= databases/pecl-memcached2@${PHP_FLAVOR}
. endif
mssql_DEPENDS= databases/php${PHP_VER}-mssql
mysql_DEPENDS= databases/php${PHP_VER}-mysql
@@ -364,7 +436,7 @@ oci8_DEPENDS= databases/php${PHP_VER}-oci8
opcache_DEPENDS= www/php${PHP_VER}-opcache
openssl_DEPENDS=security/php${PHP_VER}-openssl
pcntl_DEPENDS= devel/php${PHP_VER}-pcntl
-pdf_DEPENDS= print/pecl-pdflib
+pdf_DEPENDS= print/pecl-pdflib@${PHP_FLAVOR}
pdo_DEPENDS= databases/php${PHP_VER}-pdo
pdo_dblib_DEPENDS= databases/php${PHP_VER}-pdo_dblib
pdo_firebird_DEPENDS= databases/php${PHP_VER}-pdo_firebird
@@ -376,10 +448,10 @@ pgsql_DEPENDS= databases/php${PHP_VER}-pgsql
phar_DEPENDS= archivers/php${PHP_VER}-phar
posix_DEPENDS= sysutils/php${PHP_VER}-posix
pspell_DEPENDS= textproc/php${PHP_VER}-pspell
-radius_DEPENDS= net/pecl-radius
+radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR}
readline_DEPENDS= devel/php${PHP_VER}-readline
recode_DEPENDS= converters/php${PHP_VER}-recode
-redis_DEPENDS= databases/pecl-redis
+redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR}
session_DEPENDS=www/php${PHP_VER}-session
shmop_DEPENDS= devel/php${PHP_VER}-shmop
simplexml_DEPENDS= textproc/php${PHP_VER}-simplexml
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Mar 8 19:32:19 2018 (r463916)
+++ head/UPDATING Thu Mar 8 19:48:41 2018 (r463917)
@@ -5,6 +5,24 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20180308:
+ AFFECTS: */php* */pecl* */pear*
+ AUTHOR: mat at FreeBSD.org
+
+ PHP extensions and modules have been flavored.
+
+ People using Poudriere 3.2+ and binary packages do not have to do anything.
+
+ PHP modules and extensions may have change their names from php5- or php7- to
+ fully versionned phpXY-.
+ PECL extensions and PEAR modules package names have changed from pecl- and
+ pear- to phpXX-pecl and phpXX-pear-.
+
+ For other people, to build the PHP 7.2 version of, for example,
+ databases/php-memcached, you need to run:
+
+ # make FLAVOR=php72 install
+
20180220:
AFFECTS: users of www/nextcloud
AUTHOR: brnrd at FreeBSD.org
Modified: head/archivers/pear-File_Archive/Makefile
==============================================================================
--- head/archivers/pear-File_Archive/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/archivers/pear-File_Archive/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,8 +8,8 @@ CATEGORIES= archivers www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files
-BUILD_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type
-RUN_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type
+BUILD_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR}
USES= pear php
NO_ARCH= yes
@@ -22,8 +22,8 @@ PEAR_MAIL_DESC= PEAR::Mail support
PEAR_MAIL_MIME_DESC= PEAR::Mail_Mime support
PEAR_CACHE_LITE_DESC= PEAR::Cache_Lite support
-PEAR_MAIL_RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail
-PEAR_MAIL_MIME_RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
-PEAR_CACHE_LITE_RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite
+PEAR_MAIL_RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
+PEAR_MAIL_MIME_RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
+PEAR_CACHE_LITE_RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR}
.include <bsd.port.mk>
Modified: head/archivers/pear-Horde_Compress/Makefile
==============================================================================
--- head/archivers/pear-Horde_Compress/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/archivers/pear-Horde_Compress/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -3,7 +3,6 @@
PORTNAME= Horde_Compress
PORTVERSION= 2.2.1
CATEGORIES= archivers www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde at FreeBSD.org
COMMENT= Horde Compression API
Modified: head/archivers/pear-Horde_Compress_Fast/Makefile
==============================================================================
--- head/archivers/pear-Horde_Compress_Fast/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/archivers/pear-Horde_Compress_Fast/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -3,7 +3,6 @@
PORTNAME= Horde_Compress_Fast
PORTVERSION= 1.1.1
CATEGORIES= archivers www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde at FreeBSD.org
COMMENT= Horde Fast Compression Library
Modified: head/archivers/pear-Horde_Pack/Makefile
==============================================================================
--- head/archivers/pear-Horde_Pack/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/archivers/pear-Horde_Pack/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -3,7 +3,6 @@
PORTNAME= Horde_Pack
PORTVERSION= 1.0.7
CATEGORIES= archivers www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde at FreeBSD.org
COMMENT= Horde Pack Utility
Modified: head/archivers/php-horde_lz4/Makefile
==============================================================================
--- head/archivers/php-horde_lz4/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/archivers/php-horde_lz4/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -5,7 +5,7 @@ PORTNAME= horde_lz4
PORTVERSION= 1.0.10
CATEGORIES= archivers pear
MASTER_SITES= http://pear.horde.org/get/
-PKGNAMEPREFIX= php-
+PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX}
DIST_SUBDIR= PECL
MAINTAINER= mm at FreeBSD.org
Modified: head/archivers/php-snappy/Makefile
==============================================================================
--- head/archivers/php-snappy/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/archivers/php-snappy/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -4,7 +4,7 @@
PORTNAME= snappy
PORTVERSION= 0.1.9
CATEGORIES= archivers
-PKGNAMEPREFIX= php-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= joneum at FreeBSD.org
COMMENT= PHP extension for the snappy compression algorithm
Modified: head/chinese/php-opencc/Makefile
==============================================================================
--- head/chinese/php-opencc/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/chinese/php-opencc/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -4,7 +4,7 @@
PORTNAME= opencc
PORTVERSION= 0.0.0.20161110
CATEGORIES= chinese
-PKGNAMEPREFIX= php-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= gasol.wu at gmail.com
COMMENT= OpenCC shared extension for php
Modified: head/chinese/phpbb-tw/Makefile
==============================================================================
--- head/chinese/phpbb-tw/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/chinese/phpbb-tw/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -12,10 +12,10 @@ DISTNAME= phpBB-tw-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= The Traditional Chinese version of phpBB
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
CONFLICTS= phpbb-[0-9]*
-USES= dos2unix
+USES= dos2unix php
# Get HOSTNAME
.if exists(/sbin/sysctl)
Modified: head/converters/php5-bsdconv/Makefile
==============================================================================
--- head/converters/php5-bsdconv/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/converters/php5-bsdconv/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -5,7 +5,7 @@ PORTNAME= bsdconv
PORTVERSION= 11.3.0
PORTREVISION= 1
CATEGORIES= converters
-PKGNAMEPREFIX= php5-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= buganini at gmail.com
COMMENT= PHP wrapper for bsdconv
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -608,6 +608,8 @@
SUBDIR += pguri
SUBDIR += pgworksheet
SUBDIR += php-mdcached
+ SUBDIR += php-memcache
+ SUBDIR += php-memcached
SUBDIR += php-xapian
SUBDIR += php5-pdo_cassandra
SUBDIR += php5-tarantool
@@ -630,8 +632,6 @@
SUBDIR += php7-tarantool
SUBDIR += php70-dba
SUBDIR += php70-interbase
- SUBDIR += php70-memcache
- SUBDIR += php70-memcached
SUBDIR += php70-mysqli
SUBDIR += php70-odbc
SUBDIR += php70-pdo
@@ -645,7 +645,6 @@
SUBDIR += php70-sqlite3
SUBDIR += php71-dba
SUBDIR += php71-interbase
- SUBDIR += php71-memcache
SUBDIR += php71-mysqli
SUBDIR += php71-odbc
SUBDIR += php71-pdo
@@ -659,7 +658,6 @@
SUBDIR += php71-sqlite3
SUBDIR += php72-dba
SUBDIR += php72-interbase
- SUBDIR += php72-memcache
SUBDIR += php72-mysqli
SUBDIR += php72-odbc
SUBDIR += php72-pdo
Modified: head/databases/pear-DB_DataObject/Makefile
==============================================================================
--- head/databases/pear-DB_DataObject/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_DataObject/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -11,10 +11,10 @@ COMMENT= SQL Builder, Object Interface to Database Tab
LICENSE= PHP301
LICENSE_FILE= ${WRKSRC}/docs/LICENCE.txt
-BUILD_DEPENDS= pear-DB>=1.7.0:databases/pear-DB \
- pear-Date>=1.4.3:devel/pear-Date
-RUN_DEPENDS= pear-DB>=1.7.0:databases/pear-DB \
- pear-Date>=1.4.3:devel/pear-Date
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
USES= pear
@@ -23,7 +23,7 @@ OPTIONS_DEFINE= PEAR_MDB2 PEAR_VALIDATE
PEAR_MDB2_DESC= PEAR::MDB2 support
PEAR_VALIDATE_DESC= PEAR::Validate support
-PEAR_MDB2_RUN_DEPENDS= pear-MDB2>=2.3.0:databases/pear-MDB2
-PEAR_VALIDATE_RUN_DEPENDS= pear-Validate>=0.1.1:devel/pear-Validate
+PEAR_MDB2_RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=2.3.0:databases/pear-MDB2@${PHP_FLAVOR}
+PEAR_VALIDATE_RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.1.1:devel/pear-Validate@${PHP_FLAVOR}
.include <bsd.port.mk>
Modified: head/databases/pear-DB_DataObject_FormBuilder/Makefile
==============================================================================
--- head/databases/pear-DB_DataObject_FormBuilder/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_DataObject_FormBuilder/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,17 +8,17 @@ CATEGORIES= databases www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= Automatically build HTML_QuickForm objects using DB_DataObject
-BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
- ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
-RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
- ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
+BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+ ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+ ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR}
USES= pear
OPTIONS_DEFINE= PEAR_DATE PEAR_HTML_TABLE
PEAR_DATE_DESC= PEAR::Date support
PEAR_HTML_TABLE_DESC= PEAR::HTML_Table support
-PEAR_DATE_RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date
-PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table
+PEAR_DATE_RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
+PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table@${PHP_FLAVOR}
.include <bsd.port.mk>
Modified: head/databases/pear-DB_Pager/Makefile
==============================================================================
--- head/databases/pear-DB_Pager/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_Pager/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -10,8 +10,8 @@ COMMENT= PEAR Database Abstraction Layer
LICENSE= GPLv3
-BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
USES= pear
Modified: head/databases/pear-DB_QueryTool/Makefile
==============================================================================
--- head/databases/pear-DB_QueryTool/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_QueryTool/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,10 +8,10 @@ CATEGORIES= databases www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR OO-interface for easily retrieving and modifying data in a DB
-BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \
- ${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \
- ${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+ ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+ ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
USES= pear
Modified: head/databases/pear-DB_Sqlite_Tools/Makefile
==============================================================================
--- head/databases/pear-DB_Sqlite_Tools/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_Sqlite_Tools/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,10 +8,10 @@ CATEGORIES= databases www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= an object oriented interface to backup Sqlite databases
-BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \
- ${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \
- ${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+ ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+ ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
USES= pear
Modified: head/databases/pear-DB_Table/Makefile
==============================================================================
--- head/databases/pear-DB_Table/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_Table/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -17,8 +17,8 @@ PEAR_HTML_QUICKFORM_DESC= PEAR::HTML_QuickForm support
PEAR_DB_DESC= PEAR::DB support
PEAR_MDB2_DESC= PEAR::MDB2 support
-PEAR_HTML_QUICKFORM_RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
-PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
-PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_HTML_QUICKFORM_RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
+PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
.include <bsd.port.mk>
Modified: head/databases/pear-DB_ldap/Makefile
==============================================================================
--- head/databases/pear-DB_ldap/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_ldap/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,8 +8,8 @@ CATEGORIES= databases net pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR DB compliant interface to LDAP servers
-BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
USES= pear
Modified: head/databases/pear-DB_ldap2/Makefile
==============================================================================
--- head/databases/pear-DB_ldap2/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DB_ldap2/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -9,8 +9,8 @@ CATEGORIES= databases net pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR DB compliant interface to LDAP v2 and v3 database
-BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
USE_PHP= ldap
USES= pear php
Modified: head/databases/pear-DoctrineCommon/Makefile
==============================================================================
--- head/databases/pear-DoctrineCommon/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DoctrineCommon/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -11,9 +11,6 @@ COMMENT= Shared code for Doctrine PHP object relationa
LICENSE= LGPL21
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-
USES= pear
PEAR_CHANNEL= doctrine
Modified: head/databases/pear-DoctrineDBAL/Makefile
==============================================================================
--- head/databases/pear-DoctrineDBAL/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DoctrineDBAL/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -11,10 +11,8 @@ COMMENT= Database abstraction layer used to power the
LICENSE= LGPL21
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \
- ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
- ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console
+RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
+ ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR}
OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE
OPTIONS_DEFAULT=MYSQL
Modified: head/databases/pear-DoctrineORM/Makefile
==============================================================================
--- head/databases/pear-DoctrineORM/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-DoctrineORM/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -11,12 +11,10 @@ COMMENT= Primary package containing the Doctrine ORM
LICENSE= LGPL21
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \
- ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
- ${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL \
- ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console \
- ${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml
+RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
+ ${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL@${PHP_FLAVOR} \
+ ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} \
+ ${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml@${PHP_FLAVOR}
USES= pear
PEAR_CHANNEL= doctrine
Modified: head/databases/pear-Horde_Db/Makefile
==============================================================================
--- head/databases/pear-Horde_Db/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-Horde_Db/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -3,7 +3,6 @@
PORTNAME= Horde_Db
PORTVERSION= 2.4.0
CATEGORIES= databases www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde at FreeBSD.org
COMMENT= Horde Database Libraries
Modified: head/databases/pear-Horde_HashTable/Makefile
==============================================================================
--- head/databases/pear-Horde_HashTable/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-Horde_HashTable/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -3,7 +3,6 @@
PORTNAME= Horde_HashTable
PORTVERSION= 1.2.6
CATEGORIES= databases www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde at FreeBSD.org
COMMENT= Horde Hash Table Interface
Modified: head/databases/pear-Horde_Mongo/Makefile
==============================================================================
--- head/databases/pear-Horde_Mongo/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-Horde_Mongo/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -3,12 +3,10 @@
PORTNAME= Horde_Mongo
PORTVERSION= 1.1.0
CATEGORIES= databases www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde at FreeBSD.org
COMMENT= Horde Mongo Configuration
USES= horde
-#RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:databases/pecl-mongo
.include <bsd.port.mk>
Modified: head/databases/pear-MDB/Makefile
==============================================================================
--- head/databases/pear-MDB/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-MDB/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,8 +8,8 @@ CATEGORIES= databases www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR unified API for DB access, based on user meta data
-BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
USES= pear
Modified: head/databases/pear-MDB2_Driver_mysql/Makefile
==============================================================================
--- head/databases/pear-MDB2_Driver_mysql/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-MDB2_Driver_mysql/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -10,7 +10,7 @@ COMMENT= PEAR MySQL MDB2 driver
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
Modified: head/databases/pear-MDB2_Driver_mysqli/Makefile
==============================================================================
--- head/databases/pear-MDB2_Driver_mysqli/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-MDB2_Driver_mysqli/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -10,7 +10,7 @@ COMMENT= PEAR MySQL MDB2 driver
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
Modified: head/databases/pear-MDB2_Driver_pgsql/Makefile
==============================================================================
--- head/databases/pear-MDB2_Driver_pgsql/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-MDB2_Driver_pgsql/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -10,7 +10,7 @@ COMMENT= PEAR pgsql MDB2 driver
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
Modified: head/databases/pear-MDB2_Schema/Makefile
==============================================================================
--- head/databases/pear-MDB2_Schema/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-MDB2_Schema/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,14 +8,14 @@ CATEGORIES= databases www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR XML based database schema manager
-BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 \
- ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
- ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \
- ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 \
- ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
- ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \
- ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
USES= pear
Modified: head/databases/pear-MDB_QueryTool/Makefile
==============================================================================
--- head/databases/pear-MDB_QueryTool/Makefile Thu Mar 8 19:32:19 2018 (r463916)
+++ head/databases/pear-MDB_QueryTool/Makefile Thu Mar 8 19:48:41 2018 (r463917)
@@ -8,10 +8,10 @@ CATEGORIES= databases www pear
MAINTAINER= joneum at FreeBSD.org
COMMENT= PEAR OO-interface for easily retrieving and modifying data in a DB
-BUILD_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB \
- ${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS:= ${PEARDIR}/MDB.php:databases/pear-MDB \
- ${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \
+ ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS:= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list