Fix or remove obsolate or broken ways to depend on php.

22 files changed, 6 insertions, 43 deletions

diff --git a/chinese/tatter-tools/Makefile b/chinese/tatter-tools/Makefile
index 1f669b80d823..404b8450639f 100644
--- a/chinese/tatter-tools/Makefile
+++ b/chinese/tatter-tools/Makefile
@@ -18,7 +18,6 @@ MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Cute and easy blog Tool with Traditional-Chinese(zh_TW.UTF-8)
 
 USE_PHP=	mysql pcre session xml
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index 509dd6dbad01..9f88a9bba5b4 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -21,7 +21,6 @@ USE_PHP=	ctype pcre posix session tokenizer xml zlib
 .endif
 
 NO_BUILD=	YES
-PHP4_PORT?=	www/mod_php4
 PHPBT=		www/data-dist/phpbt
 PLIST_SUB=	PHPBT=${PHPBT}
 
diff --git a/games/hlstats/Makefile b/games/hlstats/Makefile
index 41d19fbb4c2c..c6989ed537eb 100644
--- a/games/hlstats/Makefile
+++ b/games/hlstats/Makefile
@@ -14,11 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A real-time stats parser for Half Life & its mods
 
-RUN_DEPENDS=	php-config:${PORTSDIR}/www/mod_php4 \
+RUN_DEPENDS=	\
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
 NO_BUILD=	yes
 USE_APACHE=	yes
+USE_PHP=	yes
 USE_PERL5_RUN=	yes
 
 do-install:
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index 3bf5000ad4b7..016d2e7c9dd3 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -15,11 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	yukinopo@livedoor.com
 COMMENT=	A PHP class for creating scientific and business charts
 
