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 /www/drupal/options.mk | |
| 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 'www/drupal/options.mk')
| -rw-r--r-- | www/drupal/options.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/drupal/options.mk b/www/drupal/options.mk index c057fdea091..5e229b8e533 100644 --- a/www/drupal/options.mk +++ b/www/drupal/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2006/05/28 14:46:47 adrianp Exp $ +# $NetBSD: options.mk,v 1.3 2006/06/02 18:28:00 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.drupal @@ -15,13 +15,13 @@ PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices ### .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" -DEPENDS+= php-pgsql-[0-9]*:../../databases/php-pgsql +DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql .elif !empty(PKG_OPTIONS:Mmysql) ### ### Use MySQL for storing Drupal data ### . include "../../mk/mysql.buildlink3.mk" -DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql .endif ### @@ -30,8 +30,8 @@ DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql ### .if !empty(PKG_OPTIONS:Mdrupal-xmlservices) . if ${PKG_PHP_VERSION} == "4" -DEPENDS+= php-domxml>=4.3.3:../../textproc/php4-domxml +DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml . elif ${PKG_PHP_VERSION} == "5" -DEPENDS+= php-dom-[0-9]*:../../textproc/php5-dom +DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom . endif .endif |