Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F153847956
D14208.id38939.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
63 KB
Referenced Files
None
Subscribers
None
D14208.id38939.diff
View Options
Index: Mk/Uses/horde.mk
===================================================================
--- Mk/Uses/horde.mk
+++ Mk/Uses/horde.mk
@@ -11,10 +11,6 @@
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 @@
. 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 @@
. 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
Index: Mk/Uses/pear.mk
===================================================================
--- Mk/Uses/pear.mk
+++ Mk/Uses/pear.mk
@@ -4,7 +4,10 @@
#
# Feature: pear
# Usage: USES=pear
-# Valid ARGS: none
+# Valid ARGS: env
+#
+# - env : Only provide the environment variables, no fetch/build/install
+# targets.
#
# MAINTAINER= portmgr@FreeBSD.org
@@ -12,35 +15,51 @@
_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 @@
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 @@
@${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 @@
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-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:
@@ -149,4 +172,6 @@
show-depends: patch
@${PEAR} package-dependencies ${WRKDIR}/package.xml
+. endif
+
.endif
Index: Mk/Uses/php.mk
===================================================================
--- Mk/Uses/php.mk
+++ Mk/Uses/php.mk
@@ -16,6 +16,11 @@
# - 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.
+# - optsuffix: Adds a -phpXY PKGNAMESUFFIX when the current php is not
+# the default one.
#
# If the port requires a predefined set of PHP extensions, they can be
# listed in this way:
@@ -43,7 +48,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 +62,6 @@
_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 +84,9 @@
. 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,22 +97,63 @@
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
EXTRACT_SUFX= .tgz
MASTER_SITES= http://pecl.php.net/get/
-PKGNAMEPREFIX= pecl-
+PECL_PKGNAMEPREFIX= php${PHP_VER}-pecl-
+PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX}
DIST_SUBDIR= PECL
. endif
PHPBASE?= ${LOCALBASE}
-. if exists(${PHPBASE}/etc/php.conf)
+
+_ALL_PHP_VERSIONS= 56 70 71 72
+
+DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//}
+
+_ALL_FLAVOR_VERSIONS= ${DEFAULT_PHP_VER} ${_ALL_PHP_VERSIONS:N${DEFAULT_PHP_VER}}
+
+. 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})
+FLAVORS+= php${_v}
+. endif
+. endfor
+. else
+FLAVORS= ${_ALL_FLAVOR_VERSIONS:S/^/php/}
+. endif
+. endif
+. if empty(FLAVOR)
+FLAVOR= ${FLAVORS:[1]}
+. endif
+. if ${php_ARGS:Moptsuffix} && ${FLAVOR} != ${FLAVORS:[1]}
+PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
+. endif
+. endif
+
+. if ${FLAVOR:Mphp[0-9][0-9]}
+PHP_VER= ${FLAVOR:S/^php//}
+. endif
+
+PHP_FLAVOR= php${PHP_VER}
+
+. if exists(${PHPBASE}/etc/php.conf) && !defined(PHP_VER)
.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
. else
-DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//}
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
@@ -148,9 +192,12 @@
PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug
. endif
PHP_SAPI?= ""
-. endif # .if exists(${PHPBASE}/etc/php.conf)
+. endif # .if exists(${PHPBASE}/etc/php.conf) && !${PHP_VER}
PHP_EXT_INC?= ""
+PHP_PKGNAMEPREFIX= php${PHP_VER}-
+PHP_PKGNAMESUFFIX= -php${PHP_VER}
+
. if defined(IGNORE_WITH_PHP)
. for VER in ${IGNORE_WITH_PHP}
. if ${PHP_VER} == "${VER}"
@@ -220,7 +267,7 @@
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}"
Index: archivers/pear-Horde_Compress/Makefile
===================================================================
--- archivers/pear-Horde_Compress/Makefile
+++ archivers/pear-Horde_Compress/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Compress
PORTVERSION= 2.2.1
CATEGORIES= archivers www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Compression API
Index: archivers/pear-Horde_Compress_Fast/Makefile
===================================================================
--- archivers/pear-Horde_Compress_Fast/Makefile
+++ archivers/pear-Horde_Compress_Fast/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Compress_Fast
PORTVERSION= 1.1.1
CATEGORIES= archivers www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Fast Compression Library
Index: archivers/pear-Horde_Pack/Makefile
===================================================================
--- archivers/pear-Horde_Pack/Makefile
+++ archivers/pear-Horde_Pack/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Pack
PORTVERSION= 1.0.7
CATEGORIES= archivers www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Pack Utility
Index: chinese/phpbb-tw/Makefile
===================================================================
--- chinese/phpbb-tw/Makefile
+++ chinese/phpbb-tw/Makefile
@@ -12,7 +12,7 @@
MAINTAINER= ports@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
Index: databases/pear-DB_DataObject/Makefile
===================================================================
--- databases/pear-DB_DataObject/Makefile
+++ databases/pear-DB_DataObject/Makefile
@@ -11,10 +11,10 @@
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 @@
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>
Index: databases/pear-DoctrineCommon/Makefile
===================================================================
--- databases/pear-DoctrineCommon/Makefile
+++ databases/pear-DoctrineCommon/Makefile
@@ -11,9 +11,6 @@
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
Index: databases/pear-DoctrineDBAL/Makefile
===================================================================
--- databases/pear-DoctrineDBAL/Makefile
+++ databases/pear-DoctrineDBAL/Makefile
@@ -11,9 +11,7 @@
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 \
+RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console
OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE
Index: databases/pear-DoctrineORM/Makefile
===================================================================
--- databases/pear-DoctrineORM/Makefile
+++ databases/pear-DoctrineORM/Makefile
@@ -11,9 +11,7 @@
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 \
+RUN_DEPENDS= ${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
Index: databases/pear-Horde_Db/Makefile
===================================================================
--- databases/pear-Horde_Db/Makefile
+++ databases/pear-Horde_Db/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Db
PORTVERSION= 2.4.0
CATEGORIES= databases www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Database Libraries
Index: databases/pear-Horde_HashTable/Makefile
===================================================================
--- databases/pear-Horde_HashTable/Makefile
+++ databases/pear-Horde_HashTable/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_HashTable
PORTVERSION= 1.2.6
CATEGORIES= databases www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Hash Table Interface
Index: databases/pear-Horde_Mongo/Makefile
===================================================================
--- databases/pear-Horde_Mongo/Makefile
+++ databases/pear-Horde_Mongo/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Mongo
PORTVERSION= 1.1.0
CATEGORIES= databases www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Mongo Configuration
Index: databases/pear-MDB2_Driver_mysql/Makefile
===================================================================
--- databases/pear-MDB2_Driver_mysql/Makefile
+++ databases/pear-MDB2_Driver_mysql/Makefile
@@ -10,7 +10,7 @@
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
Index: databases/pear-MDB2_Driver_mysqli/Makefile
===================================================================
--- databases/pear-MDB2_Driver_mysqli/Makefile
+++ databases/pear-MDB2_Driver_mysqli/Makefile
@@ -10,7 +10,7 @@
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
Index: databases/pear-MDB2_Driver_pgsql/Makefile
===================================================================
--- databases/pear-MDB2_Driver_pgsql/Makefile
+++ databases/pear-MDB2_Driver_pgsql/Makefile
@@ -10,7 +10,7 @@
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
Index: devel/pear-File_Iterator/Makefile
===================================================================
--- devel/pear-File_Iterator/Makefile
+++ devel/pear-File_Iterator/Makefile
@@ -4,7 +4,6 @@
PORTNAME= File_Iterator
DISTVERSION= 1.4.5
CATEGORIES= devel www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR FileIterator implementation
@@ -12,9 +11,8 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS= pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-
+USES= pear:env
+PEAR_CHANNEL= phpunit
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= php-file-iterator
Index: devel/pear-Horde_Cache/Makefile
===================================================================
--- devel/pear-Horde_Cache/Makefile
+++ devel/pear-Horde_Cache/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Cache
PORTVERSION= 2.5.5
CATEGORIES= devel www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Caching API
Index: devel/pear-Horde_Core/Makefile
===================================================================
--- devel/pear-Horde_Core/Makefile
+++ devel/pear-Horde_Core/Makefile
@@ -4,7 +4,6 @@
PORTNAME= Horde_Core
DISTVERSION= 2.31.1
CATEGORIES= devel www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Core Framework libraries
Index: devel/pear-Horde_Nls/Makefile
===================================================================
--- devel/pear-Horde_Nls/Makefile
+++ devel/pear-Horde_Nls/Makefile
@@ -5,7 +5,6 @@
PORTVERSION= 2.2.1
CATEGORIES= devel www pear
MASTER_SITES= http://pear.horde.org/get/
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Native Language Support
Index: devel/pear-Horde_Queue/Makefile
===================================================================
--- devel/pear-Horde_Queue/Makefile
+++ devel/pear-Horde_Queue/Makefile
@@ -3,7 +3,6 @@
PORTNAME= Horde_Queue
PORTVERSION= 1.1.5
CATEGORIES= devel www pear
-PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Queue
Index: devel/pear-I18N/Makefile
===================================================================
--- devel/pear-I18N/Makefile
+++ devel/pear-I18N/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR internationalization package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
USES= pear
Index: devel/pear-Net_Gearman/Makefile
===================================================================
--- devel/pear-Net_Gearman/Makefile
+++ devel/pear-Net_Gearman/Makefile
@@ -11,8 +11,8 @@
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${LOCALBASE}/share/pear/PEAR.php:devel/pear
-RUN_DEPENDS= ${LOCALBASE}/share/pear/PEAR.php:devel/pear
+BUILD_DEPENDS= ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS= ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR}
USE_PHP= json mbstring sockets
USES= pear php
Index: devel/pear-PHPUnit_MockObject/Makefile
===================================================================
--- devel/pear-PHPUnit_MockObject/Makefile
+++ devel/pear-PHPUnit_MockObject/Makefile
@@ -4,7 +4,6 @@
PORTNAME= PHPUnit_MockObject
PORTVERSION= 4.0.1
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= Mock Object library for PHPUnit
Index: devel/pear-PHP_CodeBrowser/Makefile
===================================================================
--- devel/pear-PHP_CodeBrowser/Makefile
+++ devel/pear-PHP_CodeBrowser/Makefile
@@ -5,7 +5,6 @@
PORTVERSION= 1.0.2
CATEGORIES= devel pear
MASTER_SITES= http://pear.phpunit.de/get/
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= Code browser that augments the code with information
@@ -13,12 +12,12 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine \
- pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
- pear-Log>=1.13.1:sysutils/pear-Log
-RUN_DEPENDS= pear-Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine \
- pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
- pear-Log>=1.13.1:sysutils/pear-Log
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Log>=1.13.1:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Log>=1.13.1:sysutils/pear-Log@${PHP_FLAVOR}
USES= pear php
PEAR_CHANNEL= phpunit
Index: devel/pear-PHP_CodeCoverage/Makefile
===================================================================
--- devel/pear-PHP_CodeCoverage/Makefile
+++ devel/pear-PHP_CodeCoverage/Makefile
@@ -4,7 +4,6 @@
PORTNAME= PHP_CodeCoverage
DISTVERSION= 5.2.2
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= Library that provides PHP code coverage information
@@ -12,15 +11,15 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
- pear-PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream \
- pear-Text_Template>=1.2.0:textproc/pear-Text_Template \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS= pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
- pear-PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream \
- pear-Text_Template>=1.2.0:textproc/pear-Text_Template \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Text_Template>=1.2.0:textproc/pear-Text_Template@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Text_Template>=1.2.0:textproc/pear-Text_Template@${PHP_FLAVOR}
+USES= pear:env
+PEAR_CHANNEL= phpunit
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= php-code-coverage
Index: devel/pear-PHP_Depend/Makefile
===================================================================
--- devel/pear-PHP_Depend/Makefile
+++ devel/pear-PHP_Depend/Makefile
@@ -5,16 +5,12 @@
PORTVERSION= 1.1.2
CATEGORIES= devel pear
MASTER_SITES= http://pear.pdepend.org/get/
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP_Depend design quality metrics for PHP packages
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-
USES= pear
PEAR_CHANNEL= pdepend
USE_PHP= dom tokenizer simplexml
Index: devel/pear-PHP_PMD/Makefile
===================================================================
--- devel/pear-PHP_PMD/Makefile
+++ devel/pear-PHP_PMD/Makefile
@@ -5,7 +5,6 @@
PORTVERSION= 1.5.0
CATEGORIES= devel pear
MASTER_SITES= http://pear.phpmd.org/get/
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP Mess Detector
@@ -13,9 +12,6 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
-
PORTSCOUT= skipv=2.*
USES= pear
Index: devel/pear-PHP_Timer/Makefile
===================================================================
--- devel/pear-PHP_Timer/Makefile
+++ devel/pear-PHP_Timer/Makefile
@@ -4,7 +4,6 @@
PORTNAME= PHP_Timer
PORTVERSION= 1.0.9
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= Utility class for timing
@@ -12,6 +11,7 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= pear:env
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= php-timer
Index: devel/pear-PHP_TokenStream/Makefile
===================================================================
--- devel/pear-PHP_TokenStream/Makefile
+++ devel/pear-PHP_TokenStream/Makefile
@@ -4,13 +4,13 @@
PORTNAME= PHP_TokenStream
PORTVERSION= 1.4.11
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= Wrapper around PHP tokenizer extension
LICENSE= BSD3CLAUSE
+USES= pear:env
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= php-token-stream
Index: devel/pear-PHP_UML/Makefile
===================================================================
--- devel/pear-PHP_UML/Makefile
+++ devel/pear-PHP_UML/Makefile
@@ -10,9 +10,9 @@
LICENSE= LGPL3
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear \
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR} \
${PEARDIR}/Console/CommandLine.php:devel/pear-Console_CommandLine
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear
+RUN_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
BROKEN_powerpc64= fails to package: Signal 11
Index: devel/pear-PhpDocumentor/Makefile
===================================================================
--- devel/pear-PhpDocumentor/Makefile
+++ devel/pear-PhpDocumentor/Makefile
@@ -8,7 +8,7 @@
MAINTAINER= joneum@FreeBSD.org
COMMENT= Provides automatic documenting of php-api from the source
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= pear-PHPDoc-[0-9]*
Index: devel/pear-Pirum/Makefile
===================================================================
--- devel/pear-Pirum/Makefile
+++ devel/pear-Pirum/Makefile
@@ -5,16 +5,12 @@
PORTVERSION= 1.1.5
CATEGORIES= devel www pear
MASTER_SITES= http://pear.pirum-project.org/get/
-PKGNAMEPREFIX= pear-
MAINTAINER= joneum@FreeBSD.org
COMMENT= Simple PEAR channel server manager
LICENSE= MIT
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
-
PEAR_CHANNEL= pirum
USES= pear
Index: devel/pear-SebastianBergmann_FinderFacade/Makefile
===================================================================
--- devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ devel/pear-SebastianBergmann_FinderFacade/Makefile
@@ -4,7 +4,7 @@
PORTNAME= FinderFacade
PORTVERSION= 1.2.2
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-SebastianBergmann_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}SebastianBergmann_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Convenience wrapper for Symfony Finder component
@@ -12,16 +12,16 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument \
- pear-Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder@${PHP_FLAVOR} \
-RUN_DEPENDS= pear-TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument \
- pear-Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder@${PHP_FLAVOR} \
NO_ARCH= yes
+USES= pear:env
+PEAR_CHANNEL= phpunit
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= finder-facade
Index: devel/pear-SebastianBergmann_Git/Makefile
===================================================================
--- devel/pear-SebastianBergmann_Git/Makefile
+++ devel/pear-SebastianBergmann_Git/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-SebastianBergmann_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}SebastianBergmann_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Simple wrapper for Git
@@ -13,9 +13,7 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear>=1.9.4:devel/pear
-RUN_DEPENDS= pear>=1.9.4:devel/pear
-
+USES= pear:env
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= git
Index: devel/pear-SebastianBergmann_PHPCPD/Makefile
===================================================================
--- devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ devel/pear-SebastianBergmann_PHPCPD/Makefile
@@ -4,7 +4,7 @@
PORTNAME= PHPCPD
DISTVERSION= 2.0.0
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-SebastianBergmann_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}SebastianBergmann_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Copy/Paste Detector (CPD) for PHP code
@@ -12,16 +12,15 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools \
- pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \
- pear-PHP_Timer>=1.0.9:devel/pear-PHP_Timer \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS= pear-ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools \
- pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \
- pear-PHP_Timer>=1.0.9:devel/pear-PHP_Timer \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}PHP_Timer>=1.0.9:devel/pear-PHP_Timer@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}PHP_Timer>=1.0.9:devel/pear-PHP_Timer@${PHP_FLAVOR}
-USES= php
+USES= php pear:env
+PEAR_CHANNEL= phpunit
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= ${PORTNAME:tl}
Index: devel/pear-SebastianBergmann_PHPLOC/Makefile
===================================================================
--- devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ devel/pear-SebastianBergmann_PHPLOC/Makefile
@@ -4,7 +4,7 @@
PORTNAME= PHPLOC
DISTVERSION= 4.0.1
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-SebastianBergmann_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}SebastianBergmann_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Tool for quickly measuring the size of a PHP project
@@ -12,13 +12,13 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= pear-Symfony_Component_Console>=2.4.4:devel/pear-Symfony_Component_Console \
- pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \
- pear-SebastianBergmann_Git>=1.2.0:devel/pear-SebastianBergmann_Git \
- pear-SebastianBergmann_Version>=2.0.1:devel/pear-SebastianBergmann_Version \
- pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Symfony_Component_Console>=2.4.4:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}SebastianBergmann_Git>=1.2.0:devel/pear-SebastianBergmann_Git@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}SebastianBergmann_Version>=2.0.1:devel/pear-SebastianBergmann_Version@${PHP_FLAVOR} \
-USES= php
+USES= php pear:env
+PEAR_CHANNEL= phpunit
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= ${PORTNAME:tl}
Index: devel/pear-SebastianBergmann_Version/Makefile
===================================================================
--- devel/pear-SebastianBergmann_Version/Makefile
+++ devel/pear-SebastianBergmann_Version/Makefile
@@ -4,7 +4,7 @@
PORTNAME= Version
DISTVERSION= 2.0.1
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-SebastianBergmann_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}SebastianBergmann_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Managing the version number of Git-hosted PHP projects
@@ -12,10 +12,8 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS= pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-
-USES= php
+USES= pear:env
+PEAR_CHANNEL= phpunit
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= ${PORTNAME:tl}
Index: devel/pear-Symfony_Component_Console/Makefile
===================================================================
--- devel/pear-Symfony_Component_Console/Makefile
+++ devel/pear-Symfony_Component_Console/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 2.4.4
CATEGORIES= devel pear
MASTER_SITES= http://pear.symfony.com/get/
-PKGNAMEPREFIX= pear-Symfony_Component_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}Symfony_Component_
DIST_SUBDIR= Symfony2
MAINTAINER= wg@FreeBSD.org
@@ -13,9 +13,6 @@
LICENSE= MIT
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-
USES= pear
PEAR_CHANNEL= symfony2
Index: devel/pear-Symfony_Component_Finder/Makefile
===================================================================
--- devel/pear-Symfony_Component_Finder/Makefile
+++ devel/pear-Symfony_Component_Finder/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 2.4.4
CATEGORIES= devel pear
MASTER_SITES= http://pear.symfony.com/get/
-PKGNAMEPREFIX= pear-Symfony_Component_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}Symfony_Component_
DIST_SUBDIR= Symfony2
MAINTAINER= joneum@FreeBSD.org
@@ -13,9 +13,6 @@
LICENSE= MIT
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-
USES= pear
PEAR_CHANNEL= symfony2
Index: devel/pear-TheSeer_DirectoryScanner/Makefile
===================================================================
--- devel/pear-TheSeer_DirectoryScanner/Makefile
+++ devel/pear-TheSeer_DirectoryScanner/Makefile
@@ -4,7 +4,7 @@
PORTNAME= DirectoryScanner
PORTVERSION= 1.3.2
CATEGORIES= devel pear
-PKGNAMEPREFIX= pear-TheSeer_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}TheSeer_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Recursive directory scanner and filter
@@ -12,15 +12,14 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-channel-theseer>=20120501:devel/pear-channel-theseer
-RUN_DEPENDS= pear-channel-theseer>=20120501:devel/pear-channel-theseer
-
+USES= php:flavors pear:env
USE_GITHUB= yes
GH_ACCOUNT= theseer
GH_PROJECT= DirectoryScanner
USE_PHP= fileinfo
PEAR_CHANNEL= theseer
+PEAR_CHANNEL_VER= >=20120501
NO_BUILD= yes
Index: devel/pear-TheSeer_fDOMDocument/Makefile
===================================================================
--- devel/pear-TheSeer_fDOMDocument/Makefile
+++ devel/pear-TheSeer_fDOMDocument/Makefile
@@ -4,7 +4,7 @@
PORTNAME= fDOMDocument
PORTVERSION= 1.6.6
CATEGORIES= devel www pear
-PKGNAMEPREFIX= pear-TheSeer_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}TheSeer_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Extension to PHP standard DOM
@@ -12,15 +12,14 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-channel-theseer>=20120501:devel/pear-channel-theseer
-RUN_DEPENDS= pear-channel-theseer>=20120501:devel/pear-channel-theseer
-
+USES= php:flavors pear:env
USE_GITHUB= yes
GH_ACCOUNT= theseer
GH_PROJECT= fDOMDocument
USE_PHP= dom xml
PEAR_CHANNEL= theseer
+PEAR_CHANNEL_VER= >=20120501
NO_BUILD= yes
Index: devel/pear-TheSeer_fXSL/Makefile
===================================================================
--- devel/pear-TheSeer_fXSL/Makefile
+++ devel/pear-TheSeer_fXSL/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 1.1.0
CATEGORIES= devel pear
MASTER_SITES= http://pear.netpirates.net/get/
-PKGNAMEPREFIX= pear-TheSeer_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}TheSeer_
EXTRACT_SUFX= .tgz
MAINTAINER= joneum@FreeBSD.org
@@ -13,9 +13,6 @@
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
-
BROKEN_powerpc64= fails to package: Signal 11
USE_PHP= dom xml xsl
Index: devel/pear-TheSeer_phpDox/Makefile
===================================================================
--- devel/pear-TheSeer_phpDox/Makefile
+++ devel/pear-TheSeer_phpDox/Makefile
@@ -5,23 +5,23 @@
PORTVERSION= 0.5.0
CATEGORIES= devel pear
MASTER_SITES= http://pear.netpirates.net/get/
-PKGNAMEPREFIX= pear-TheSeer_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}TheSeer_
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP Documentation generation framework and tool
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
- pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
- pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
- pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
- pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
-RUN_DEPENDS= pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
- pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
- pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
- pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
- pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+ ${PEAR_PKGNAMEPREFIX}pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection@${PHP_FLAVOR}
USE_PHP= dom tokenizer xsl iconv
PEAR_CHANNEL= theseer
Index: devel/pear-Validate_Finance/Makefile
===================================================================
--- devel/pear-Validate_Finance/Makefile
+++ devel/pear-Validate_Finance/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR Finance Validation class
-BUILD_DEPENDS= pear-Validate>=0.5.0:devel/pear-Validate
-RUN_DEPENDS= pear-Validate>=0.5.0:devel/pear-Validate
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
USES= pear
Index: devel/pear-Validate_US/Makefile
===================================================================
--- devel/pear-Validate_US/Makefile
+++ devel/pear-Validate_US/Makefile
@@ -8,8 +8,8 @@
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR data validation class for US
-BUILD_DEPENDS= pear-Validate>=0.5.0:devel/pear-Validate
-RUN_DEPENDS= pear-Validate>=0.5.0:devel/pear-Validate
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
USES= pear
Index: devel/pear-VersionControl_SVN/Makefile
===================================================================
--- devel/pear-VersionControl_SVN/Makefile
+++ devel/pear-VersionControl_SVN/Makefile
@@ -10,8 +10,8 @@
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
-RUN_DEPENDS= pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}XML_Parser>=1.3.4:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}XML_Parser>=1.3.4:devel/pear-XML_Parser@${PHP_FLAVOR}
USES= pear
Index: devel/pear-channel-doctrine/Makefile
===================================================================
--- devel/pear-channel-doctrine/Makefile
+++ devel/pear-channel-doctrine/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.doctrine-project.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-ezc/Makefile
===================================================================
--- devel/pear-channel-ezc/Makefile
+++ devel/pear-channel-ezc/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= components.ez.no
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-horde/Makefile
===================================================================
--- devel/pear-channel-horde/Makefile
+++ devel/pear-channel-horde/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.horde.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-htmlpurifier/Makefile
===================================================================
--- devel/pear-channel-htmlpurifier/Makefile
+++ devel/pear-channel-htmlpurifier/Makefile
@@ -13,6 +13,5 @@
PEAR_CHANNEL_HOST= htmlpurifier.org
PEAR_CHANNEL_ALIAS= hp
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-openpear/Makefile
===================================================================
--- devel/pear-channel-openpear/Makefile
+++ devel/pear-channel-openpear/Makefile
@@ -11,6 +11,5 @@
PEAR_CHANNEL_HOST= openpear.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-pdepend/Makefile
===================================================================
--- devel/pear-channel-pdepend/Makefile
+++ devel/pear-channel-pdepend/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.pdepend.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phing/Makefile
===================================================================
--- devel/pear-channel-phing/Makefile
+++ devel/pear-channel-phing/Makefile
@@ -9,6 +9,5 @@
PEAR_CHANNEL_HOST= pear.phing.info
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phpdoc/Makefile
===================================================================
--- devel/pear-channel-phpdoc/Makefile
+++ devel/pear-channel-phpdoc/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.phpdoc.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phpmd/Makefile
===================================================================
--- devel/pear-channel-phpmd/Makefile
+++ devel/pear-channel-phpmd/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.phpmd.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phpunit/Makefile
===================================================================
--- devel/pear-channel-phpunit/Makefile
+++ devel/pear-channel-phpunit/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.phpunit.de
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-pirum/Makefile
===================================================================
--- devel/pear-channel-pirum/Makefile
+++ devel/pear-channel-pirum/Makefile
@@ -11,6 +11,5 @@
PEAR_CHANNEL_HOST= pear.pirum-project.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-symfony/Makefile
===================================================================
--- devel/pear-channel-symfony/Makefile
+++ devel/pear-channel-symfony/Makefile
@@ -10,6 +10,5 @@
PEAR_CHANNEL_HOST= pear.symfony-project.com
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-symfony2/Makefile
===================================================================
--- devel/pear-channel-symfony2/Makefile
+++ devel/pear-channel-symfony2/Makefile
@@ -11,6 +11,5 @@
PEAR_CHANNEL_HOST= pear.symfony.com
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-theseer/Makefile
===================================================================
--- devel/pear-channel-theseer/Makefile
+++ devel/pear-channel-theseer/Makefile
@@ -11,6 +11,5 @@
PEAR_CHANNEL_HOST= pear.netpirates.net
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-twig/Makefile
===================================================================
--- devel/pear-channel-twig/Makefile
+++ devel/pear-channel-twig/Makefile
@@ -11,6 +11,5 @@
PEAR_CHANNEL_HOST= pear.twig-project.org
-.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-ezc_Base/Makefile
===================================================================
--- devel/pear-ezc_Base/Makefile
+++ devel/pear-ezc_Base/Makefile
@@ -5,16 +5,13 @@
PORTVERSION= 1.8
CATEGORIES= devel pear
MASTER_SITES= http://components.ez.no/get/
-PKGNAMEPREFIX= pear-${PEAR_CHANNEL}_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}${PEAR_CHANNEL}_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Base package that all ezc components packages rely on
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
-RUN_DEPENDS= ${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
-
PEAR_CHANNEL= ezc
USES= pear
Index: devel/pear-ezc_ConsoleTools/Makefile
===================================================================
--- devel/pear-ezc_ConsoleTools/Makefile
+++ devel/pear-ezc_ConsoleTools/Makefile
@@ -5,17 +5,15 @@
PORTVERSION= 1.6.1
CATEGORIES= devel pear
MASTER_SITES= http://components.ez.no/get/
-PKGNAMEPREFIX= pear-${PEAR_CHANNEL}_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}${PEAR_CHANNEL}_
MAINTAINER= joneum@FreeBSD.org
COMMENT= Set of classes to do different actions with the console
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear-ezc_Base>=1.8:devel/pear-ezc_Base \
- ${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
-RUN_DEPENDS= pear-ezc_Base>=1.8:devel/pear-ezc_Base \
- ${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}ezc_Base>=1.8:devel/pear-ezc_Base@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}ezc_Base>=1.8:devel/pear-ezc_Base@${PHP_FLAVOR}
PEAR_CHANNEL= ezc
USES= pear
Index: devel/pear-htmlpurifier/Makefile
===================================================================
--- devel/pear-htmlpurifier/Makefile
+++ devel/pear-htmlpurifier/Makefile
@@ -8,17 +8,14 @@
MASTER_SITES= http://htmlpurifier.org/get/ \
LOCAL
DISTNAME= HTMLPurifier-${PORTVERSION}
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= feld@FreeBSD.org
COMMENT= PHP HTML filter library
LICENSE= LGPL21
-BUILD_DEPENDS= ${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier
-RUN_DEPENDS= ${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier
-
-PEAR_CHANNEL= htmlpurifier.org
+PEAR_CHANNEL= htmlpurifier
USES= pear
NO_ARCH= yes
Index: devel/pear-pdepend-staticReflection/Makefile
===================================================================
--- devel/pear-pdepend-staticReflection/Makefile
+++ devel/pear-pdepend-staticReflection/Makefile
@@ -5,16 +5,13 @@
PORTVERSION= 1.0.0
CATEGORIES= devel pear
MASTER_SITES= http://pear.pdepend.org/get/
-PKGNAMEPREFIX= pear-${PEAR_CHANNEL}_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}${PEAR_CHANNEL}_
MAINTAINER= joneum@FreeBSD.org
COMMENT= staticReflection package for PHP
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-
USE_PHP= tokenizer
PEAR_CHANNEL= pdepend
USES= pear
Index: devel/pear-phing/Makefile
===================================================================
--- devel/pear-phing/Makefile
+++ devel/pear-phing/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 2.6.1
CATEGORIES= devel pear
MASTER_SITES= http://pear.phing.info/get/
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= mm@FreeBSD.org
COMMENT= PHP project build system based on Apache Ant
@@ -14,7 +14,4 @@
PEAR_CHANNEL= phing
USES= pear
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
-
.include <bsd.port.mk>
Index: devel/pear/Makefile
===================================================================
--- devel/pear/Makefile
+++ devel/pear/Makefile
@@ -6,13 +6,14 @@
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://mirror.bsdproject.de/
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR framework for PHP
LICENSE= PHP301
-USES= cpe php:cli tar:bzip2
+USES= cpe php:cli,flavors tar:bzip2
CPE_VENDOR= php
NO_BUILD= yes
NO_ARCH= yes
Index: devel/pear/bsd.pear.channel.mk
===================================================================
--- devel/pear/bsd.pear.channel.mk
+++ devel/pear/bsd.pear.channel.mk
@@ -2,20 +2,22 @@
#
# Common code for PEAR channels
-PKGNAMEPREFIX?= pear-channel-
+PKGNAMEPREFIX?= ${PEAR_PKGNAMEPREFIX}channel-
MASTER_SITES?= #no master sites
DISTFILES?= #no distfiles
-BUILD_DEPENDS?= ${LOCALBASE}/bin/pear:devel/pear
-RUN_DEPENDS?= ${LOCALBASE}/bin/pear:devel/pear
+USES+= pear:env
+
+BUILD_DEPENDS?= ${LOCALBASE}/bin/pear:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS?= ${LOCALBASE}/bin/pear:devel/pear@${PHP_FLAVOR}
NO_BUILD?= yes
LPEARDIR?= share/pear
PEAR_CHANNEL_ALIAS?= ${PORTNAME}
-PEAR_CHANNEL_REG?= ${FILESDIR}/${PEAR_CHANNEL_HOST}.reg
+PEAR_CHANNEL_REG?= ${.CURDIR}/files/${PEAR_CHANNEL_HOST}.reg
PLIST_FILES= ${LPEARDIR}/.channels/.alias/${PEAR_CHANNEL_ALIAS}.txt \
${LPEARDIR}/.channels/${PEAR_CHANNEL_HOST}.reg
Index: graphics/pear-Horde_Image/Makefile
===================================================================
--- graphics/pear-Horde_Image/Makefile
+++ graphics/pear-Horde_Image/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Horde_Image
PORTVERSION= 2.5.2
CATEGORIES= graphics www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Image API
Index: lang/php56/Makefile.ext
===================================================================
--- lang/php56/Makefile.ext
+++ lang/php56/Makefile.ext
@@ -1,6 +1,6 @@
COMMENT= The ${PHP_MODNAME} shared extension for php
-USES+= php:ext
+USES+= php:ext,noflavors
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
PHP_VER= 56
IGNORE_WITH_PHP= 70
Index: lang/php70/Makefile.ext
===================================================================
--- lang/php70/Makefile.ext
+++ lang/php70/Makefile.ext
@@ -2,7 +2,7 @@
COMMENT= The ${PHP_MODNAME} shared extension for php
-USES+= php:ext
+USES+= php:ext,noflavors
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
PHP_VER= 70
IGNORE_WITH_PHP= 56
Index: lang/php71/Makefile.ext
===================================================================
--- lang/php71/Makefile.ext
+++ lang/php71/Makefile.ext
@@ -2,7 +2,7 @@
COMMENT= The ${PHP_MODNAME} shared extension for php
-USES+= php:ext
+USES+= php:ext,noflavors
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
PHP_VER= 71
IGNORE_WITH_PHP= 55 56 70
Index: lang/php72/Makefile.ext
===================================================================
--- lang/php72/Makefile.ext
+++ lang/php72/Makefile.ext
@@ -2,7 +2,7 @@
COMMENT= The ${PHP_MODNAME} shared extension for php
-USES+= php:ext
+USES+= php:ext,noflavors
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
PHP_VER= 72
IGNORE_WITH_PHP= 56 70 71
Index: mail/pear-Horde_Imap_Client/Makefile
===================================================================
--- mail/pear-Horde_Imap_Client/Makefile
+++ mail/pear-Horde_Imap_Client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Horde_Imap_Client
PORTVERSION= 2.29.15
CATEGORIES= mail www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde IMAP abstraction interface
Index: mail/pear-Horde_Mapi/Makefile
===================================================================
--- mail/pear-Horde_Mapi/Makefile
+++ mail/pear-Horde_Mapi/Makefile
@@ -4,7 +4,7 @@
PORTVERSION= 1.0.8
PORTREVISION= 1
CATEGORIES= mail www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde MAPI utility library
Index: mail/pear-Horde_Smtp/Makefile
===================================================================
--- mail/pear-Horde_Smtp/Makefile
+++ mail/pear-Horde_Smtp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Horde_Smtp
PORTVERSION= 1.9.5
CATEGORIES= mail www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde SMTP Client
Index: net-mgmt/phpipam/Makefile
===================================================================
--- net-mgmt/phpipam/Makefile
+++ net-mgmt/phpipam/Makefile
@@ -11,7 +11,7 @@
LICENSE= GPLv3
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: net-mgmt/phpweathermap/Makefile
===================================================================
--- net-mgmt/phpweathermap/Makefile
+++ net-mgmt/phpweathermap/Makefile
@@ -14,7 +14,7 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear \
+RUN_DEPENDS= ${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear@${PHP_FLAVOR} \
rrdtool:databases/rrdtool
NO_BUILD= yes
Index: net/pear-Horde_Kolab_Server/Makefile
===================================================================
--- net/pear-Horde_Kolab_Server/Makefile
+++ net/pear-Horde_Kolab_Server/Makefile
@@ -4,7 +4,7 @@
PORTNAME= Horde_Kolab_Server
DISTVERSION= 2.0.5
CATEGORIES= net www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for manipulating the Kolab user database
Index: security/pear-Auth_SASL/Makefile
===================================================================
--- security/pear-Auth_SASL/Makefile
+++ security/pear-Auth_SASL/Makefile
@@ -10,7 +10,7 @@
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear-Auth>=0:security/pear-Auth
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Auth>=0:security/pear-Auth@${PHP_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
Index: security/pear-Crypt_GPG/Makefile
===================================================================
--- security/pear-Crypt_GPG/Makefile
+++ security/pear-Crypt_GPG/Makefile
@@ -11,7 +11,7 @@
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pear-Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine
+BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine@${PHP_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
Index: security/pear-Horde_Crypt/Makefile
===================================================================
--- security/pear-Horde_Crypt/Makefile
+++ security/pear-Horde_Crypt/Makefile
@@ -4,7 +4,7 @@
PORTNAME= Horde_Crypt
DISTVERSION= 2.7.11
CATEGORIES= security www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Cryptography API
Index: security/pear-Horde_Crypt_Blowfish/Makefile
===================================================================
--- security/pear-Horde_Crypt_Blowfish/Makefile
+++ security/pear-Horde_Crypt_Blowfish/Makefile
@@ -4,7 +4,7 @@
PORTNAME= Horde_Crypt_Blowfish
PORTVERSION= 1.1.2
CATEGORIES= security www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde blowfish encryption for PHP string data
Index: sysutils/pear-Horde_Log/Makefile
===================================================================
--- sysutils/pear-Horde_Log/Makefile
+++ sysutils/pear-Horde_Log/Makefile
@@ -4,7 +4,7 @@
PORTNAME= Horde_Log
PORTVERSION= 2.3.0
CATEGORIES= sysutils www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Logging library
Index: sysutils/pear-Horde_Vfs/Makefile
===================================================================
--- sysutils/pear-Horde_Vfs/Makefile
+++ sysutils/pear-Horde_Vfs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Horde_Vfs
PORTVERSION= 2.4.0
CATEGORIES= sysutils www pear
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Virtual File System API
Index: textproc/pear-Symfony_Component_Yaml/Makefile
===================================================================
--- textproc/pear-Symfony_Component_Yaml/Makefile
+++ textproc/pear-Symfony_Component_Yaml/Makefile
@@ -5,7 +5,7 @@
PORTVERSION= 2.4.4
CATEGORIES= textproc pear
MASTER_SITES= http://pear.symfony.com/get/
-PKGNAMEPREFIX= pear-Symfony_Component_
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}Symfony_Component_
DIST_SUBDIR= Symfony2
MAINTAINER= joneum@FreeBSD.org
@@ -13,9 +13,6 @@
LICENSE= MIT
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-
USES= pear
PEAR_CHANNEL= symfony2
Index: textproc/pear-Text_Template/Makefile
===================================================================
--- textproc/pear-Text_Template/Makefile
+++ textproc/pear-Text_Template/Makefile
@@ -5,14 +5,11 @@
PORTVERSION= 1.2.0
CATEGORIES= textproc www pear
MASTER_SITES= http://pear.phpunit.de/get/
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= joneum@FreeBSD.org
COMMENT= Simple template engine
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-
USES= pear
PEAR_CHANNEL= phpunit
Index: textproc/pear-YAML/Makefile
===================================================================
--- textproc/pear-YAML/Makefile
+++ textproc/pear-YAML/Makefile
@@ -5,14 +5,11 @@
PORTVERSION= 1.0.6
CATEGORIES= textproc www pear
MASTER_SITES= http://pear.symfony-project.com/get/
-PKGNAMEPREFIX= pear-
+PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
MAINTAINER= joneum@FreeBSD.org
COMMENT= The Symfony YAML Component
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony
-
USES= pear
PEAR_CHANNEL= symfony
Index: www/ilias/Makefile
===================================================================
--- www/ilias/Makefile
+++ www/ilias/Makefile
@@ -14,7 +14,7 @@
RUN_DEPENDS= convert:graphics/ImageMagick \
zip:archivers/zip \
${UNZIP_CMD}:archivers/unzip \
- ${LOCALBASE}/share/pear/PEAR.php:devel/pear \
+ ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \
${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth \
${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2 \
${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT
Index: www/nibbleblog/Makefile
===================================================================
--- www/nibbleblog/Makefile
+++ www/nibbleblog/Makefile
@@ -11,7 +11,7 @@
MAINTAINER= marekholienka@gmail.com
COMMENT= Lightweight blog system for general use
-RUN_DEPENDS= pear:devel/pear
+RUN_DEPENDS= pear:devel/pear@${PHP_FLAVOR}
USES= cpe php zip
NO_BUILD= yes
Index: www/pear-twig/Makefile
===================================================================
--- www/pear-twig/Makefile
+++ www/pear-twig/Makefile
@@ -13,9 +13,6 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
-
USES= pear php:cli
PEAR_CHANNEL= twig
NO_ARCH= yes
Index: www/php-screw/Makefile
===================================================================
--- www/php-screw/Makefile
+++ www/php-screw/Makefile
@@ -1,11 +1,12 @@
# Created by: Alex Dupre <sysadmin@alexdupre.com>
# $FreeBSD$
-PORTNAME= php-screw
+PORTNAME= screw
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= www security
MASTER_SITES= SF/${PORTNAME}/OldFiles
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= php_screw-${PORTVERSION}
EXTRACT_SUFX= .tgz
Index: www/php-templates/Makefile
===================================================================
--- www/php-templates/Makefile
+++ www/php-templates/Makefile
@@ -1,12 +1,13 @@
# Created by: vanilla
# $FreeBSD$
-PORTNAME= php-templates
+PORTNAME= templates
PORTVERSION= 1.7.2
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.7:ext \
SF/${PORTNAME}/${PORTNAME}-doc/html:doc
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= php_templates-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:ext
DISTFILES+= php_templates-doc-eng-1.1${EXTRACT_SUFX}:doc
Index: www/phpbb/Makefile
===================================================================
--- www/phpbb/Makefile
+++ www/phpbb/Makefile
@@ -12,7 +12,7 @@
LICENSE= GPLv2
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
CONFLICTS= phpbb-tw-[0-9]*
Index: www/wordpress/Makefile
===================================================================
--- www/wordpress/Makefile
+++ www/wordpress/Makefile
@@ -16,7 +16,7 @@
NO_ARCH= yes
NO_BUILD= yes
-USES= php:web cpe
+USES= php:web,flavors,optsuffix cpe
USE_PHP= curl gd hash mysqli pcre tokenizer xml zip zlib ftp
WRKSRC= ${WRKDIR}/${PORTNAME}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Apr 25, 5:52 AM (4 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32112047
Default Alt Text
D14208.id38939.diff (63 KB)
Attached To
Mode
D14208: PHP Flavors.
Attached
Detach File
Event Timeline
Log In to Comment