First step of the PHP mega-commit:

- remove extensions and PEAR from the PHP base ports
- add more OPTIONS to PHP base ports

8 files changed, 16 insertions, 86 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 7f1f4355a75f..27ea537fac2a 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -4,18 +4,16 @@
 #
 # $FreeBSD$
 #
-# Instructions on how to enable preferred extensions can be found in the
-# Makefile of the master port (lang/php4).
-#
 
 PORTEPOCH=	1
 CATEGORIES=	www
+PKGNAMEPREFIX=	mod_
 
-MAINTAINER=	sysadmin@alexdupre.com
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	PHP Apache Module
 
-PKGMESSAGE=	${.CURDIR}/pkg-message
 MASTERDIR=	${.CURDIR}/../../lang/php4
 
-WITHOUT_CLI=	yes
+CONFLICTS=	php4-4* php4-cli-4* php4-cgi-4*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/mod_php4/pkg-message b/www/mod_php4/pkg-message
deleted file mode 100644
index e8197e618fbf..000000000000
--- a/www/mod_php4/pkg-message
+++ /dev/null
@@ -1,18 +0,0 @@
-*****************************************************************************
-
-You have installed the mod_php4 package.
-
-Have a look at the mod_php4 port if you need additional extensions other than
-CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB.
-
-You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/mod_php4.tar
-
-Make sure index.php is part of your DirectoryIndex.
-
-You should add the following to your Apache configuration file:
-
-AddType application/x-httpd-php .php
-AddType application/x-httpd-php-source .phps
-
-*****************************************************************************
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 48055af08c7a..3bd43385db2e 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -4,18 +4,16 @@
 #
 # $FreeBSD$
 #
-# Instructions on how to enable preferred extensions can be found in the
-# Makefile of the master port (lang/php5).
-#
 
 PORTEPOCH=	1
 CATEGORIES=	www
+PKGNAMEPREFIX=	mod_
 
-MAINTAINER=	sysadmin@alexdupre.com
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	PHP Apache Module
 
-PKGMESSAGE=	${.CURDIR}/pkg-message
 MASTERDIR=	${.CURDIR}/../../lang/php5
 
-WITHOUT_CLI=	yes
+CONFLICTS=	php5-5* php5-cli-5* php5-cgi-5*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/mod_php5/pkg-message b/www/mod_php5/pkg-message
deleted file mode 100644
index e3fe28c5ff1f..000000000000
--- a/www/mod_php5/pkg-message
+++ /dev/null
@@ -1,19 +0,0 @@
-*****************************************************************************
-
-You have installed the mod_php5 package.
-
-Have a look at the mod_php5 port if you need additional extensions other than
-CTYPE, DOM, ICONV, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER
-and XML.
-
-You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/mod_php5.tar
-
-Make sure index.php is part of your DirectoryIndex.
-
-You should add the following to your Apache configuration file:
-
-AddType application/x-httpd-php .php
-AddType application/x-httpd-php-source .phps
-
-*****************************************************************************
diff --git a/www/php4-cgi/Makefile b/www/php4-cgi/Makefile
index 9dc5cf5c6151..b9c9f7d8f39c 100644
--- a/www/php4-cgi/Makefile
+++ b/www/php4-cgi/Makefile
@@ -4,18 +4,15 @@
 #
 # $FreeBSD$
 #
-# Instructions on how to enable preferred extensions can be found in the
-# Makefile of the master port (lang/php4).
-#
 
 CATEGORIES=	www
+PKGNAMESUFFIX=	-cgi
 
-MAINTAINER=	sysadmin@alexdupre.com
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	PHP Common Gateway Interface
 
-PKGMESSAGE=	${.CURDIR}/pkg-message
 MASTERDIR=	${.CURDIR}/../../lang/php4
 
-WITHOUT_APACHE=	yes
-WITHOUT_CLI=	yes
+CONFLICTS=	php4-4* php4-cli-4* mod_php4-4*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/php4-cgi/pkg-message b/www/php4-cgi/pkg-message
deleted file mode 100644
index e9b0e071d936..000000000000
--- a/www/php4-cgi/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-*****************************************************************************
-
-You have installed the php4-cgi package.
-
-Have a look at the php4-cgi port if you need additional extensions other than
-CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB.
-
-You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/php4-cgi.tar
-
-*****************************************************************************
diff --git a/www/php5-cgi/Makefile b/www/php5-cgi/Makefile
index 6e4bd6fa4966..7d2f7a40ea21 100644
--- a/www/php5-cgi/Makefile
+++ b/www/php5-cgi/Makefile
@@ -4,18 +4,15 @@
 #
 # $FreeBSD$
 #
-# Instructions on how to enable preferred extensions can be found in the
-# Makefile of the master port (lang/php5).
-#
 
 CATEGORIES=	www
+PKGNAMESUFFIX=	-cgi
 
-MAINTAINER=	sysadmin@alexdupre.com
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	PHP Common Gateway Interface
 
-PKGMESSAGE=	${.CURDIR}/pkg-message
 MASTERDIR=	${.CURDIR}/../../lang/php5
 
-WITHOUT_APACHE=	yes
-WITHOUT_CLI=	yes
+CONFLICTS=	php5-5* php5-cli-5* mod_php5-5*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/php5-cgi/pkg-message b/www/php5-cgi/pkg-message
deleted file mode 100644
index 193a2680899b..000000000000
--- a/www/php5-cgi/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-*****************************************************************************
-
-You have installed the php5-cgi package.
-
-Have a look at the php5-cgi port if you need additional extensions other than
-CTYPE, DOM, ICONV, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER
-and XML.
-
-You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/php5-cgi.tar
-
-*****************************************************************************