Switch to the new PHP infrastructure.

Submitted by:	maintainer

4 files changed, 16 insertions, 44 deletions

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} "" ; \