Switch to the new PHP infrastructure.

Submitted by:	maintainer

10 files changed, 64 insertions, 122 deletions

diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 48e6fdf0d0f5..1532103513d9 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/kronolith/	\
 		http://ftp.horde.org/pub/kronolith/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
 RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
@@ -26,6 +26,7 @@ RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NO_BUILD=	yes
+USE_PHP=	mcal
 USE_REINPLACE=	yes
 
 .if defined(WITH_APACHE2)
@@ -55,14 +56,6 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 post-patch:
 	@${RM} ${WRKSRC}/config/conf.php.dist.orig
 
-pre-install:
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mcal.0" ; then \
-	  ${ECHO_MSG} "" ; \
-	  ${ECHO_MSG} "Please configure PHP and Horde with MCAL support enabled." ; \
-	  ${ECHO_MSG} "" ; \
-	  ${FALSE} ; \
-	fi
-
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
 .for REP in ${SUB_DIRS}
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index 48e6fdf0d0f5..1532103513d9 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/kronolith/	\
 		http://ftp.horde.org/pub/kronolith/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
 RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
@@ -26,6 +26,7 @@ RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NO_BUILD=	yes
+USE_PHP=	mcal
 USE_REINPLACE=	yes
 
 .if defined(WITH_APACHE2)
@@ -55,14 +56,6 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 post-patch:
 	@${RM} ${WRKSRC}/config/conf.php.dist.orig
 
-pre-install:
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mcal.0" ; then \
-	  ${ECHO_MSG} "" ; \
-	  ${ECHO_MSG} "Please configure PHP and Horde with MCAL support enabled." ; \
-	  ${ECHO_MSG} "" ; \
-	  ${FALSE} ; \
-	fi
-
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
 .for REP in ${SUB_DIRS}
diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index 48e6fdf0d0f5..1532103513d9 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/kronolith/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/kronolith/	\
 		http://ftp.horde.org/pub/kronolith/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Kronolith is the Horde calendar application
 
 RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
@@ -26,6 +26,7 @@ RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NO_BUILD=	yes
+USE_PHP=	mcal
 USE_REINPLACE=	yes
 
 .if defined(WITH_APACHE2)
@@ -55,14 +56,6 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 post-patch:
 	@${RM} ${WRKSRC}/config/conf.php.dist.orig
 
-pre-install:
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mcal.0" ; then \
-	  ${ECHO_MSG} "" ; \
-	  ${ECHO_MSG} "Please configure PHP and Horde with MCAL support enabled." ; \
-	  ${ECHO_MSG} "" ; \
-	  ${FALSE} ; \
-	fi
-
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
 .for REP in ${SUB_DIRS}
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 26a92d571d2d..ad5858b7da2e 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/	\
 		http://ftp.horde.org/pub/turba/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The Horde contact management application
 
 #-----------------------------------------------------------------------
@@ -28,7 +28,7 @@ COMMENT=	The Horde contact management application
 #
 #-----------------------------------------------------------------------
 
-RUN_DEPENDS=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
+RUN_DEPENDS=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 .if !defined(WITHOUT_LDAP)
 USE_OPENLDAP=	yes
@@ -37,8 +37,6 @@ USE_OPENLDAP=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-LDD=		/usr/bin/ldd
-
 REINPLACE_ARGS=	-i.beforeTurba
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/INSTALL docs/LDAP docs/RELEASE_NOTES docs/UPDATE	\
@@ -57,11 +55,6 @@ TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
-.if defined(WITH_APACHE2)
-PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
-.else
-PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
-.endif
 
 post-patch:
 	@${RM} ${WRKSRC}/config/conf.php.dist.orig	\
@@ -70,7 +63,7 @@ post-patch:
 
 pre-install:
 .if !defined(WITHOUT_LDAP)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap"; then \
+	@if ! php -m | ${GREP} -q -e "ldap"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
 	    ${ECHO_MSG} "" ; \
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 26a92d571d2d..ad5858b7da2e 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/	\
 		http://ftp.horde.org/pub/turba/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The Horde contact management application
 
 #-----------------------------------------------------------------------
@@ -28,7 +28,7 @@ COMMENT=	The Horde contact management application
 #
 #-----------------------------------------------------------------------
 
-RUN_DEPENDS=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
+RUN_DEPENDS=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 .if !defined(WITHOUT_LDAP)
 USE_OPENLDAP=	yes
@@ -37,8 +37,6 @@ USE_OPENLDAP=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-LDD=		/usr/bin/ldd
-
 REINPLACE_ARGS=	-i.beforeTurba
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/INSTALL docs/LDAP docs/RELEASE_NOTES docs/UPDATE	\
@@ -57,11 +55,6 @@ TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
-.if defined(WITH_APACHE2)
-PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
-.else
-PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
-.endif
 
 post-patch:
 	@${RM} ${WRKSRC}/config/conf.php.dist.orig	\