-.if defined(WITH_APACHE2)
-RUN_DEPENDS=   ${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
-.else
-RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
+USE_PHP=	yes
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 NO_BUILD=	YES
diff --git a/print/phppdflib/Makefile b/print/phppdflib/Makefile
index 71596ed25e57..b83612afadf3 100644
--- a/print/phppdflib/Makefile
+++ b/print/phppdflib/Makefile
@@ -16,14 +16,9 @@ COMMENT=	An easy to use API for creating PDF files dynamically
 
 USE_PHP=	yes
 WANT_PHP_MOD=	yes
-PHP_PORT?=	${PORTSDIR}/www/mod_php4
 
 BROKEN_WITH_PHP=5
 
-.if defined(WITH_APACHE)
-RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/libphp4.so:${PHP_PORT}
-.endif
-
 WRKSRC=		${WRKDIR}/phppdflib
 USE_BZIP2=	yes
 NO_BUILD=	yes
diff --git a/www/b2evo/Makefile b/www/b2evo/Makefile
index 72e56e96cf44..52f91d33eb5a 100644
--- a/www/b2evo/Makefile
+++ b/www/b2evo/Makefile
@@ -21,7 +21,6 @@ USE_ZIP=	YES
 
 B2EVO_DATE?=	2005-09-16
 USE_PHP=	mysql pcre session xml xmlrpc
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile
index 72e56e96cf44..52f91d33eb5a 100644
--- a/www/b2evolution/Makefile
+++ b/www/b2evolution/Makefile
@@ -21,7 +21,6 @@ USE_ZIP=	YES
 
 B2EVO_DATE?=	2005-09-16
 USE_PHP=	mysql pcre session xml xmlrpc
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
diff --git a/www/dokuwiki-devel/Makefile b/www/dokuwiki-devel/Makefile
index 01dd1db3029b..5bab0886f0da 100644
--- a/www/dokuwiki-devel/Makefile
+++ b/www/dokuwiki-devel/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A simple and easy to use wiki, no database required
 
 DIST_VER=	${PORTNAME}-2006-03-09
 USE_PHP=	gd pcre session xml zlib
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 01dd1db3029b..5bab0886f0da 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A simple and easy to use wiki, no database required
 
 DIST_VER=	${PORTNAME}-2006-03-09
 USE_PHP=	gd pcre session xml zlib
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 4356a55e840a..69e01f992668 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -17,12 +17,7 @@ COMMENT=	GeekLog is a web content magagement system
 USE_MYSQL=	yes
 
 NO_BUILD=	yes
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
+USE_PHP=	yes
 
 WWW_DIR=	${PREFIX}/www/data
 
diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile
index dd3f61be1869..7370bcd1c151 100644
--- a/www/lifetype/Makefile
+++ b/www/lifetype/Makefile
@@ -22,7 +22,6 @@ IGNOREFILES=	_all_plugins${EXTRACT_SUFX} _all_templates${EXTRACT_SUFX}
 USE_ZIP=	YES
 
 USE_PHP=	ctype mysql pcre session xml
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 WWWDOCROOT?=	www/data
diff --git a/www/notftp/Makefile b/www/notftp/Makefile
index 1187cfd1edd4..aa601ec05374 100644
--- a/www/notftp/Makefile
+++ b/www/notftp/Makefile
@@ -13,15 +13,7 @@ MASTER_SITES=	http://wonko.com/notftp/files/
 MAINTAINER=	ryan@wonko.com
 COMMENT=	An easy to use Web to FTP gateway written in PHP
 
-.if exists(${LOCALBASE}/include/apache2/os.h)
-WITH_APACHE2=	yes
-.endif
-
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
+USE_PHP=	yes
 
 PREFIX=		${LOCALBASE}
 WEBOWN?=	www
diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile
index 8f2cba611e5f..977d574b0d2b 100644
--- a/www/phpmyfaq/Makefile
+++ b/www/phpmyfaq/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 USE_ZIP=	YES
 
 USE_PHP=	mysql pcre pdf session xml xmlrpc zlib
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
diff --git a/www/phpwiki/Makefile b/www/phpwiki/Makefile
index 7ffda064e5a4..06fa34c2f333 100644
--- a/www/phpwiki/Makefile
+++ b/www/phpwiki/Makefile
@@ -22,7 +22,6 @@ USE_PHP=	ctype pcre posix session tokenizer xml zlib
 .endif
 
 NO_BUILD=	YES
-PHP4_PORT?=	www/mod_php4
 PHPWIKI?=	www/data-dist/phpwiki
 PLIST_SUB+=	PHPWIKI=${PHPWIKI}
 USERFILES=	admin.php lib/config.php
diff --git a/www/phpwiki13/Makefile b/www/phpwiki13/Makefile
index 444a5d385bf3..b60d6b23c1db 100644
--- a/www/phpwiki13/Makefile
+++ b/www/phpwiki13/Makefile
@@ -20,7 +20,6 @@ LATEST_LINK=	phpwiki13
 USE_PHP=	ctype pcre posix session tokenizer xml zlib
 
 NO_BUILD=	YES
-PHP4_PORT?=	www/mod_php4
 PHPWIKI?=	www/data-dist/phpwiki
 PLIST_SUB+=	PHPWIKI=${PHPWIKI}
 SUB_FILES=	pkg-message
diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index 90b920cb8bcf..13ec66bb53aa 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	babak@farrokhi.net
 COMMENT=	A WikiWikiWeb clone using PHP
 
 USE_PHP=	mbstring
-PHP4_PORT?=	www/mod_php4
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index ffe1dd938a57..d3e424719e96 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A server-side rss aggregator written in php with mysql
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
+USE_PHP=	yes
 
 USE_MYSQL=	yes
 
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 649e328ea7e0..c56b81f4bdab 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_PHP=	yes
 USE_APACHE=	1.3+
 WANT_PHP_CGI=	yes
-CONFLICTS=	mod_php4-4* php-4.* mod_php5-5* php-5.*
 
 WITH_LOGFILE?=	/var/log/suphp.log
 PHP_PATH?=	${LOCALBASE}/bin/php
diff --git a/www/textpattern/Makefile b/www/textpattern/Makefile
index dad04470d90b..1c8f8bc369a8 100644
--- a/www/textpattern/Makefile
+++ b/www/textpattern/Makefile
@@ -15,7 +15,6 @@ COMMENT=	A free, flexible, elegant, easy-to-use content management system
 
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
-PHP4_PORT?=	www/mod_php4
 WWWOWN?=	www
 WWWGRP?=	www
 TEXTPATTERN?=	www/data-dist/${PORTNAME}
diff --git a/www/wikindx/Makefile b/www/wikindx/Makefile
index 610b5618ab8e..4d590e11d1aa 100644
--- a/www/wikindx/Makefile
+++ b/www/wikindx/Makefile
@@ -19,7 +19,6 @@ USE_PHP=	session mysql
 
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/wikindx3
-PHP4_PORT?=	www/mod_php4
 WIKINDX?=	www/data-dist/wikindx
 PLIST_SUB+=	WIKINDX=${WIKINDX}
 ROOTFILES=	config.php index.php rss.php
diff --git a/www/wordpress-mu/Makefile b/www/wordpress-mu/Makefile
index 854a2f1b4a77..21301cb92058 100644
--- a/www/wordpress-mu/Makefile
+++ b/www/wordpress-mu/Makefile
@@ -20,7 +20,6 @@ COMMENT=	Multi-user version of the famous WordPress blogging application
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_PHP=	mysql pcre xml
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	yes
 WANT_PHP_WEB=	yes
 WORDPRESSMU?=	www/data/wordpress-mu
diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 0ddcda642434..73aa64be91ff 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A state-of-the-art semantic personal publishing platform
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_PHP=	mysql pcre xml
-PHP4_PORT?=	www/mod_php4
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 WORDPRESS?=	www/data/wordpress