diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-02 18:27:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-02 18:27:54 +0000 |
| commit | 337c6b1297ecf0ce92e4814030662b8352b54ab4 (patch) | |
| tree | b7f585bd5e2d200a0004ced04920ab0be7a7445a /lang | |
| parent | 8757488bf5f26f41ea12d0d61cd79d3a80c7dceb (diff) | |
| download | pkgsrc-337c6b1297ecf0ce92e4814030662b8352b54ab4.tar.gz | |
Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*,
all PEAR packages to php?-pear-* and all Apache packages to ap13-* or
ap2-* respectively. Add new variables to simplify the Makefile
handling. Add CONFLICTS on the old names. Reset revisions of bumped
packages. ap-php will now depend on the default Apache and PHP version.
All programs using it have an implicit option of the Apache version
as well.
OK from jlam@ and adrianp@.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php/ext.mk | 6 | ||||
| -rw-r--r-- | lang/php/pear.mk | 4 | ||||
| -rw-r--r-- | lang/php/phpversion.mk | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lang/php/ext.mk b/lang/php/ext.mk index 835ba4868b1..eb2555df87f 100644 --- a/lang/php/ext.mk +++ b/lang/php/ext.mk @@ -1,4 +1,4 @@ -# $NetBSD: ext.mk,v 1.14 2006/06/01 17:44:21 jlam Exp $ +# $NetBSD: ext.mk,v 1.15 2006/06/02 18:27:56 joerg Exp $ # # PHP extension package framework, for both PECL and bundled PHP extensions. # @@ -23,13 +23,13 @@ PLIST_SUBST+= MODNAME=${PKGMODNAME} .if !defined(PECL_VERSION) # bundled extension -PKGNAME?= php-${MODNAME}-${PHP_BASE_VERS} +PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS} EXTRACT_ELEMENTS?= ${DISTNAME}/ext/${PKGMODNAME} WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS} DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo .else # PECL extension -PKGNAME?= php-${MODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} +PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.${PECL_VERSION} MASTER_SITES?= http://pecl.php.net/get/ PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION} DISTNAME= ${PECL_DISTNAME} diff --git a/lang/php/pear.mk b/lang/php/pear.mk index a9dc9d5532e..1a6c36ef9c0 100644 --- a/lang/php/pear.mk +++ b/lang/php/pear.mk @@ -1,4 +1,4 @@ -# $NetBSD: pear.mk,v 1.8 2005/09/28 21:46:24 rillig Exp $ +# $NetBSD: pear.mk,v 1.9 2006/06/02 18:27:56 joerg Exp $ # # This Makefile fragment is intended to be included by packages that build # and install pear packages. @@ -18,7 +18,7 @@ _PEAR_PACKAGE_MK= # defined EXTRACT_SUFX= .tgz -PKGNAME= pear-${DISTNAME} +PKGNAME= ${PHP_PKG_PREFIX}-pear-${DISTNAME} CATEGORIES+= www MASTER_SITE_PEAR_PACKAGE+= \ diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 101a148d738..596eef551df 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.4 2006/05/09 10:06:34 tron Exp $ +# $NetBSD: phpversion.mk,v 1.5 2006/06/02 18:27:56 joerg Exp $ # PHP wrapper, for module builds .if !defined(PHPVERSION_MK) @@ -71,9 +71,11 @@ PHP_VERSION_REQD:= ${PKG_PHP_VERSION} # set variables for the version we decided to use: # .if ${_PHP_VERSION} == "4" -PHPPKGSRCDIR= ../../www/php4 +PHPPKGSRCDIR= ../../www/php4 +PHP_PKG_PREFIX= php4 .elif ${_PHP_VERSION} == "5" -PHPPKGSRCDIR= ../../lang/php5 +PHPPKGSRCDIR= ../../lang/php5 +PHP_PKG_PREFIX= php5 .else # force an error PKG_SKIP_REASON+= "${PKG_PHP} is not a valid package" |