Remove lang/php4/bsd.php.mk and switch every ports depending on PHP to

use Mk/bsd.php.mk.

Approved by:	nork (mentor/implicitly)

archivers/pear-Archive_Tar/Makefile

@@ -13,13 +13,12 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR tar file management class
 
-BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4
+USE_PHP=	yes
-RUN_DEPENDS=	${BUILD_DEPENDS}
+WANT_PHP_PEAR=	yes
 
 FILES=		Archive/Tar.php
 DOCS=		Archive_Tar.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>

databases/phpmyadmin/Makefile

@@ -28,17 +28,13 @@ MYADMDIR?=	www/data/phpMyAdmin
 PHP_SUFX=	php3
 EXTRA_PATCHES=	files/fix-libraries::display_tbl.lib.php3 files/fix-tbl_relation.php3
 .else
+USE_PHP=	yes
 PHP_SUFX=	php
 EXTRA_PATCHES=	files/fix-libraries::display_tbl.lib.php files/fix-tbl_relation.php
 .endif
 
 PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
 
-.include <bsd.port.pre.mk>
-.if !defined(WITH_PHP3)
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-.endif
-
 post-patch:
 	@${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample
 	@${RM} ${WRKSRC}/*.orig ${WRKSRC}/libraries/*.orig
@@ -50,4 +46,4 @@ do-install:
 			then ${MKDIR} ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; \
 			else ${INSTALL_DATA} $$0 ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; fi'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

databases/phpmyadmin211/Makefile

@@ -28,17 +28,13 @@ MYADMDIR?=	www/data/phpMyAdmin
 PHP_SUFX=	php3
 EXTRA_PATCHES=	files/fix-libraries::display_tbl.lib.php3 files/fix-tbl_relation.php3
 .else
+USE_PHP=	yes
 PHP_SUFX=	php
 EXTRA_PATCHES=	files/fix-libraries::display_tbl.lib.php files/fix-tbl_relation.php
 .endif
 
 PLIST_SUB+=	MYADMDIR=${MYADMDIR} PHP_SUFX=${PHP_SUFX}
 
-.include <bsd.port.pre.mk>
-.if !defined(WITH_PHP3)
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-.endif
-
 post-patch:
 	@${MV} ${WRKSRC}/config.inc.${PHP_SUFX} ${WRKSRC}/config.inc.${PHP_SUFX}.sample
 	@${RM} ${WRKSRC}/*.orig ${WRKSRC}/libraries/*.orig
@@ -50,4 +46,4 @@ do-install:
 			then ${MKDIR} ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; \
 			else ${INSTALL_DATA} $$0 ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; fi'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

databases/phppgadmin/Makefile

@@ -20,17 +20,15 @@ POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
 USE_BZIP2=	yes
+USE_PHP=	yes
 WRKSRC=		${WRKDIR}/phpPgAdmin
 NO_BUILD=	YES
 
 PGADMDIR?=      www/data/phpPgAdmin
 PLIST_SUB+=     PGADMDIR=${PGADMDIR}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 do-install:
 	${MKDIR} ${PREFIX}/${PGADMDIR}
 	${CP} -R ${WRKSRC}/* ${PREFIX}/${PGADMDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

devel/ZendOptimizer/Makefile

@@ -15,6 +15,7 @@ COMMENT=	An optimizer for PHP code
 
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
+USE_PHP=	yes
 BROKEN_WITH_PHP=5
 
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
@@ -23,7 +24,6 @@ NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 
 # Check for FreeBSD version
 .if ${OSVERSION} >= 500000

devel/pear-apd/Makefile

@@ -15,12 +15,12 @@ COMMENT=	A full-featured engine-level PHP profiler/debugger
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-apd
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
 .if exists(${LOCALBASE}/bin/php-config)

devel/php-dbg/Makefile

@@ -15,13 +15,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	rehsack@liwing.de
 COMMENT=	Debugger for PHP4
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-build:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
@@ -33,4 +31,5 @@ do-install:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>

devel/php-dbg2/Makefile

@@ -15,13 +15,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	rehsack@liwing.de
 COMMENT=	Debugger for PHP4
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-build:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
@@ -33,4 +31,5 @@ do-install:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>

devel/php-xdebug/Makefile

@@ -15,13 +15,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	rehsack@liwing.de
 COMMENT=	Xdebug extension for PHP
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 CONFIGURE_ARGS=	--enable-xdebug --with-php-config=${PREFIX}/bin/php-config
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-build:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
@@ -34,4 +32,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

graphics/jpgraph/Makefile

@@ -15,11 +15,9 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Draw both "quick and dirty" graphs with a minimum of code
 
 NO_BUILD=	yes
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
-
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "You have to configure PHP with GD support."
@@ -40,4 +38,4 @@ do-install:
 	${CP} -R ${WRKSRC}/src/Examples/ ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

lang/php4/bsd.php.mk

@@ -1,152 +0,0 @@
-# Just include this makefile after bsd.ports.pre.mk
-#
-# The user/port can now set this options in the makefiles.
-#
-# USE_PHPIZE=yes    - Use to build a PHP extension.
-# WANT_PHP_CLI=yes  - Want the CLI version of PHP.
-# WANT_PHP_CGI=yes  - Want the CGI version of PHP.
-# WANT_PHP_MOD=yes  - Want the Apache Module for PHP.
-# WANT_PHP_WEB=yes  - Want the Apache Module or the CGI version of PHP.
-# WANT_PHP_PEAR=yes - Want the PEAR framework.
-#
-# You may combine multiple WANT_PHP_* knobs.
-# Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
-#
-
-.if exists(${LOCALBASE}/etc/php.conf)
-.include "${LOCALBASE}/etc/php.conf"
-.endif
-
-PHP_VER?=	4
-.if !defined(PHP_EXT_DIR)
-PHP_EXT_DIR=	20020429
-.if exists(${LOCALBASE}/include/apache2/apr.h)
-APACHE_MPM!=	${APXS} -q MPM_NAME
-.if ${APACHE_MPM} == "worker"
-PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
-.endif
-.else
-.if defined(WITH_APACHE2) && defined(WITH_MPM) && ${WITH_MPM} == "worker"
-PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
-.endif
-.endif
-.if defined(WITH_DEBUG)
-PHP_EXT_DIR:=	${PHP_EXT_DIR}-debug
-.endif
-.endif
-.if !defined(WITHOUT_PEAR)
-PHP_PEAR?=	yes
-.else
-PHP_PEAR?=	no
-.endif
-PHP_SAPI?=	""
-
-.if defined(BROKEN_WITH_PHP)
-.       for VER in ${BROKEN_WITH_PHP}
-.               if ${PHP_VER} == "${VER}"
-BROKEN=         "Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP})"
-.               endif
-.       endfor
-.endif
-
-.if defined(WANT_PHP_WEB)
-.	if defined(WANT_PHP_CGI) || defined(WANT_PHP_MOD)
-.BEGIN:
-		@${ECHO_CMD} "If you define WANT_PHP_WEB you cannot set also WANT_PHP_CGI"
-		@${ECHO_CMD} "or WANT_PHP_MOD. Use only one of them."
-		@${FALSE}
-.	else
-.	if defined(PHP_VERSION) && ${PHP_SAPI} == "cli"
-.BEGIN:
-		@${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
-		@${ECHO_CMD} "already installed a conflicting PHP port without them."
-		@${FALSE}
-.	else
-.	if defined(WANT_PHP_CLI) || defined(WANT_PHP_PEAR)
-PHP_PORT?=	${PORTSDIR}/lang/php${PHP_VER}
-.	else
-PHP_PORT?=	${PORTSDIR}/www/mod_php${PHP_VER}
-PHP_PEAR?=	no
-.	endif
-.	endif
-.	endif
-.else
-
-.if defined(WANT_PHP_CGI)
-.	if defined(WANT_PHP_CLI) || defined(WANT_PHP_MOD)
-.BEGIN:
-		@${ECHO_CMD} "The CGI version of PHP avoids the installation of other SAPIs."
-		@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
-		@${FALSE}
-.	else
-.	if defined(PHP_VERSION) && ${PHP_SAPI} != "cgi"
-.BEGIN:
-		@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
-		@${ECHO_CMD} "installed a conflicting PHP port without CGI."
-		@${FALSE}
-.	else
-PHP_PORT?=	${PORTSDIR}/www/php${PHP_VER}-cgi
-PHP_PEAR?=	no
-.	endif
-.	endif
-.else
-
-.if defined(WANT_PHP_CLI) && !defined(WANT_PHP_MOD)
-.	if defined(PHP_VERSION) && ${PHP_SAPI} != "full" && ${PHP_SAPI} != "cli"
-.BEGIN:
-		@${ECHO_CMD} "This port requires the CLI version of PHP, but you have already"
-		@${ECHO_CMD} "installed a conflicting PHP port without CLI."
-		@${FALSE}
-.	else
-PHP_PORT?=	${PORTSDIR}/lang/php${PHP_VER}-cli
-.	endif
-.else
-
-.if !defined(WANT_PHP_CLI) && defined(WANT_PHP_MOD)
-.	if defined(PHP_VERSION) && (${PHP_SAPI} != "full" && ${PHP_SAPI} != "mod")
-.BEGIN:
-		@${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
-		@${ECHO_CMD} "installed a conflicting PHP port without the Apache Module."
-		@${FALSE}
-.	else
-.	if defined(WANT_PHP_PEAR)
-PHP_PORT?=	${PORTSDIR}/lang/php${PHP_VER}
-.	else
-PHP_PORT?=	${PORTSDIR}/www/mod_php${PHP_VER}
-PHP_PEAR?=	no
-.	endif
-.	endif
-.else
-
-PHP_PORT?=	${PORTSDIR}/lang/php${PHP_VER}
-
-.endif
-
-.endif
-
-.endif
-
-.endif
-
-.if defined(WANT_PHP_PEAR) && ${PHP_PEAR} == "no"
-BROKEN=	"This port requires the PEAR framework, but you have already" \
-	"installed a PHP port without PEAR"
-.endif
-
-RUN_DEPENDS+=	${LOCALBASE}/include/php/main/php.h:${PHP_PORT}
-
-PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
-
-.if defined(USE_PHPIZE)
-BUILD_DEPENDS+=	phpize:${PHP_PORT}
-USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
-CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
-
-configure-message: phpize
-
-phpize:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
-.endif

mail/nocc/Makefile

@@ -14,14 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A web-based e-mail system which access POP3 and IMAP mail servers
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
-
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "You have to configure PHP with IMAP support in order"
@@ -54,4 +52,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

mail/pear-mailparse/Makefile

@@ -17,10 +17,10 @@ RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 
 IS_INTERACTIVE=	'need to build php4 with mbstring support.'
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
 .if exists(${LOCALBASE}/bin/php-config)

mail/pecl-mailparse/Makefile

@@ -17,10 +17,10 @@ RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 
 IS_INTERACTIVE=	'need to build php4 with mbstring support.'
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
 .if exists(${LOCALBASE}/bin/php-config)

mail/squirrelmail/Makefile

@@ -17,6 +17,7 @@ COMMENT?=	A webmail system which accesses mail over IMAP
 
 CONFLICTS?=	ja-squirrelmail-1.*
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 USE_BZIP2=	yes
@@ -38,9 +39,6 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 MASTERDIR=	${.CURDIR}
 .endif 
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
-
 pre-everything::
 	@${ECHO_CMD} "SquirrelMail is installed into ${SQUIRRELDIR}"
 	@${ECHO_CMD} "To use the old location ${PREFIX}/squirrelmail define"
@@ -105,4 +103,4 @@ post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

misc/achievo/Makefile

@@ -14,9 +14,8 @@ DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
 MAINTAINER=	kevin@caomhin.demon.co.uk
 COMMENT=	A flexible web-based resource management tool
 
+USE_PHP=	yes
 WANT_PHP_MOD=	yes
-PHP_VER=	4
-.include <../../lang/php4/bsd.php.mk>
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	YES

net/scr_ipfm/Makefile

@@ -15,13 +15,11 @@ MAINTAINER=	sexbear@tmu.edu.tw
 COMMENT=	Use logs generated by ipfm to show data graphically
 
 NO_BUILD=	yes
+USE_PHP=	yes
 MYADMDIR?=	www/data/scr_ipfm
 PLIST_SUB=	MYADMDIR=${MYADMDIR}
 PORTDOCS=	BUGS COPYING ChangeLog README README_pl THANKS TODO
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${PREFIX}/${MYADMDIR}
 	${CP} -R ${WRKSRC}/[a-z]* ${PREFIX}/${MYADMDIR}
@@ -33,4 +31,4 @@ do-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

security/snortreport/Makefile

@@ -17,14 +17,12 @@ COMMENT=	Add-on module for snort to generate real-time web reports
 RUN_DEPENDS=	${LOCALBASE}/share/jpgraph/jpgraph.php:${PORTSDIR}/graphics/jpgraph
 .endif
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
-
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "You have to configure PHP either with MySQL or PostgreSQL"
@@ -57,4 +55,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/abcache/Makefile

@@ -16,6 +16,7 @@ COMMENT=	A tool to cache applications written in PHP
 
 WRKSRC=		${WRKDIR}/bware_cache-${PORTVERSION}
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 WITH_PHP_MOD=	yes
 
@@ -23,9 +24,6 @@ CONFIGURE_ARGS+=--enable-bware_cache=shared
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-build:
 	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
@@ -38,4 +36,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/eaccelerator/Makefile

@@ -16,15 +16,13 @@ COMMENT=	An opcode cache for PHP with encoder and loader
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-mmcache=shared
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-patch:
 	@${REINPLACE_CMD} 's|ALIGN|MMALIGN|g' ${WRKSRC}/mm.c ${WRKSRC}/mmcache.c
 
@@ -49,4 +47,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/gallery/Makefile

@@ -54,6 +54,7 @@ LANGPACKS=	af_ZA-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
 		zh_TW-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
 		zh_TW.utf8-pack-${LANGVERSION}${EXTRACT_SUFX}
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -64,9 +65,6 @@ EXCEPTFILES=	${DOCFILES} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 pre-fetch:
 .if !defined(GALLERYDIR)
 	@${ECHO_MSG} ""
@@ -106,4 +104,4 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/gallery2/Makefile

@@ -54,6 +54,7 @@ LANGPACKS=	af_ZA-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
 		zh_TW-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
 		zh_TW.utf8-pack-${LANGVERSION}${EXTRACT_SUFX}
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -64,9 +65,6 @@ EXCEPTFILES=	${DOCFILES} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 pre-fetch:
 .if !defined(GALLERYDIR)
 	@${ECHO_MSG} ""
@@ -106,4 +104,4 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/gallery3/Makefile

@@ -54,6 +54,7 @@ LANGPACKS=	af_ZA-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
 		zh_TW-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
 		zh_TW.utf8-pack-${LANGVERSION}${EXTRACT_SUFX}
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -64,9 +65,6 @@ EXCEPTFILES=	${DOCFILES} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 pre-fetch:
 .if !defined(GALLERYDIR)
 	@${ECHO_MSG} ""
@@ -106,4 +104,4 @@ post-install:
 	@ ${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/pear-APC/Makefile

@@ -15,12 +15,12 @@ COMMENT=	Alternative PHP Cache
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-apc
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
 .if exists(${LOCALBASE}/bin/php-config)

www/pecl-APC-devel/Makefile

@@ -15,12 +15,12 @@ COMMENT=	Alternative PHP Cache
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-apc
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
 .if exists(${LOCALBASE}/bin/php-config)

www/pecl-APC/Makefile

@@ -15,12 +15,12 @@ COMMENT=	Alternative PHP Cache
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-apc
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
 .if exists(${LOCALBASE}/bin/php-config)

www/php-dyn/Makefile

@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A PHP Extension to help debugging a PHP script
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 WITH_PHP_MOD=	yes
 
@@ -23,9 +24,6 @@ CONFIGURE_ARGS=	--enable-php_dyn=shared
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-build:
 	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
@@ -42,4 +40,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/php-screw/Makefile

@@ -20,13 +20,11 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CRYPTKEY?=	11152, 368, 192, 1281, 62
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS+=--enable-php_screw=shared
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
-
 pre-everything::
 	@${ECHO} ""
 	@${ECHO} "To achieve real security, define your own encryption"
@@ -57,4 +55,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/php-templates/Makefile

@@ -21,15 +21,13 @@ COMMENT=	A template framework for PHP
 
 WRKSRC=		${WRKDIR}/templates
 
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-templates=shared
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-build:
 	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
@@ -46,4 +44,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/phpSysInfo/Makefile

@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	phpsysinfo
 MAINTAINER=	so14k@so14k.com
 COMMENT=	A php script that displays info about the host being accessed
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 PREFIX=		${LOCALBASE}
@@ -25,9 +26,6 @@ PLIST=		${WRKDIR}/plist
 
 PLIST_SUB+=	INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-patch:
 	rm -f ${PLIST}
 	cd ${WRKSRC};\
@@ -43,4 +41,4 @@ do-install:
 	${CHMOD} -R ${BINMODE} ${INSTALLDIR}
 	${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/phpsysinfo-dev/Makefile

@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	phpsysinfo
 MAINTAINER=	so14k@so14k.com
 COMMENT=	A php script that displays info about the host being accessed
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 PREFIX=		${LOCALBASE}
@@ -25,9 +26,6 @@ PLIST=		${WRKDIR}/plist
 
 PLIST_SUB+=	INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-patch:
 	rm -f ${PLIST}
 	cd ${WRKSRC};\
@@ -43,4 +41,4 @@ do-install:
 	${CHMOD} -R ${BINMODE} ${INSTALLDIR}
 	${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/phpsysinfo/Makefile

@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	phpsysinfo
 MAINTAINER=	so14k@so14k.com
 COMMENT=	A php script that displays info about the host being accessed
 
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 PREFIX=		${LOCALBASE}
@@ -25,9 +26,6 @@ PLIST=		${WRKDIR}/plist
 
 PLIST_SUB+=	INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-patch:
 	rm -f ${PLIST}
 	cd ${WRKSRC};\
@@ -43,4 +41,4 @@ do-install:
 	${CHMOD} -R ${BINMODE} ${INSTALLDIR}
 	${FIND} ${INSTALLDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/smarty/Makefile

@@ -21,6 +21,7 @@ COMMENT=	The PHP compiling template engine
 WRKSRC=	${WRKDIR}/Smarty-${PORTVERSION}
 
 NO_BUILD=	yes
+USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -28,8 +29,6 @@ MSG_SRC=	${FILESDIR}/pkg-message
 
 MSG_SUB=	DATADIR=${DATADIR} LOCALBASE=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/lang/php4/bsd.php.mk"
 do-install:
 	@${MKDIR} ${DATADIR}
 .for f in Config_File.class.php Smarty.class.php Smarty_Compiler.class.php debug.tpl
@@ -59,4 +58,4 @@ post-install:
 		${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/turck-mmcache/Makefile

@@ -16,15 +16,13 @@ COMMENT=	An opcode cache for PHP with encoder and loader
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
+USE_PHP=	yes
 USE_PHPIZE=	yes
 
 CONFIGURE_ARGS=	--enable-mmcache=shared
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
 post-patch:
 	@${REINPLACE_CMD} 's|ALIGN|MMALIGN|g' ${WRKSRC}/mm.c ${WRKSRC}/mmcache.c
 
@@ -49,4 +47,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

x11-toolkits/php-gtk/Makefile

@@ -21,18 +21,15 @@ USE_LIBTOOL=	yes
 WANT_AUTOMAKE_VER=	15
 WANT_AUTOCONF_VER=	253
 LIBTOOLFILES=	# none
+USE_PHP=	yes
 USE_PHPIZE=	yes
+WANT_PHP_CLI=	yes
 USE_AUTOCONF=	no
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
-BUILD_DEPENDS+=	${PREFIX}/bin/php:${PORTSDIR}/lang/php4
-
 # Fix environment for self contained extensions
 ENVSCE=		-DHAVE_PHP_GTK=1 -DCOMPILE_DL_PHP_GTK=1	\
 		-DHAVE_PIEMENU=1	\
@@ -120,4 +117,4 @@ post-install:
 	@${CAT} ${MASTERDIR}/pkg-message
 	@${ECHO} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

x11-toolkits/php-gtk2/Makefile

@@ -21,18 +21,15 @@ USE_LIBTOOL=	yes
 WANT_AUTOMAKE_VER=	15
 WANT_AUTOCONF_VER=	253
 LIBTOOLFILES=	# none
+USE_PHP=	yes
 USE_PHPIZE=	yes
+WANT_PHP_CLI=	yes
 USE_AUTOCONF=	no
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
-BUILD_DEPENDS+=	${PREFIX}/bin/php:${PORTSDIR}/lang/php4
-
 # Fix environment for self contained extensions
 ENVSCE=		-DHAVE_PHP_GTK=1 -DCOMPILE_DL_PHP_GTK=1	\
 		-DHAVE_PIEMENU=1	\
@@ -120,4 +117,4 @@ post-install:
 	@${CAT} ${MASTERDIR}/pkg-message
 	@${ECHO} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>