@@ -70,7 +63,7 @@ post-patch:
 
 pre-install:
 .if !defined(WITHOUT_LDAP)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap"; then \
+	@if ! php -m | ${GREP} -q -e "ldap"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
 	    ${ECHO_MSG} "" ; \
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index a908ababce4a..d1e74a8d0006 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -118,8 +118,6 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-LDD=		/usr/bin/ldd
-
 REINPLACE_ARGS=	-i.beforeIMP
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES
@@ -141,11 +139,6 @@ CONFDIR=	${IMPDIR}/config
 HCONFDIR=	${HORDEDIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
-.if defined(WITH_APACHE2)
-PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
-.else
-PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
-.endif
 
 HOSTNAME?=	`/bin/hostname`
 SERVOS?=	${OPSYS}-${OSREL}
@@ -176,7 +169,7 @@ pre-install:
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libc-client4"; then \
+	@if ! php -m | ${GREP} -q -e "imap"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with IMAP or IMAP-SSL support." ; \
 	    ${ECHO_MSG} "" ; \
@@ -193,7 +186,7 @@ pre-install:
 .endif
 .endif
 .if !defined(WITHOUT_LDAP)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so"; then \
+	@if ! php -m | ${GREP} -q -e "ldap"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP or OpenLDAP2 support." ; \
 	    ${ECHO_MSG} "" ; \
@@ -201,7 +194,7 @@ pre-install:
 	fi
 .endif
 .if !defined(NOCRYPT)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libmcrypt.so"; then \
+	@if ! php -m | ${GREP} -q -e "mcrypt"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with mcrypt support." ; \
 	    ${ECHO_MSG} "" ; \
@@ -209,10 +202,10 @@ pre-install:
 	fi
 .endif
 .if !defined(WITHOUT_SUPPORTED_DB)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libmysqlclient.so"; then \
-	 if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libpq.so" ; then \
-	  if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libsybdb.so" ; then \
-	   if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libct.so" ; then \
+	@if ! php -m | ${GREP} -q -e "mysql" ; then \
+	 if ! php -m | ${GREP} -q -e "pgsql" ; then \
+	  if ! php -m | ${GREP} -q -e "sybase" ; then \
+	   if ! php -m | ${GREP} -q -e "sybase_ct" ; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
 	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 26a92d571d2d..ad5858b7da2e 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/	\
 		http://ftp.horde.org/pub/turba/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The Horde contact management application
 
 #-----------------------------------------------------------------------
@@ -28,7 +28,7 @@ COMMENT=	The Horde contact management application
 #
 #-----------------------------------------------------------------------
 
-RUN_DEPENDS=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
+RUN_DEPENDS=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 .if !defined(WITHOUT_LDAP)
 USE_OPENLDAP=	yes
@@ -37,8 +37,6 @@ USE_OPENLDAP=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
-LDD=		/usr/bin/ldd
-
 REINPLACE_ARGS=	-i.beforeTurba
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/INSTALL docs/LDAP docs/RELEASE_NOTES docs/UPDATE	\
@@ -57,11 +55,6 @@ TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
-.if defined(WITH_APACHE2)
-PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
-.else
-PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
-.endif
 
 post-patch:
 	@${RM} ${WRKSRC}/config/conf.php.dist.orig	\
@@ -70,7 +63,7 @@ post-patch:
 
 pre-install:
 .if !defined(WITHOUT_LDAP)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap"; then \
+	@if ! php -m | ${GREP} -q -e "ldap"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
 	    ${ECHO_MSG} "" ; \
diff --git a/textproc/cdsware/Makefile b/textproc/cdsware/Makefile
index 4582894632b1..a87cd5345740 100644
--- a/textproc/cdsware/Makefile
+++ b/textproc/cdsware/Makefile
@@ -85,7 +85,7 @@ CONFIGURE_ARGS=		--prefix=${PREFIX}/cdsware		\
 USE_GMAKE=		yes
 USE_APACHE=		yes
 WITH_APACHE2=		yes
-USE_PHP=		yes
+USE_PHP=		zlib pcntl
 WANT_PHP_MOD=		yes
 WANT_PHP_CLI=		yes
 USE_MYSQL=		yes
@@ -111,12 +111,7 @@ ADMINEMAIL?=	cds.admin@${unamen}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST_SUB=	WEBDIR=${WEBDIR}
 
-LDD=		/usr/bin/ldd
-
-MOD_DIR=	libexec/apache2
 APACHE_CONF=	${LOCALBASE}/etc/apache2/httpd.conf
-PHPSO=		${LOCALBASE}/${MOD_DIR}/libphp4.so
-PHPBIN=		${LOCALBASE}/bin/php
 CDSWARE_INC=	${PREFIX}/etc/${PORTNAME}
 LCDSWARE_CNF=	config.wml
 CDSWARE_CNF=	${PREFIX}/${PORTNAME}/lib/wml/${PORTNAME}/${LCDSWARE_CNF}
@@ -181,24 +176,6 @@ post-configure:
 		${WRKSRC}/config/${LCDSWARE_CNF}
 .endif
 
-pre-install:
-.if !defined(PACKAGE_BUILDING)
-	@if ! ${PHPBIN} -i | ${GREP} -q -e "pcntl support"; then	\
-	    ${ECHO_MSG} ; \
-	    ${ECHO_MSG} "Please configure PHP with PCNTL support." ;	\
-	    ${ECHO_MSG} ; \
-	    ${FALSE} ; \
-	fi
-.endif
-	@if (! ${LDD} ${PHPSO} | ${GREP} -q -e "libz.so")		\
-	|| (! ${LDD} ${PHPBIN} | ${GREP} -q -e "libz.so"); then		\
-	    ${ECHO_MSG} ; \
-	    ${ECHO_MSG} "Please configure PHP with ZLIB support." ;	\
-	    ${ECHO_MSG} ; \
-	    ${FALSE} ; \
-	 fi ; \
-	fi
-
 post-install:
 	@${CHMOD} go-rx ${CDSBIN}/dbexec
 	@for p in `${LS} ${CDSBIN}` ;			\
diff --git a/textproc/cdsware/files/pkg-message.in b/textproc/cdsware/files/pkg-message.in
index 97c79bd5ec6a..6337f01df3b2 100644
--- a/textproc/cdsware/files/pkg-message.in
+++ b/textproc/cdsware/files/pkg-message.in
@@ -16,6 +16,4 @@ To test your installation, you might type `make create-demo-site' and
 
 Don't miss mod_python's pkg-message about threads!
 
-To run this package, PHP CLI should be compiled with the process control
-support (WITH_PCNTL).
 =============================================================================
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 36c8007e11d9..64b789e90f83 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	horde
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -18,7 +19,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/horde/	\
 		http://ftp.horde.org/pub/horde/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A common code-base used by Horde applications, written in PHP
 
 #-----------------------------------------------------------------------
@@ -28,20 +29,50 @@ COMMENT=	A common code-base used by Horde applications, written in PHP
 #
 # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree.
 #
+# - WITHOUT_MYSQL:	this port is built with MySQL by default
+#			but you might choose any other database
+#			supported by PHP (e.g. WITH_POSTGRESQL).
+#
+# - WITHOUT_IMP:	this port is intended to build a default
+#			package for IMP; use this knob if for
+#			example you only need Chora.
+#
+# - WITHOUT_LDAP:	if you do not need OpenLDAP.
+#
+# - WITHOUT_MCAL:	if you don't plan to install Kronolith.
+#
+# - WITHOUT_FTP:	if you don't plan to install Gollem.
+#
 #-----------------------------------------------------------------------
 
-BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4-horde
-RUN_DEPENDS=	${BUILD_DEPENDS}						\
-		${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
+RUN_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
 		${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
 		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log		\
 		${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 
-NO_PACKAGE=	Packaging problem due to dependences with pear
 NO_BUILD=	yes
+USE_PHP=	domxml gettext session
+WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
 
-LDD=		/usr/bin/ldd
+.if !defined(NOCRYPT)
+USE_PHP+=	mcrypt
+.endif
+.if !defined(WITHOUT_MYSQL)
+USE_PHP+=	mysql
+.endif
+.if !defined(WITHOUT_LDAP)
+USE_PHP+=	ldap
+.endif
+.if !defined(WITHOUT_IMP)
+USE_PHP+=	imap
+.endif
+.if !defined(WITHOUT_MCAL)
+USE_PHP+=	mcal
+.endif
+.if !defined(WITHOUT_FTP)
+USE_PHP+=	ftp
+.endif
 
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
@@ -64,12 +95,9 @@ APACHE_CONF=	${APACHE_CNFDIR}/httpd.conf
 PEARDIR?=	${LOCALBASE}/share/pear
 .if defined(WITH_APACHE2)
 APACHE_CNFDIR=	${LOCALBASE}/etc/apache2
-MOD_DIR=	libexec/apache2
 .else
 APACHE_CNFDIR=	${LOCALBASE}/etc/apache
-MOD_DIR=	libexec/apache
 .endif
-PHPSO=		${LOCALBASE}/${MOD_DIR}/libphp4.so
 HORDE_INC=	${PREFIX}/etc/horde
 LOG_FILE?=	/var/log/horde.log
 
@@ -89,24 +117,12 @@ pre-install:
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libxml2.so"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with DOM XML support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libintl.so"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with gettext support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
 # N.B.: database dependencies are binded with mod_php#, not with Horde
 .if !defined(WITHOUT_SUPPORTED_DB)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libmysqlclient" ; then \
-	 if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libpq.so" ; then \
-	  if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libsybdb.so" ; then \
-	   if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libct.so" ; then \
+	@if ! php -m | ${GREP} -q -e "mysql" ; then \
+	 if ! php -m | ${GREP} -q -e "pgsql" ; then \
+	  if ! php -m | ${GREP} -q -e "sybase" ; then \
+	   if ! php -m | ${GREP} -q -e "sybase_ct" ; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
 	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \