32 files changed, 25 insertions, 150 deletions

diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index af392d7846bd..793f07052711 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Bacula-web provides a summarized output of Bacula jobs
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
 NO_BUILD=	yes
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 OPTIONS=	POSTGRESQL "Use PostgreSQL database instead of MySQL" on
@@ -30,16 +31,14 @@ SUB_FILES=	pkg-message
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=yes
 SUB_LIST+=		REQ_PGSQL=postgresql
-USE_PHP=		pgsql
+USE_PHP+=		pgsql
 .else
 CONFIGURE_ARGS+=	--with-mysql=yes
 USE_MYSQL=		yes
 SUB_LIST+=		REQ_MYSQL=mysql
-USE_PHP=		mysql
+USE_PHP+=		mysql
 .endif
 
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${ECHO} "Installing in ${PREFIX}/www/bacula-web"
 	${MKDIR} ${PREFIX}/www/bacula-web
diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index 730609f54817..a4b5e06e7164 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -31,9 +31,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
-# XXX: should be "USE_PHP+=mysql", but the depends are added too early
-# by bsd.php.mk
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
+USE_PHP+=	mysql
 .endif
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
diff --git a/www/drupal4/Makefile b/www/drupal4/Makefile
index 730609f54817..a4b5e06e7164 100644
--- a/www/drupal4/Makefile
+++ b/www/drupal4/Makefile
@@ -31,9 +31,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
-# XXX: should be "USE_PHP+=mysql", but the depends are added too early
-# by bsd.php.mk
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
+USE_PHP+=	mysql
 .endif
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
diff --git a/www/drupal5/Makefile b/www/drupal5/Makefile
index 730609f54817..a4b5e06e7164 100644
--- a/www/drupal5/Makefile
+++ b/www/drupal5/Makefile
@@ -31,9 +31,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
-# XXX: should be "USE_PHP+=mysql", but the depends are added too early
-# by bsd.php.mk
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
+USE_PHP+=	mysql
 .endif
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
index 730609f54817..a4b5e06e7164 100644
--- a/www/drupal6/Makefile
+++ b/www/drupal6/Makefile
@@ -31,9 +31,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
-# XXX: should be "USE_PHP+=mysql", but the depends are added too early
-# by bsd.php.mk
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
+USE_PHP+=	mysql
 .endif
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 730609f54817..a4b5e06e7164 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -31,9 +31,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
-# XXX: should be "USE_PHP+=mysql", but the depends are added too early
-# by bsd.php.mk
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
+USE_PHP+=	mysql
 .endif
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index fe07c71a2743..0a367f81bb71 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -235,8 +235,6 @@ USE_PHP+=	mcal
 . endif
 .endif
 
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if ${APACHE_VERSION} >= 20
 APACHE_CNFDIR=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}
 HORDE_INC=	${APACHE_CNFDIR}/Includes
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index fe07c71a2743..0a367f81bb71 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -235,8 +235,6 @@ USE_PHP+=	mcal
 . endif
 .endif
 
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if ${APACHE_VERSION} >= 20
 APACHE_CNFDIR=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}
 HORDE_INC=	${APACHE_CNFDIR}/Includes
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki110/Makefile
+++ b/www/mediawiki110/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki16/Makefile b/www/mediawiki16/Makefile
index 75459f23ea40..b82c3586a2be 100644
--- a/www/mediawiki16/Makefile
+++ b/www/mediawiki16/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 27fa5fb2b7d2..7639f57f1b32 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index a80b51b105ff..1bacdb0f48d4 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -39,9 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MEDIAWIKIDIR}
 	${CP} -r ${WRKSRC}/ ${PREFIX}/${MEDIAWIKIDIR}
