- php3.ini lives in ${PREFIX}/etc (instead of ${PREFIX}/lib), now.

- redirect output of scripts/configure.php globally instead of redirecting
  each echo (saves about 900 bytes 8-).

3 files changed, 29 insertions, 29 deletions

diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 21c7d56a3e1b..44e564b98c4e 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.79 1999/06/26 11:53:00 dirk Exp $
+# $Id: Makefile,v 1.80 1999/07/01 11:28:24 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -86,7 +86,7 @@ PHP3_CONF_ARGS=	--prefix=${PREFIX} \
 		${CONFIGURE_TARGET} \
 		--with-system-regex \
 		--with-apache=${WRKSRC} \
-		--with-config-file-path=${PREFIX}/lib \
+		--with-config-file-path=${PREFIX}/etc \
 		--disable-debug \
 		--enable-track-vars
 
@@ -120,7 +120,7 @@ post-install:
 		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/php3.ini-dist ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/php3.ini-dist ${PREFIX}/etc
 .for i in php2 php3 phpi phps
 	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/share/apache/icons
 .endfor
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index a7b25a0637e1..7810d9da701b 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -7,6 +7,7 @@ etc/apache/magic
 etc/apache/magic.default
 etc/apache/mime.types
 etc/apache/mime.types.default
+etc/php3.ini-dist
 etc/rc.d/apache.sh
 include/apache/alloc.h
 include/apache/ap.h
@@ -40,7 +41,6 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
-lib/php3.ini-dist
 libexec/apache/libproxy.so
 libexec/apache/mod_access.so
 libexec/apache/mod_actions.so
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index cb72ca09333c..215b8a162c71 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -41,65 +41,65 @@ case $retval in
 esac
 
 mkdir -p ${WRKDIRPREFIX}${CURDIR}
-> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
 		\"tuning\")
-			echo "APACHE_PERF_TUNING=	YES" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "APACHE_PERF_TUNING=	YES"
 			;;
 		\"GD\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-gd=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libgd.a:\${PORTSDIR}/graphics/gd"
+			echo "PHP3_CONF_ARGS+=	--with-gd=\${PREFIX}"
 			GD=1
 			;;
 		\"FreeType\")
-			echo "LIB_DEPENDS+=		ttf.3:\${PORTSDIR}/print/freetype" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		ttf.3:\${PORTSDIR}/print/freetype"
 			if [ -z "$GD" ]; then
 				set $* \"GD\"
 			fi
 			;;
 		\"zlib\")
-			echo "PHP3_CONF_ARGS+=	--with-zlib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "PHP3_CONF_ARGS+=	--with-zlib"
 			;;
 		\"mcrypt\")
-			echo "LIB_DEPENDS+=		mcrypt.2:\${PORTSDIR}/security/libmcrypt" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-mcrypt=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		mcrypt.2:\${PORTSDIR}/security/libmcrypt"
+			echo "PHP3_CONF_ARGS+=	--with-mcrypt=\${PREFIX}"
 			;;
 		\"mhash\")
-			echo "LIB_DEPENDS+=		mhash.1:\${PORTSDIR}/security/mhash" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-mhash=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		mhash.1:\${PORTSDIR}/security/mhash"
+			echo "PHP3_CONF_ARGS+=	--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libpdf.a:\${PORTSDIR}/print/pdflib" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libpdf.a:\${PORTSDIR}/print/pdflib"
+			echo "PHP3_CONF_ARGS+=	--with-pdflib=\${PREFIX}"
 			;;
 		\"IMAP\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-imap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw"
+			echo "PHP3_CONF_ARGS+=	--with-imap=\${PREFIX}"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-pgsql=\${PREFIX}/pgsql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "BUILD_DEPENDS+=		\${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql"
+			echo "PHP3_CONF_ARGS+=	--with-pgsql=\${PREFIX}/pgsql"
 			;;
 		\"mSQL\")
-			echo "BUILD_DEPENDS+=		msql:\${PORTSDIR}/databases/msql" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-msql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "BUILD_DEPENDS+=		msql:\${PORTSDIR}/databases/msql"
+			echo "PHP3_CONF_ARGS+=	--with-msql=\${PREFIX}"
 			;;
 		\"dBase\")
-			echo "PHP3_CONF_ARGS+=	--with-dbase" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "PHP3_CONF_ARGS+=	--with-dbase"
 			;;
 		\"OpenLDAP\")
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			echo "PHP3_CONF_ARGS+=	--with-ldap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/libldap.a:\${PORTSDIR}/net/openldap"
+			echo "BUILD_DEPENDS+=		\${PREFIX}/lib/liblber.a:\${PORTSDIR}/net/openldap"
+			echo "PHP3_CONF_ARGS+=	--with-ldap=\${PREFIX}"
 			;;
 		\"modssl\")
-			cat << EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			cat << EOF
 PKGNAME=	apache-php3-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
 MASTER_SITES+=	http://www.modssl.org/source/ \\
 		ftp://ftp.modssl.org/source/ \\