Prepare for new slave port: www/php4-cgi.

PR:		ports/52617
Submitted by:	Alex Dupre <sysadmin@alexdupre.com>

12 files changed, 147 insertions, 78 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index f4bbd0450363..463f91b06181 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -24,22 +24,32 @@ PORTVERSION=	4.3.2.r4
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://downloads.php.net/jani/ \
 		http://www.gufi.org/~alex/php/
-.if defined(WITHOUT_CLI)
+.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
-.endif
+.else
 .if defined(WITHOUT_APACHE)
+.if defined(WITHOUT_CLI)
+PKGNAMESUFFIX=	-cgi
+.else
 PKGNAMESUFFIX=	-cli
 .endif
+.endif
+.endif
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER?=	sysadmin@alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
 .if defined(WITHOUT_APACHE)
+.if defined(WITHOUT_CLI)
+COMMENT=	PHP Common Gateway Interface
+.else
 COMMENT=	PHP Command Line Interpreter
 .endif
+.else
 .if defined(WITHOUT_CLI)
 COMMENT=	PHP Apache Module
 .endif
+.endif
 
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
@@ -54,22 +64,37 @@ CONFIGURE_ARGS=	--enable-versioning \
 		--disable-all
 
 EXT_DIR=	20020429
-SAPI_FILE=	""
+SAPI_FILE=	"@comment "
 
+CONFLICTS=	php4-cli-4* mod_php4-4* php4-cgi-4*
 .if defined(WITHOUT_APACHE)
-CONFLICTS=	php4-4* mod_php4-4*
+.if defined(WITHOUT_CLI)
+CONFLICTS=	php4-4* php4-cli-4* mod_php4-4*
+.else
+CONFLICTS=	php4-4* php4-cgi-4* mod_php4-4*
+.endif
+.else
+.if defined(WITHOUT_CLI)
+CONFLICTS=	php4-4* php4-cli-4* php4-cgi-4*
+.endif
 .endif
 
+.if defined(WITHOUT_APACHE)
+CONFIGURE_ARGS+=--enable-discard-path
+PLIST_SUB+=	APACHE="@comment "
+.else
+PLIST_SUB+=	APACHE=""
+.endif
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4*
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
-
-CONFLICTS?=	php4-cli-4* mod_php4-4*
+.if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
+SAPI_FILE=	"bin/php"
+.endif
 
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
 		DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
@@ -508,30 +533,28 @@ pre-configure:
 	@${ECHO_CMD} "You cannot define WITH_SYBASEDB *and* WITH_SYBASECT!"
 	@${FALSE}
 .endif
-.if defined(WITHOUT_CLI) && defined(WITHOUT_APACHE)
-	@${ECHO_CMD} "You cannot define WITHOUT_CLI *and* WITHOUT_APACHE!"
-	@${FALSE}
-.endif
-.if !defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
+.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You may use the following build options:"
+	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
-.if !defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
-	@${ECHO_CMD} "	WITHOUT_CLI=yes		Disable Command Line Interpreter"
-	@${ECHO_CMD} "	WITHOUT_APACHE=yes	Disable Apache Module"
-.endif
+	@${ECHO_CMD} "Use port:"
+	@${ECHO_CMD} "	lang/php4-cli		for Command Line Interpreter only"
+	@${ECHO_CMD} "	www/php4-cgi		for Common Gateway Interface only"
+	@${ECHO_CMD} "	www/mod_php4		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
+.if !defined(WITHOUT_CLI)
 post-build:
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You may run the tests from the PHP test framework."
-	@${ECHO_CMD} "You can do this by typing 'make test' now."
+	@${ECHO_CMD} "You may run the tests from the PHP test framework, typing 'make test' now."
+	@${ECHO_CMD} "(It is safe to ignore errors about timestamp-related tests,"
+	@${ECHO_CMD} "since they are due to the different FreeBSD mktime() implementation)."
 	@${ECHO_CMD} ""
 
 test: all
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${.TARGET})
+.endif
 
 post-install:
 .if !defined(WITHOUT_CLI)
