Remove the case of PKG_PHP_VERSION is 4.

No functional change.

6 files changed, 8 insertions, 31 deletions

diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index c4cc97ed2f2..d6e2bcaa31e 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2010/03/04 01:29:39 taca Exp $
+# $NetBSD: Makefile,v 1.45 2010/03/15 16:48:53 taca Exp $
 
 DISTNAME=	drupal-5.22
 CATEGORIES=	www
@@ -13,6 +13,7 @@ CONFLICTS+=	drupal-6.*{,nb*}
 
 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
 
 NO_BUILD=	YES
 DRUPAL=		${PREFIX}/share/drupal
@@ -48,10 +49,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/apachever.mk"
 .include "../../lang/php/phpversion.mk"
 
-.if ${PKG_PHP_VERSION} == "5"
-DEPENDS+=	php>=5.2.4:../../lang/php5
-.endif
-
 .include "options.mk"
 
 post-extract:
diff --git a/www/drupal/options.mk b/www/drupal/options.mk
index 5e229b8e533..0d25957bfdf 100644
--- a/www/drupal/options.mk
+++ b/www/drupal/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2010/03/15 16:48:53 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -29,9 +29,5 @@ 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
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
 
 ###
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 15531719795..142d3f6e62c 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2010/02/16 16:08:59 joerg Exp $
+# $NetBSD: Makefile,v 1.67 2010/03/15 16:48:53 taca Exp $
 
 DISTNAME=	horde-3.3.6
 PKGREVISION=	1
@@ -24,11 +24,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
-.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
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find
diff --git a/www/wordpress/options.mk b/www/wordpress/options.mk
index 8ddd86f6157..6dc25d8b84e 100644
--- a/www/wordpress/options.mk
+++ b/www/wordpress/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/04/06 11:31:02 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2010/03/15 16:48:53 taca Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wordpress
 
@@ -10,12 +10,7 @@ PKG_SUGGESTED_OPTIONS=		ap-php
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mphp-cgi)
-.  if ${PKG_PHP_VERSION} == "4"
-DEPENDS+=	php>=4.4.7:../../www/php4
-.  endif
-.  if ${PKG_PHP_VERSION} == "5"
 DEPENDS+=	php>=5.2.4:../../lang/php5
-.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Map-php)