Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_php4/Makefile,v
retrieving revision 1.151
diff -u -r1.151 Makefile
--- Makefile	18 Nov 2001 22:29:38 -0000	1.151
+++ Makefile	29 Nov 2001 23:26:17 -0000
@@ -2,7 +2,7 @@
 # Date created:		Sun May 28 11:31:54 CEST 2000
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
-# $FreeBSD: ports/www/mod_php4/Makefile,v 1.151 2001/11/18 22:29:38 dirk Exp $
+# $FreeBSD$
 #
 
 PORTNAME?=	mod_php4
@@ -102,5 +102,9 @@
 .endif
 
 post-extract: ${POSTEXTRACT}
+
+post-patch:
+	@${PERL} -pi -e 's,-lc-client,-lc-client4,' \
+		${WRKSRC}/ext/imap/config.m4
 
 .include <bsd.port.mk>
Index: scripts/configure.php
===================================================================
RCS file: /home/ncvs/ports/www/mod_php4/scripts/configure.php,v
retrieving revision 1.147
diff -u -r1.147 configure.php
--- scripts/configure.php	18 Nov 2001 22:35:30 -0000	1.147
+++ scripts/configure.php	29 Nov 2001 23:38:48 -0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/www/mod_php4/scripts/configure.php,v 1.147 2001/11/18 22:35:30 dirk Exp $
+# $FreeBSD: ports/www/mod_php4/scripts/configure.php,v 1.146 2001/11/18 22:29:38 dirk Exp $
 
 if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
 	exit
@@ -82,10 +82,10 @@
 			echo "LIB_DEPENDS+=	freetype.7:\${PORTSDIR}/print/freetype2"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX} \\"
-			echo "		--with-freetype-dir=\${PREFIX} \\"
-			echo "		--with-jpeg-dir=\${PREFIX} \\"
-			echo "		--with-png-dir=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
+			echo "		--with-freetype-dir=\${LOCALBASE} \\"
+			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
+			echo "		--with-png-dir=\${LOCALBASE}"
 			;;
 		\"zlib\")
 			echo "CONFIGURE_ARGS+=--with-zlib"
@@ -93,44 +93,44 @@
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=	mcrypt.6:\${PORTSDIR}/security/libmcrypt"
-			echo "CONFIGURE_ARGS+=--with-mcrypt=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-mcrypt=\${LOCALBASE}"
 			;;
 		\"mhash\")
 			echo "LIB_DEPENDS+=	mhash.2:\${PORTSDIR}/security/mhash"
-			echo "CONFIGURE_ARGS+=--with-mhash=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-mhash=\${LOCALBASE}"
 			;;
 		\"pdflib\")
 			echo "LIB_DEPENDS+=	pdf.3:\${PORTSDIR}/print/pdflib3"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
-			echo "CONFIGURE_ARGS+=--with-pdflib=\${PREFIX} \\"
+			echo "CONFIGURE_ARGS+=--with-pdflib=\${LOCALBASE} \\"
 			echo "		--with-zlib-dir=/usr \\"
-			echo "		--with-jpeg-dir=\${PREFIX} \\"
-			echo "		--with-png-dir=\${PREFIX} \\"
-			echo "		--with-tiff-dir=\${PREFIX}"
+			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
+			echo "		--with-png-dir=\${LOCALBASE} \\"
+			echo "		--with-tiff-dir=\${LOCALBASE}"
 			;;
 		\"IMAP\")
 			echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
-			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-imap=\${LOCALBASE}"
 			;;
 		\"IMAP-SSL\")
-			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${LOCALBASE}"
 			if [ -z "$IMAP" ]; then
 				set $* \"IMAP\"
 			fi
  			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
-			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}"
 			;;
 		\"PostgreSQL\")
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
-			if [ -x ${PREFIX}/pgsql/bin/postgres -a ! -x ${PREFIX}/bin/postgres ]; then
-				PGPREFIX=${PREFIX}/pgsql
+			if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then
+				PGPREFIX=${LOCALBASE}/pgsql
 			else
-				PGPREFIX=${PREFIX}
-				echo "CFLAGS+=-I\${PREFIX}/include/pgsql"
+				PGPREFIX=${LOCALBASE}
+				echo "CFLAGS+=-I\${LOCALBASE}/include/pgsql"
 			fi
 			echo "PGPREFIX=${PGPREFIX}"
 			echo "CONFIGURE_ARGS+=--with-pgsql=\${PGPREFIX}"