diff --git a/lang/php4/pkg-descr b/lang/php4/pkg-descr
index a14e137ec10f..36fc3796a6ec 100644
--- a/lang/php4/pkg-descr
+++ b/lang/php4/pkg-descr
@@ -1,8 +1,8 @@
-PHP, which stands for "PHP: Hypertect Preprocessor" is a widely-used Open
+PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open
 Source general-purpose scripting language that is especially suited for
-for Web development and can be embedded into HTML. Its syntax draws upon C,
-Java, and Perl, and is easy to learn. The main goal of the language is to
-allow web developers to write dinamically generated webpages quickly, but
+Web development and can be embedded into HTML.  Its syntax draws upon C,
+Java, and Perl, and is easy to learn.  The main goal of the language is to
+allow web developers to write dynamically generated webpages quickly, but
 you can do much more with PHP.
 
 WWW: http://www.php.net/
diff --git a/lang/php4/pkg-message b/lang/php4/pkg-message
index e53a3cf9b4df..6c74a09e8126 100644
--- a/lang/php4/pkg-message
+++ b/lang/php4/pkg-message
@@ -2,7 +2,7 @@
 
 You have installed the php4 package.
 
-Have a look at the php-dev port if you need additional extensions
+Have a look at the php4 port if you need additional extensions
 other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB.
 
 You can find it at
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index ca605327ebf0..c95c4a6f5dd1 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -197,7 +197,7 @@ lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
-%%APACHE%%%%SAPI_FILE%%
+%%SAPI_FILE%%
 %%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f
 %%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f
 %%CLI%%share/pear/bootstrap/Archive/Tar.php
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index f4bbd0450363..463f91b06181 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -24,22 +24,32 @@ PORTVERSION=	4.3.2.r4
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://downloads.php.net/jani/ \
 		http://www.gufi.org/~alex/php/
-.if defined(WITHOUT_CLI)
+.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
-.endif
+.else
 .if defined(WITHOUT_APACHE)
+.if defined(WITHOUT_CLI)
+PKGNAMESUFFIX=	-cgi
+.else
 PKGNAMESUFFIX=	-cli
 .endif
+.endif
+.endif
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER?=	sysadmin@alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
 .if defined(WITHOUT_APACHE)
+.if defined(WITHOUT_CLI)
+COMMENT=	PHP Common Gateway Interface
+.else
 COMMENT=	PHP Command Line Interpreter
 .endif
+.else
 .if defined(WITHOUT_CLI)
 COMMENT=	PHP Apache Module
 .endif
+.endif
 
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
@@ -54,22 +64,37 @@ CONFIGURE_ARGS=	--enable-versioning \
 		--disable-all
 
 EXT_DIR=	20020429
-SAPI_FILE=	""
+SAPI_FILE=	"@comment "
 
+CONFLICTS=	php4-cli-4* mod_php4-4* php4-cgi-4*
 .if defined(WITHOUT_APACHE)
-CONFLICTS=	php4-4* mod_php4-4*
+.if defined(WITHOUT_CLI)
+CONFLICTS=	php4-4* php4-cli-4* mod_php4-4*
+.else
+CONFLICTS=	php4-4* php4-cgi-4* mod_php4-4*
+.endif
+.else
+.if defined(WITHOUT_CLI)
+CONFLICTS=	php4-4* php4-cli-4* php4-cgi-4*
+.endif
 .endif
 
+.if defined(WITHOUT_APACHE)
+CONFIGURE_ARGS+=--enable-discard-path
+PLIST_SUB+=	APACHE="@comment "
+.else
+PLIST_SUB+=	APACHE=""
+.endif
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4*
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
-
-CONFLICTS?=	php4-cli-4* mod_php4-4*
+.if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
+SAPI_FILE=	"bin/php"
+.endif
 
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
 		DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
@@ -508,30 +533,28 @@ pre-configure:
 	@${ECHO_CMD} "You cannot define WITH_SYBASEDB *and* WITH_SYBASECT!"
 	@${FALSE}
 .endif
