15 files changed, 210 insertions, 48 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index a5bd21906cdd..81f04ae3aa0d 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -1,20 +1,49 @@
-# New ports collection makefile for:    apache HTTPD
-# Version required:     1.2.1
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 erich@rrnet.com
+# New ports collection makefile for:	apache HTTPD / php 2.0b12
+# Version required:	1.2.1 / 2.0b12
+# Date created:		Wed Sep  3 18:28:20 CEST 1997
+# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.37 1997/08/13 15:05:03 ache Exp $
+# $Id$
 #
 
 DISTNAME=       apache_1.2.1
-PKGNAME=        apache-1.2.1
 CATEGORIES=	www
-MASTER_SITES=   ftp://www.apache.org/apache/dist/
+MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
+		ftp://ftp.nerosworld.com/pub/php/dist/ \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftpza.co.za/pub/mirrors/php/
+DISTFILES=	apache_1.2.1.tar.gz \
+                php-2.0b12.tar.gz
 
-MAINTAINER=     ports@freebsd.org
+MAINTAINER=     andreas@FreeBSD.ORG
+
+NO_PACKAGE=	"Too many questions"
+IS_INTERACTIVE=	yes
+BROKEN=		"Am working on it..."
+
+#
+# Currently we support two db's: msql and mysql
+#
+.if !defined(PHP_DBTYPE)
+pre-fetch:
+	@echo
+	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@echo "make PHP_DBTYPE=[ msql | mysql ]"
+	@false
+
+.elif defined(PHP_DBTYPE)
+.if ${PHP_DBTYPE} == msql
+BUILD_DEPENDS=	msql:${PORTSDIR}/databases/msql
+PATCHDIR=	${.CURDIR}/patches.msql
+
+.elif ${PHP_DBTYPE} == mysql
+BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
+PATCHDIR=	${.CURDIR}/patches.mysql
+.endif
+.endif
 
 # Set it for local-supplied patch, f.e.
-# VERS_ID = mods-1.0/me
+VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
@@ -24,6 +53,19 @@ post-patch:
 	< Configuration.old > Configuration
 .endif
 