diff --git a/www/ojs2/Makefile b/www/ojs2/Makefile
index d6c70aa7371a..6b307e5f57b2 100644
--- a/www/ojs2/Makefile
+++ b/www/ojs2/Makefile
@@ -39,8 +39,6 @@ USE_PHP+=	mysql
 USE_PHP+=	pgsql
 .endif
 
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${INSTALL_DATA} -d ${PREFIX}/${OJSDIR}
 	@${CP} -Rn ${WRKSRC}/* ${PREFIX}/${OJSDIR}
diff --git a/www/phpwiki13/Makefile b/www/phpwiki13/Makefile
index 0ab2aaab774d..a0882ec51fa7 100644
--- a/www/phpwiki13/Makefile
+++ b/www/phpwiki13/Makefile
@@ -32,23 +32,10 @@ DOCFILES=	INSTALL LICENSE README TODO UPGRADING
 
 OPTIONS=	MYSQL "Use MySQL backend" on \
 		PGSQL "Use PostgreSQL backend" off \
-		DB4   "Use Berkeley DB4 backend" off
+		DB4   "Use Berkeley DB4 backend" off \
+		SQLITE "Use SQLite backend (php5 only)" off
 
-.if exists(${LOCALBASE}/etc/php.conf)
-.include "${LOCALBASE}/etc/php.conf"
-.endif
-
-.if defined(PHP_VER) && ${PHP_VER} == 5
-OPTIONS+=	SQLITE "Use SQLite backend" off
-.endif
-
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_DB4)
 USE_PHP+=	dba
@@ -84,4 +71,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/serendipity-devel/Makefile b/www/serendipity-devel/Makefile
index ba9f3ca883eb..84f7e89d2e7a 100644
--- a/www/serendipity-devel/Makefile
+++ b/www/serendipity-devel/Makefile
@@ -26,30 +26,13 @@ SUB_LIST+=	SERENDIPITY=${SERENDIPITY}
 SUB_FILES=	pkg-message
 
 CONFLICTS=	serendipity-1.*
-LATEST_LINK=	serendipity-devel
-
-LOCALBASE?=	/usr/local
 
 OPTIONS=	MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off
-
-.if exists(${LOCALBASE}/etc/php.conf)
-.include "${LOCALBASE}/etc/php.conf"
-.endif
-
-.if defined(PHP_VER) && ${PHP_VER} == 5
-OPTIONS+=	SQLITE "Use SQLite backend" off
-.endif
-
-OPTIONS+=	MAGICK "Use ImageMagick Library" on
+		PGSQL "Use PostgreSQL backend" off \
+		SQLITE "Use SQLite backend (php5 only)" off \
+		MAGICK "Use ImageMagick Library" on
 
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_MYSQL)
 USE_PHP+=	mysql
@@ -76,4 +59,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile
index fedf86b3f17f..d368b7b8bc4d 100644
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -25,28 +25,12 @@ SUB_LIST+=	SERENDIPITY=${SERENDIPITY}
 SUB_FILES=	pkg-message
 USE_BZIP2=	YES
 
-LOCALBASE?=	/usr/local
-
 OPTIONS=	MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off
-
-.if exists(${LOCALBASE}/etc/php.conf)
-.include "${LOCALBASE}/etc/php.conf"
-.endif
-
-.if defined(PHP_VER) && ${PHP_VER} == 5
-OPTIONS+=	SQLITE "Use SQLite backend" off
-.endif
-
-OPTIONS+=	MAGICK "Use ImageMagick Library" on
+		PGSQL "Use PostgreSQL backend" off \
+		SQLITE "Use SQLite backend (php5 only)" off \
+		MAGICK "Use ImageMagick Library" on
 
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
-.endif
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_MYSQL)
 USE_PHP+=	mysql
@@ -73,4 +57,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index e17963c46d80..9fec12179d9f 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	gd
 USE_PHP+=	zlib
 .endif
 
-# Include bsd.php.mk because use USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if defined(WITH_IMAGICK)
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
diff --git a/www/typo343/Makefile b/www/typo343/Makefile
index e17963c46d80..9fec12179d9f 100644
--- a/www/typo343/Makefile
+++ b/www/typo343/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	gd
 USE_PHP+=	zlib
 .endif
 
-# Include bsd.php.mk because use USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if defined(WITH_IMAGICK)
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
diff --git a/www/typo344/Makefile b/www/typo344/Makefile
index e17963c46d80..9fec12179d9f 100644
--- a/www/typo344/Makefile
+++ b/www/typo344/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	gd
 USE_PHP+=	zlib
 .endif
 
-# Include bsd.php.mk because use USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if defined(WITH_IMAGICK)
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
diff --git a/www/typo345/Makefile b/www/typo345/Makefile
index e17963c46d80..9fec12179d9f 100644
--- a/www/typo345/Makefile
+++ b/www/typo345/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	gd
 USE_PHP+=	zlib
 .endif
 
-# Include bsd.php.mk because use USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if defined(WITH_IMAGICK)
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
diff --git a/www/typo346/Makefile b/www/typo346/Makefile
index e17963c46d80..9fec12179d9f 100644
--- a/www/typo346/Makefile
+++ b/www/typo346/Makefile
@@ -41,9 +41,6 @@ USE_PHP+=	gd
 USE_PHP+=	zlib
 .endif
 
-# Include bsd.php.mk because use USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 .if defined(WITH_IMAGICK)
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
diff --git a/www/webcalendar/Makefile b/www/webcalendar/Makefile
index c55e176a29ef..f56f42a697fe 100644
--- a/www/webcalendar/Makefile
+++ b/www/webcalendar/Makefile
@@ -87,9 +87,6 @@ IGNORE=		please choose database backend by running 'make config'
 USE_PHP+=	ldap
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 pre-install:
 	cd ${WRKSRC} && ${FIND} -s * -type f | \
 		${SED} -e 's|^|${WCDIR}/|' > ${PLIST} \
diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile
index 5395cb8054f8..fd3a3d599298 100644
--- a/www/zend-framework/Makefile
+++ b/www/zend-framework/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A framework for developing PHP web applications
 NO_BUILD=	yes
 USE_PHP=	pcre
 WANT_PHP_WEB=	yes
+IGNORE_WITH_PHP=4
 
 USE_GETTEXT=	yes
 
@@ -34,9 +35,6 @@ OPTIONS=	MYSQL "Install MySQL PDO support" Off \
 
 .include <bsd.port.pre.mk>
 
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4
-
 DB_DEFINED=	no
 
 .if defined(WITH_MYSQL)
@@ -70,13 +68,10 @@ DB_DEFINED=	yes
 .endif
 
 .if ${DB_DEFINED} == "yes"
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/php5-pdo \
-		${DB_DEPENDS}
+USE_PHP+=	pdo
+RUN_DEPENDS+=	${DB_DEPENDS}
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${DATADIR}
 	${CP} -R ${WRKSRC}/* ${DATADIR}