-.if defined(WITHOUT_CLI) && defined(WITHOUT_APACHE)
-	@${ECHO_CMD} "You cannot define WITHOUT_CLI *and* WITHOUT_APACHE!"
-	@${FALSE}
-.endif
-.if !defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
+.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You may use the following build options:"
+	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
-.if !defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
-	@${ECHO_CMD} "	WITHOUT_CLI=yes		Disable Command Line Interpreter"
-	@${ECHO_CMD} "	WITHOUT_APACHE=yes	Disable Apache Module"
-.endif
+	@${ECHO_CMD} "Use port:"
+	@${ECHO_CMD} "	lang/php4-cli		for Command Line Interpreter only"
+	@${ECHO_CMD} "	www/php4-cgi		for Common Gateway Interface only"
+	@${ECHO_CMD} "	www/mod_php4		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
+.if !defined(WITHOUT_CLI)
 post-build:
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You may run the tests from the PHP test framework."
-	@${ECHO_CMD} "You can do this by typing 'make test' now."
+	@${ECHO_CMD} "You may run the tests from the PHP test framework, typing 'make test' now."
+	@${ECHO_CMD} "(It is safe to ignore errors about timestamp-related tests,"
+	@${ECHO_CMD} "since they are due to the different FreeBSD mktime() implementation)."
 	@${ECHO_CMD} ""
 
 test: all
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${.TARGET})
+.endif
 
 post-install:
 .if !defined(WITHOUT_CLI)
diff --git a/lang/php5/pkg-descr b/lang/php5/pkg-descr
index a14e137ec10f..36fc3796a6ec 100644
--- a/lang/php5/pkg-descr
+++ b/lang/php5/pkg-descr
@@ -1,8 +1,8 @@
-PHP, which stands for "PHP: Hypertect Preprocessor" is a widely-used Open
+PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open
 Source general-purpose scripting language that is especially suited for
-for Web development and can be embedded into HTML. Its syntax draws upon C,
-Java, and Perl, and is easy to learn. The main goal of the language is to
-allow web developers to write dinamically generated webpages quickly, but
+Web development and can be embedded into HTML.  Its syntax draws upon C,
+Java, and Perl, and is easy to learn.  The main goal of the language is to
+allow web developers to write dynamically generated webpages quickly, but
 you can do much more with PHP.
 
 WWW: http://www.php.net/
diff --git a/lang/php5/pkg-message b/lang/php5/pkg-message
index e53a3cf9b4df..6c74a09e8126 100644
--- a/lang/php5/pkg-message
+++ b/lang/php5/pkg-message
@@ -2,7 +2,7 @@
 
 You have installed the php4 package.
 
-Have a look at the php-dev port if you need additional extensions
+Have a look at the php4 port if you need additional extensions
 other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB.
 
 You can find it at
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index ca605327ebf0..c95c4a6f5dd1 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -197,7 +197,7 @@ lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
-%%APACHE%%%%SAPI_FILE%%
+%%SAPI_FILE%%
 %%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f
 %%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f
 %%CLI%%share/pear/bootstrap/Archive/Tar.php
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index f4bbd0450363..463f91b06181 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -24,22 +24,32 @@ PORTVERSION=	4.3.2.r4
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://downloads.php.net/jani/ \
 		http://www.gufi.org/~alex/php/
-.if defined(WITHOUT_CLI)
+.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
-.endif
+.else
 .if defined(WITHOUT_APACHE)
+.if defined(WITHOUT_CLI)
+PKGNAMESUFFIX=	-cgi
+.else
 PKGNAMESUFFIX=	-cli
 .endif
+.endif
+.endif
 DISTNAME=	php-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER?=	sysadmin@alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
 .if defined(WITHOUT_APACHE)
+.if defined(WITHOUT_CLI)
+COMMENT=	PHP Common Gateway Interface
+.else
 COMMENT=	PHP Command Line Interpreter
 .endif
+.else
 .if defined(WITHOUT_CLI)
 COMMENT=	PHP Apache Module
 .endif
+.endif
 
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
@@ -54,22 +64,37 @@ CONFIGURE_ARGS=	--enable-versioning \
 		--disable-all
 
 EXT_DIR=	20020429
-SAPI_FILE=	""
+SAPI_FILE=	"@comment "
 
+CONFLICTS=	php4-cli-4* mod_php4-4* php4-cgi-4*
 .if defined(WITHOUT_APACHE)