+
+pre-configure:
+	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	( cd ${WRKDIR}/php-2.0b12; ./install )
+	( cd ${WRKDIR}/php-2.0b12/src; make )
+	( cd ${WRKDIR}/php-2.0b12/src \
+	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	( cd ${WRKDIR}/apache_1.2.1/src \
+	&& echo "Module php_module mod_php.o" \
+	>> Configuration \
+	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	>> Configuration )
+
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
@@ -31,5 +73,10 @@ post-install:
 		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
+	echo "AddType application/x-httpd-php .phtml" \
+		> ${PREFIX}/etc/apache/srm.conf.php
+	echo "Don't forget to enable php support in \
+		${PREFIX}/etc/apache/srm.conf"
+	echo "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index 5229ef58f766..2cdaab51d313 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (dir.patch) = d4024889d191c936be088616a3076942
+MD5 (php-2.0b12.tar.gz) = 458ce74130ded39170a70c47e642b10f
diff --git a/www/mod_php3/pkg-comment b/www/mod_php3/pkg-comment
index 0a8a9cf142af..f606b52730a0 100644
--- a/www/mod_php3/pkg-comment
+++ b/www/mod_php3/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean.
+The extremely popular Apache http server with php support.
diff --git a/www/mod_php3/pkg-descr b/www/mod_php3/pkg-descr
index f08e87f934fa..e3800e40682e 100644
--- a/www/mod_php3/pkg-descr
+++ b/www/mod_php3/pkg-descr
@@ -1,5 +1,4 @@
-                                 Apache
-                             Version 1.0 (and up)
+                                 Apache / PHP
 
 What is it?
 -----------
@@ -9,7 +8,14 @@ server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
 includes many frequently requested new features, and has an API which
 allows it to be extended to meet users' needs more easily.
 
-Documentation
--------------
+This version includes support for the dynamic page language php,
+which is a more comprehensive embedded language than SSI, with
+built-in support for various databases (such as mSQL, mySQL, 
+postgresql, Oracle, Sybase) and page counters.
 
-All the documentation is on-line on the WWW, via the URL http://www.apache.org
+For more information about apache dynamic pages and php, see:
+
+	http://www.apacheweek.com/features/dynamicpages/
+	http://php.iquest.net/
+
+-andreas
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index c60ce6b20139..5585bc42da9a 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -2,6 +2,7 @@ etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
 etc/apache/httpd.conf-dist
 etc/apache/srm.conf-dist
+etc/apache/srm.conf.php
 etc/apache/access.conf-dist
 etc/apache/mime.types-dist
 sbin/httpd
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index a5bd21906cdd..81f04ae3aa0d 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,20 +1,49 @@
-# New ports collection makefile for:    apache HTTPD
-# Version required:     1.2.1
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 erich@rrnet.com
+# New ports collection makefile for:	apache HTTPD / php 2.0b12
+# Version required:	1.2.1 / 2.0b12
+# Date created:		Wed Sep  3 18:28:20 CEST 1997
+# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.37 1997/08/13 15:05:03 ache Exp $
+# $Id$
 #
 
 DISTNAME=       apache_1.2.1
-PKGNAME=        apache-1.2.1
 CATEGORIES=	www
-MASTER_SITES=   ftp://www.apache.org/apache/dist/
+MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
+		ftp://ftp.nerosworld.com/pub/php/dist/ \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftpza.co.za/pub/mirrors/php/
+DISTFILES=	apache_1.2.1.tar.gz \
+                php-2.0b12.tar.gz
 
-MAINTAINER=     ports@freebsd.org
+MAINTAINER=     andreas@FreeBSD.ORG
+
+NO_PACKAGE=	"Too many questions"
+IS_INTERACTIVE=	yes
+BROKEN=		"Am working on it..."
+
+#
+# Currently we support two db's: msql and mysql
+#
+.if !defined(PHP_DBTYPE)
+pre-fetch:
+	@echo
+	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@echo "make PHP_DBTYPE=[ msql | mysql ]"
+	@false
+
+.elif defined(PHP_DBTYPE)
+.if ${PHP_DBTYPE} == msql
+BUILD_DEPENDS=	msql:${PORTSDIR}/databases/msql
+PATCHDIR=	${.CURDIR}/patches.msql
+
+.elif ${PHP_DBTYPE} == mysql
+BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
+PATCHDIR=	${.CURDIR}/patches.mysql
+.endif
+.endif
 
 # Set it for local-supplied patch, f.e.
-# VERS_ID = mods-1.0/me
+VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
@@ -24,6 +53,19 @@ post-patch:
 	< Configuration.old > Configuration
 .endif
 
+
+pre-configure:
+	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	( cd ${WRKDIR}/php-2.0b12; ./install )
+	( cd ${WRKDIR}/php-2.0b12/src; make )
+	( cd ${WRKDIR}/php-2.0b12/src \
+	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	( cd ${WRKDIR}/apache_1.2.1/src \
+	&& echo "Module php_module mod_php.o" \
+	>> Configuration \
+	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	>> Configuration )
+
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
@@ -31,5 +73,10 @@ post-install:
 		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
+	echo "AddType application/x-httpd-php .phtml" \
+		> ${PREFIX}/etc/apache/srm.conf.php
+	echo "Don't forget to enable php support in \
+		${PREFIX}/etc/apache/srm.conf"
+	echo "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 5229ef58f766..2cdaab51d313 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (dir.patch) = d4024889d191c936be088616a3076942
+MD5 (php-2.0b12.tar.gz) = 458ce74130ded39170a70c47e642b10f
diff --git a/www/mod_php4/pkg-comment b/www/mod_php4/pkg-comment
index 0a8a9cf142af..f606b52730a0 100644
--- a/www/mod_php4/pkg-comment
+++ b/www/mod_php4/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean.
+The extremely popular Apache http server with php support.
diff --git a/www/mod_php4/pkg-descr b/www/mod_php4/pkg-descr
index f08e87f934fa..e3800e40682e 100644
--- a/www/mod_php4/pkg-descr
+++ b/www/mod_php4/pkg-descr
@@ -1,5 +1,4 @@
-                                 Apache
-                             Version 1.0 (and up)
+                                 Apache / PHP
 
 What is it?
 -----------
@@ -9,7 +8,14 @@ server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
 includes many frequently requested new features, and has an API which
 allows it to be extended to meet users' needs more easily.
 
-Documentation
--------------
+This version includes support for the dynamic page language php,
+which is a more comprehensive embedded language than SSI, with
+built-in support for various databases (such as mSQL, mySQL, 
+postgresql, Oracle, Sybase) and page counters.
 
-All the documentation is on-line on the WWW, via the URL http://www.apache.org
+For more information about apache dynamic pages and php, see:
+
+	http://www.apacheweek.com/features/dynamicpages/
+	http://php.iquest.net/
+
+-andreas
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index c60ce6b20139..5585bc42da9a 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -2,6 +2,7 @@ etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
 etc/apache/httpd.conf-dist
 etc/apache/srm.conf-dist
+etc/apache/srm.conf.php
 etc/apache/access.conf-dist
 etc/apache/mime.types-dist
 sbin/httpd
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index a5bd21906cdd..81f04ae3aa0d 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,20 +1,49 @@
-# New ports collection makefile for:    apache HTTPD
-# Version required:     1.2.1
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 erich@rrnet.com
+# New ports collection makefile for:	apache HTTPD / php 2.0b12
+# Version required:	1.2.1 / 2.0b12
+# Date created:		Wed Sep  3 18:28:20 CEST 1997
+# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.37 1997/08/13 15:05:03 ache Exp $
+# $Id$
 #
 
 DISTNAME=       apache_1.2.1
-PKGNAME=        apache-1.2.1
 CATEGORIES=	www
-MASTER_SITES=   ftp://www.apache.org/apache/dist/
+MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
+		ftp://ftp.nerosworld.com/pub/php/dist/ \
+		ftp://ftp.u-aizu.ac.jp/pub/net/www/php \
+		ftp://ftpza.co.za/pub/mirrors/php/
+DISTFILES=	apache_1.2.1.tar.gz \
+                php-2.0b12.tar.gz
 
-MAINTAINER=     ports@freebsd.org
+MAINTAINER=     andreas@FreeBSD.ORG
+
+NO_PACKAGE=	"Too many questions"
+IS_INTERACTIVE=	yes
+BROKEN=		"Am working on it..."
+
+#
+# Currently we support two db's: msql and mysql
+#
+.if !defined(PHP_DBTYPE)
+pre-fetch:
+	@echo
+	@echo "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@echo "make PHP_DBTYPE=[ msql | mysql ]"
+	@false
+
+.elif defined(PHP_DBTYPE)
+.if ${PHP_DBTYPE} == msql
+BUILD_DEPENDS=	msql:${PORTSDIR}/databases/msql
+PATCHDIR=	${.CURDIR}/patches.msql
+
+.elif ${PHP_DBTYPE} == mysql
+BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
+PATCHDIR=	${.CURDIR}/patches.mysql
+.endif
+.endif
 
 # Set it for local-supplied patch, f.e.
-# VERS_ID = mods-1.0/me
+VERS_ID = php-2.0b12/andreas
 
 .if defined(VERS_ID)
 post-patch:
@@ -24,6 +53,19 @@ post-patch:
 	< Configuration.old > Configuration
 .endif
 
+
+pre-configure:
+	echo "Don\'t forget to add ${PREFIX}/include/gd to additional path !!!"
+	( cd ${WRKDIR}/php-2.0b12; ./install )
+	( cd ${WRKDIR}/php-2.0b12/src; make )
+	( cd ${WRKDIR}/php-2.0b12/src \
+	&& cp mod_php.c mod_php.h libphp.a ../../apache_1.2.1/src )
+	( cd ${WRKDIR}/apache_1.2.1/src \
+	&& echo "Module php_module mod_php.o" \
+	>> Configuration \
+	&& echo "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	>> Configuration )
+
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
@@ -31,5 +73,10 @@ post-install:
 		echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
+	echo "AddType application/x-httpd-php .phtml" \
+		> ${PREFIX}/etc/apache/srm.conf.php
+	echo "Don't forget to enable php support in \
+		${PREFIX}/etc/apache/srm.conf"
+	echo "See ${PREFIX}/etc/apache/srm.conf.php"
 
 .include <bsd.port.mk>
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 5229ef58f766..2cdaab51d313 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (dir.patch) = d4024889d191c936be088616a3076942
+MD5 (php-2.0b12.tar.gz) = 458ce74130ded39170a70c47e642b10f
diff --git a/www/mod_php5/pkg-comment b/www/mod_php5/pkg-comment
index 0a8a9cf142af..f606b52730a0 100644
--- a/www/mod_php5/pkg-comment
+++ b/www/mod_php5/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean.
+The extremely popular Apache http server with php support.
diff --git a/www/mod_php5/pkg-descr b/www/mod_php5/pkg-descr
index f08e87f934fa..e3800e40682e 100644
--- a/www/mod_php5/pkg-descr
+++ b/www/mod_php5/pkg-descr
@@ -1,5 +1,4 @@
-                                 Apache
-                             Version 1.0 (and up)
+                                 Apache / PHP
 
 What is it?
 -----------
@@ -9,7 +8,14 @@ server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
 includes many frequently requested new features, and has an API which
 allows it to be extended to meet users' needs more easily.
 
-Documentation
--------------
+This version includes support for the dynamic page language php,
+which is a more comprehensive embedded language than SSI, with
+built-in support for various databases (such as mSQL, mySQL, 
+postgresql, Oracle, Sybase) and page counters.
 
-All the documentation is on-line on the WWW, via the URL http://www.apache.org
+For more information about apache dynamic pages and php, see:
+
+	http://www.apacheweek.com/features/dynamicpages/
+	http://php.iquest.net/
+
+-andreas
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index c60ce6b20139..5585bc42da9a 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -2,6 +2,7 @@ etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
 etc/apache/httpd.conf-dist
 etc/apache/srm.conf-dist
+etc/apache/srm.conf.php
 etc/apache/access.conf-dist
 etc/apache/mime.types-dist
 sbin/httpd