@@ -141,7 +141,7 @@
 			;;
 		\"SybaseDB\")
 			echo "LIB_DEPENDS+=	sybdb.0:\${PORTSDIR}/databases/freetds"
-			echo "CONFIGURE_ARGS+=--with-sybase=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}"
 			if [ "$SYBASECT" ]; then
 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -151,7 +151,7 @@
 			;;
 		\"SybaseCT\")
 			echo "LIB_DEPENDS+=	ct.0:\${PORTSDIR}/databases/freetds"
-			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}"
 			if [ "$SYBASEDB" ]; then
 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -161,7 +161,7 @@
 			;;
 		\"Interbase\")
 			echo "LIB_DEPENDS+=	gds.1:\${PORTSDIR}/databases/firebird"
-			echo "CONFIGURE_ARGS+=--with-interbase=\${PREFIX}/firebird"
+			echo "CONFIGURE_ARGS+=--with-interbase=\${LOCALBASE}/firebird"
 			;;
 		\"dBase\")
 			echo "CONFIGURE_ARGS+=--with-dbase"
@@ -169,28 +169,28 @@
 		\"OpenLDAP1\")
 			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
 			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap"
-			echo "CONFIGURE_ARGS+=--with-ldap=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
 			if [ "$OPENLDAP2" ]; then
 				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
-				LIBS="${LIBS} -lkrb -ldes -L\${PREFIX}/lib"
+				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
 			fi
 			OPENLDAP1=1
 			;;
 		\"OpenLDAP2\")
 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
 			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap2"
-			echo "CONFIGURE_ARGS+=--with-ldap=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
 			if [ "$OPENLDAP1" ]; then
 				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
-				LIBS="${LIBS} -lkrb -ldes -L\${PREFIX}/lib"
+				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
 			fi
 			OPENLDAP2=1
 			;;
@@ -200,19 +200,19 @@
 			;;
 		\"SNMP\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/net-snmp"
-			echo "CONFIGURE_ARGS+=--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
+			echo "CONFIGURE_ARGS+=--with-snmp=\${LOCALBASE} --enable-ucd-snmp-hack"
 			echo "USE_OPENSSL=	yes"
 			LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
 			;;
 		\"XML\")
 			echo "LIB_DEPENDS+=	expat.2:\${PORTSDIR}/textproc/expat2"
-			echo "CONFIGURE_ARGS+=--with-xml --with-expat-dir=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-xml --with-expat-dir=\${LOCALBASE}"
 			XML=1
 			;;
 		\"XSLT\")
 			echo "LIB_DEPENDS+=	sablot.70:\${PORTSDIR}/textproc/sablotron"
-			echo "CONFIGURE_ARGS+=--with-sablot=\${PREFIX}"
-			echo "CONFIGURE_ARGS+=--with-expat-dir=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-sablot=\${LOCALBASE}"
+			echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
@@ -222,27 +222,27 @@
 			;;
 		\"DOMXML\")
 			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
-			echo "CONFIGURE_ARGS+=--with-dom=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
 			;;
 		\"FTP\")
 			echo "CONFIGURE_ARGS+=--enable-ftp"
 			;;
 		\"CURL\")
-			echo "CONFIGURE_ARGS+=--with-curl=\${PREFIX}"
-			echo "BUILD_DEPENDS+=	\${PREFIX}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
+			echo "CONFIGURE_ARGS+=--with-curl=\${LOCALBASE}"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
                         ;;
 		\"gettext\")
 			echo "LIB_DEPENDS+=	intl.1:\${PORTSDIR}/devel/gettext"
-			echo "CONFIGURE_ARGS+=--with-gettext=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
 			;;
 		\"iconv\")
 			echo "LIB_DEPENDS+=	iconv.2:\${PORTSDIR}/converters/iconv"
-			echo "CONFIGURE_ARGS+=--with-iconv=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
 			ICONV=1
 			;;
 		\"pspell\")
 			echo "LIB_DEPENDS+=	pspell.4:\${PORTSDIR}/textproc/pspell"
-			echo "CONFIGURE_ARGS+=--with-pspell=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
 			;;
 		\"mbregex\")
 			${CAT} << EOF
@@ -274,7 +274,7 @@
 			;;
 		\"ming\")
 			echo "LIB_DEPENDS+=	ming.3:\${PORTSDIR}/graphics/ming"
-			echo "CONFIGURE_ARGS+=--with-ming=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-ming=\${LOCALBASE}"
 			;;
 		\"sockets\")
 			echo "CONFIGURE_ARGS+=--enable-sockets"