-CONFLICTS=	php4-4* mod_php4-4*
+.if defined(WITHOUT_CLI)
+CONFLICTS=	php4-4* php4-cli-4* mod_php4-4*
+.else
+CONFLICTS=	php4-4* php4-cgi-4* mod_php4-4*
+.endif
+.else
+.if defined(WITHOUT_CLI)
+CONFLICTS=	php4-4* php4-cli-4* php4-cgi-4*
+.endif
 .endif
 
+.if defined(WITHOUT_APACHE)
+CONFIGURE_ARGS+=--enable-discard-path
+PLIST_SUB+=	APACHE="@comment "
+.else
+PLIST_SUB+=	APACHE=""
+.endif
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4*
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
-
-CONFLICTS?=	php4-cli-4* mod_php4-4*
+.if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
+SAPI_FILE=	"bin/php"
+.endif
 
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
 		DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
@@ -508,30 +533,28 @@ pre-configure:
 	@${ECHO_CMD} "You cannot define WITH_SYBASEDB *and* WITH_SYBASECT!"
 	@${FALSE}
 .endif
-.if defined(WITHOUT_CLI) && defined(WITHOUT_APACHE)
-	@${ECHO_CMD} "You cannot define WITHOUT_CLI *and* WITHOUT_APACHE!"
-	@${FALSE}
-.endif
-.if !defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
+.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You may use the following build options:"
+	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
-.if !defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
-	@${ECHO_CMD} "	WITHOUT_CLI=yes		Disable Command Line Interpreter"
-	@${ECHO_CMD} "	WITHOUT_APACHE=yes	Disable Apache Module"
-.endif
+	@${ECHO_CMD} "Use port:"
+	@${ECHO_CMD} "	lang/php4-cli		for Command Line Interpreter only"
+	@${ECHO_CMD} "	www/php4-cgi		for Common Gateway Interface only"
+	@${ECHO_CMD} "	www/mod_php4		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
+.if !defined(WITHOUT_CLI)
 post-build:
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You may run the tests from the PHP test framework."
-	@${ECHO_CMD} "You can do this by typing 'make test' now."
+	@${ECHO_CMD} "You may run the tests from the PHP test framework, typing 'make test' now."
+	@${ECHO_CMD} "(It is safe to ignore errors about timestamp-related tests,"
+	@${ECHO_CMD} "since they are due to the different FreeBSD mktime() implementation)."
 	@${ECHO_CMD} ""
 
 test: all
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${.TARGET})
+.endif
 
 post-install:
 .if !defined(WITHOUT_CLI)
diff --git a/lang/php53/pkg-descr b/lang/php53/pkg-descr
index a14e137ec10f..36fc3796a6ec 100644
--- a/lang/php53/pkg-descr
+++ b/lang/php53/pkg-descr
@@ -1,8 +1,8 @@
-PHP, which stands for "PHP: Hypertect Preprocessor" is a widely-used Open
+PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open
 Source general-purpose scripting language that is especially suited for
-for Web development and can be embedded into HTML. Its syntax draws upon C,
-Java, and Perl, and is easy to learn. The main goal of the language is to
-allow web developers to write dinamically generated webpages quickly, but
+Web development and can be embedded into HTML.  Its syntax draws upon C,
+Java, and Perl, and is easy to learn.  The main goal of the language is to
+allow web developers to write dynamically generated webpages quickly, but
 you can do much more with PHP.
 
 WWW: http://www.php.net/
diff --git a/lang/php53/pkg-message b/lang/php53/pkg-message
index e53a3cf9b4df..6c74a09e8126 100644
--- a/lang/php53/pkg-message
+++ b/lang/php53/pkg-message
@@ -2,7 +2,7 @@
 
 You have installed the php4 package.
 
-Have a look at the php-dev port if you need additional extensions
+Have a look at the php4 port if you need additional extensions
 other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB.
 
 You can find it at
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index ca605327ebf0..c95c4a6f5dd1 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -197,7 +197,7 @@ lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
-%%APACHE%%%%SAPI_FILE%%
+%%SAPI_FILE%%
 %%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f
 %%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f
 %%CLI%%share/pear/bootstrap/Archive/Tar.php