Remove brokenness from this port ;-) Thanks to Dirk Froemberg.

New features:
- You have to set variable PHP_DBTYPE to msql or mysql by typing
  make PHP_DBTYPE=[ msql | mysql ]
  to build the port with msql or mysql support.
- The php configuration isn't interactive anymore
  Theoretically we could default to mysql database and build
  a package, so that make batch could work !
- Cleaned up port dependency, so that libgd actually gets build
  (I fixed this one)
- made portlint as happy as I could, changed /usr/local to ${PREFIX}
  and changed sed -> ${SED}
The only thing that is missing now is an apache-php-SSL port and
postgresql support ;-))
Submitted by:	Dirk Froemberg <ibex@physik.TU-Berlin.DE>

6 files changed, 108 insertions, 78 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 6e44a4a57df3..25f96fef3ec5 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -1,25 +1,23 @@
-# New ports collection makefile for:	apache HTTPD / php 2.0b12
-# Version required:	1.2.1 / 2.0b12
+# New ports collection makefile for:	apache HTTPD / php 2.0.1
+# Version required:	1.2.5 / 2.0.1
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
+# $Id: Makefile,v 1.42 1997/10/04 14:52:58 andreas Exp $
 #
 
-DISTNAME=       apache_1.2.1
-PKGNAME=	apache-php-1.2.1
+DISTNAME=       apache_1.2.5
+PKGNAME=	apache-php-1.2.5
 CATEGORIES=	www
 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
+DISTFILES=	apache_1.2.5.tar.gz php-2.0.1.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
-BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
-IS_INTERACTIVE=	yes
 
 #
 # Currently we support two db's: msql and mysql
@@ -33,17 +31,19 @@ pre-fetch:
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
-BUILD_DEPENDS=	msql:${PORTSDIR}/databases/msql
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		msql:${PORTSDIR}/databases/msql
 PATCHDIR=	${.CURDIR}/patches.msql
 
 .elif ${PHP_DBTYPE} == mysql
-BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		mysql:${PORTSDIR}/databases/mysql
 PATCHDIR=	${.CURDIR}/patches.mysql
 .endif
 .endif
 
 # Set it for local-supplied patch, f.e.
-VERS_ID = php-2.0b12/andreas
+VERS_ID = php-2.0.1/andreas
 
 .if defined(VERS_ID)
 post-patch:
@@ -54,32 +54,42 @@ post-patch:
 .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 \
