diff options
| author | obache <obache> | 2010-10-06 07:52:47 +0000 |
|---|---|---|
| committer | obache <obache> | 2010-10-06 07:52:47 +0000 |
| commit | c16094ab36c8f797b356253d39fdcd07a4e22477 (patch) | |
| tree | ed806e69588532ecb808061f936988d78cd13b7c | |
| parent | 70cdd64f27151253682874cc6773cb155b78c93d (diff) | |
| download | pkgsrc-c16094ab36c8f797b356253d39fdcd07a4e22477.tar.gz | |
Change exactly dependency on php for
* PKG_PHP_VERSION=5, not accept lang/php53 package.
* PKG_PHP_VERSION=53, not try to install lang/php5
| -rw-r--r-- | www/drupal/Makefile | 16 | ||||
| -rw-r--r-- | www/drupal6/Makefile | 13 |
2 files changed, 17 insertions, 12 deletions
diff --git a/www/drupal/Makefile b/www/drupal/Makefile index 0e2eaae96a7..dbcf74133d9 100644 --- a/www/drupal/Makefile +++ b/www/drupal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2010/09/30 08:02:56 obache Exp $ +# $NetBSD: Makefile,v 1.47 2010/10/06 07:52:47 obache Exp $ DISTNAME= drupal-5.22 PKGREVISION= 1 @@ -12,9 +12,16 @@ LICENSE= gnu-gpl-v2 CONFLICTS+= drupal-6.*{,nb*} +PKG_DESTDIR_SUPPORT= user-destdir + +.include "../../mk/apachever.mk" +.include "../../lang/php/phpversion.mk" + DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd -DEPENDS+= php>=5.2.4:../../lang/php5 +.if ${PKG_PHP_VERSION} == "5" +DEPENDS+= php>=5.2.4<5.3:../../lang/php5 +.endif NO_BUILD= YES DRUPAL= ${PREFIX}/share/drupal @@ -45,11 +52,6 @@ SUBST_FILES.conf= drupal.conf SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" SUBST_MESSAGE.conf= Fixing configuration files. -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../mk/apachever.mk" -.include "../../lang/php/phpversion.mk" - .include "options.mk" post-extract: diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile index 873e39c38e5..a5c56732255 100644 --- a/www/drupal6/Makefile +++ b/www/drupal6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2010/09/30 08:20:24 obache Exp $ +# $NetBSD: Makefile,v 1.24 2010/10/06 07:52:47 obache Exp $ DISTNAME= drupal-6.18 PKGREVISION= 1 @@ -12,7 +12,13 @@ LICENSE= gnu-gpl-v2 CONFLICTS+= drupal-5.*{,nb*} -DEPENDS+= php>=5.2.0:../../lang/php5 +PKG_DESTDIR_SUPPORT= user-destdir + +.include "../../lang/php/phpversion.mk" + +.if ${PKG_PHP_VERSION} == "5" +DEPENDS+= php>=5.2.0<5.3:../../lang/php5 +.endif DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd NO_BUILD= YES @@ -55,9 +61,6 @@ SUBST_MESSAGE.conf= Fixing configuration files. INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \ share/doc/drupal share/examples/drupal -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../lang/php/phpversion.mk" .include "options.mk" |