diff options
| author | taca <taca@pkgsrc.org> | 2010-03-15 16:48:53 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2010-03-15 16:48:53 +0000 |
| commit | 0e9936fbeefe5643976cfa76ef1ce6a8de1db36d (patch) | |
| tree | 82f73c5e6fda13995d5cc8f9dd6b27863c341700 /www/drupal6 | |
| parent | 7e9290b8e535f3225aa136560c7c7b15f5bb99bd (diff) | |
| download | pkgsrc-0e9936fbeefe5643976cfa76ef1ce6a8de1db36d.tar.gz | |
Remove the case of PKG_PHP_VERSION is 4.
No functional change.
Diffstat (limited to 'www/drupal6')
| -rw-r--r-- | www/drupal6/Makefile | 7 | ||||
| -rw-r--r-- | www/drupal6/options.mk | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile index 32369c64503..e01ed534c26 100644 --- a/www/drupal6/Makefile +++ b/www/drupal6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/03/04 01:29:58 taca Exp $ +# $NetBSD: Makefile,v 1.20 2010/03/15 16:48:53 taca Exp $ DISTNAME= drupal-6.16 CATEGORIES= www @@ -11,6 +11,7 @@ LICENSE= gnu-gpl-v2 CONFLICTS+= drupal-5.*{,nb*} +DEPENDS+= php>=5.2.0:../../lang/php5 DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd NO_BUILD= YES @@ -57,10 +58,6 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../lang/php/phpversion.mk" -.if ${PKG_PHP_VERSION} == "5" -DEPENDS+= php>=5.2.0:../../lang/php5 -.endif - .include "options.mk" OWN_DIRS= share/drupal/sites/default diff --git a/www/drupal6/options.mk b/www/drupal6/options.mk index 4338d1743a5..fc043612d45 100644 --- a/www/drupal6/options.mk +++ b/www/drupal6/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2009/02/16 21:02:26 adrianp Exp $ +# $NetBSD: options.mk,v 1.4 2010/03/15 16:48:53 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.drupal @@ -29,11 +29,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql ### syndication. ### .if !empty(PKG_OPTIONS:Mdrupal-xmlservices) -. if ${PKG_PHP_VERSION} == "4" -DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml -. elif ${PKG_PHP_VERSION} == "5" DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom -. endif .endif ### |