+.if !defined(PHP_DBTYPE)
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
+.else
+	( cd ${WRKDIR}/php-2.0.1; ${SED} "s#@@PREFIX@@#${PREFIX}#" < ${FILESDIR}/install.patch | patch)
+	( cd ${WRKDIR}/php-2.0.1; ./install )
+	( cd ${WRKDIR}/php-2.0.1/src; make )
+	( cd ${WRKDIR}/php-2.0.1/src \
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.5/src )
+	( cd ${WRKDIR}/apache_1.2.5/src \
 	&& ${ECHO} "Module php_module mod_php.o" \
-	>> Configuration \
+	>> Configuration )
 .if ${PHP_DBTYPE} == msql
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	( cd ${WRKDIR}/apache_1.2.5/src \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib -lmsql -lgd -lm" \
+	>> Configuration )
 .else
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
-.endif
+	( cd ${WRKDIR}/apache_1.2.5/src \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" \
 	>> Configuration )
+.endif
+.endif
 
 post-install:
 	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/httpd ] && ${PREFIX}/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 \
+	@ ${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
+	@ ${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 2cdaab51d313..b3e1800fac04 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (php-2.0b12.tar.gz) = 458ce74130ded39170a70c47e642b10f
+MD5 (apache_1.2.5.tar.gz) = a87b3bd7e4b9246d849844a5b370bdb0
+MD5 (php-2.0.1.tar.gz) = c538adf59ddf8e99b5637292309a1e86
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 6e44a4a57df3..25f96fef3ec5 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,25 +1,23 @@
-# New ports collection makefile for:	apache HTTPD / php 2.0b12
-# Version required:	1.2.1 / 2.0b12
+# New ports collection makefile for:	apache HTTPD / php 2.0.1
+# Version required:	1.2.5 / 2.0.1
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
+# $Id: Makefile,v 1.42 1997/10/04 14:52:58 andreas Exp $
 #
 
-DISTNAME=       apache_1.2.1
-PKGNAME=	apache-php-1.2.1
+DISTNAME=       apache_1.2.5
+PKGNAME=	apache-php-1.2.5
 CATEGORIES=	www
 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
+DISTFILES=	apache_1.2.5.tar.gz php-2.0.1.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
-BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
-IS_INTERACTIVE=	yes
 
 #
 # Currently we support two db's: msql and mysql
@@ -33,17 +31,19 @@ pre-fetch:
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
-BUILD_DEPENDS=	msql:${PORTSDIR}/databases/msql
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		msql:${PORTSDIR}/databases/msql
 PATCHDIR=	${.CURDIR}/patches.msql
 
 .elif ${PHP_DBTYPE} == mysql
-BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		mysql:${PORTSDIR}/databases/mysql
 PATCHDIR=	${.CURDIR}/patches.mysql
 .endif
 .endif
 
 # Set it for local-supplied patch, f.e.
-VERS_ID = php-2.0b12/andreas
+VERS_ID = php-2.0.1/andreas
 
 .if defined(VERS_ID)
 post-patch:
@@ -54,32 +54,42 @@ post-patch:
 .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 \
+.if !defined(PHP_DBTYPE)
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
+.else
+	( cd ${WRKDIR}/php-2.0.1; ${SED} "s#@@PREFIX@@#${PREFIX}#" < ${FILESDIR}/install.patch | patch)
+	( cd ${WRKDIR}/php-2.0.1; ./install )
+	( cd ${WRKDIR}/php-2.0.1/src; make )
+	( cd ${WRKDIR}/php-2.0.1/src \
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.5/src )
+	( cd ${WRKDIR}/apache_1.2.5/src \
 	&& ${ECHO} "Module php_module mod_php.o" \
-	>> Configuration \
+	>> Configuration )
 .if ${PHP_DBTYPE} == msql
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	( cd ${WRKDIR}/apache_1.2.5/src \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib -lmsql -lgd -lm" \
+	>> Configuration )
 .else
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
-.endif
+	( cd ${WRKDIR}/apache_1.2.5/src \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" \
 	>> Configuration )
+.endif
+.endif
 
 post-install:
 	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/httpd ] && ${PREFIX}/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 \
+	@ ${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
+	@ ${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 2cdaab51d313..b3e1800fac04 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (php-2.0b12.tar.gz) = 458ce74130ded39170a70c47e642b10f
+MD5 (apache_1.2.5.tar.gz) = a87b3bd7e4b9246d849844a5b370bdb0
+MD5 (php-2.0.1.tar.gz) = c538adf59ddf8e99b5637292309a1e86
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 6e44a4a57df3..25f96fef3ec5 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,25 +1,23 @@
-# New ports collection makefile for:	apache HTTPD / php 2.0b12
-# Version required:	1.2.1 / 2.0b12
+# New ports collection makefile for:	apache HTTPD / php 2.0.1
+# Version required:	1.2.5 / 2.0.1
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.41 1997/09/09 10:01:36 asami Exp $
+# $Id: Makefile,v 1.42 1997/10/04 14:52:58 andreas Exp $
 #
 
-DISTNAME=       apache_1.2.1
-PKGNAME=	apache-php-1.2.1
+DISTNAME=       apache_1.2.5
+PKGNAME=	apache-php-1.2.5
 CATEGORIES=	www
 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
+DISTFILES=	apache_1.2.5.tar.gz php-2.0.1.tar.gz
 
 MAINTAINER=     andreas@FreeBSD.ORG
 
 NO_PACKAGE=	"Too many questions"
-BROKEN=		"php conf-dialogue needs knowledge of include and library paths"
-IS_INTERACTIVE=	yes
 
 #
 # Currently we support two db's: msql and mysql
@@ -33,17 +31,19 @@ pre-fetch:
 
 .elif defined(PHP_DBTYPE)
 .if ${PHP_DBTYPE} == msql
-BUILD_DEPENDS=	msql:${PORTSDIR}/databases/msql
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		msql:${PORTSDIR}/databases/msql
 PATCHDIR=	${.CURDIR}/patches.msql
 
 .elif ${PHP_DBTYPE} == mysql
-BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		mysql:${PORTSDIR}/databases/mysql
 PATCHDIR=	${.CURDIR}/patches.mysql
 .endif
 .endif
 
 # Set it for local-supplied patch, f.e.
-VERS_ID = php-2.0b12/andreas
+VERS_ID = php-2.0.1/andreas
 
 .if defined(VERS_ID)
 post-patch:
@@ -54,32 +54,42 @@ post-patch:
 .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 \
+.if !defined(PHP_DBTYPE)
+	@ ${ECHO}
+	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
+	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${FALSE}
+.else
+	( cd ${WRKDIR}/php-2.0.1; ${SED} "s#@@PREFIX@@#${PREFIX}#" < ${FILESDIR}/install.patch | patch)
+	( cd ${WRKDIR}/php-2.0.1; ./install )
+	( cd ${WRKDIR}/php-2.0.1/src; make )
+	( cd ${WRKDIR}/php-2.0.1/src \
+	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.5/src )
+	( cd ${WRKDIR}/apache_1.2.5/src \
 	&& ${ECHO} "Module php_module mod_php.o" \
-	>> Configuration \
+	>> Configuration )
 .if ${PHP_DBTYPE} == msql
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib -lmsql -lgd -lm" \
+	( cd ${WRKDIR}/apache_1.2.5/src \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib -lmsql -lgd -lm" \
+	>> Configuration )
 .else
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L/usr/local/lib/mysql -lmysql -L/usr/local/lib -lgd -lm" \
-.endif
+	( cd ${WRKDIR}/apache_1.2.5/src \
+	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" \
 	>> Configuration )
+.endif
+.endif
 
 post-install:
 	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/httpd ] && ${PREFIX}/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 \
+	@ ${ECHO} "Don't forget to enable php support in \
 		${PREFIX}/etc/apache/srm.conf"
-	${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
+	@ ${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 2cdaab51d313..b3e1800fac04 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (php-2.0b12.tar.gz) = 458ce74130ded39170a70c47e642b10f
+MD5 (apache_1.2.5.tar.gz) = a87b3bd7e4b9246d849844a5b370bdb0
+MD5 (php-2.0.1.tar.gz) = c538adf59ddf8e99b5637292309a1e86