Add option for IMAP support.

7 files changed, 46 insertions, 3 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 84c48e2..4a43347 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/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.72 1999/04/11 22:23:30 dirk Exp $
+# $Id: Makefile,v 1.73 1999/04/13 15:40:20 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -94,6 +94,9 @@ pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 .endif
 
+post-extract:
+	@${LN} -s php-${VERSION_PHP3} ${WRKDIR}/php3
+
 pre-configure:
 	@cd ${WRKSRC} \
 	&& ./configure > /dev/null \
diff --git a/www/mod_php3/files/patch-aq b/www/mod_php3/files/patch-aq
new file mode 100644
index 0000000..e0bca67
--- /dev/null
+++ b/www/mod_php3/files/patch-aq
@@ -0,0 +1,19 @@
+--- ../php3/configure.orig	Tue Mar  2 02:35:59 1999
++++ ../php3/configure	Sun May  2 20:15:51 1999
+@@ -4508,14 +4508,14 @@
+ 		else
+ 			if test -f $IMAP_DIR/lib/libimap.a; then
+ 				IMAP_LIBS="-L$IMAP_DIR/lib -limap"
+-			elif test ! -f $IMAP_DIR/lib/c-client.a; then
++			elif test ! -f $IMAP_DIR/lib/libc-client4.a; then
+ 				if test ! -f $IMAP_DIR/lib/libc-client4.so; then
+ 					{ echo "configure: error: could not find c-client.a in $IMAP_DIR/lib !" 1>&2; exit 1; }
+ 				else
+ 					IMAP_LIBS="${ld_runpath_switch}$IMAP_DIR/lib -L$IMAP_DIR/lib -lc-client4"
+ 				fi
+ 			else
+-				IMAP_LIBS="-L$IMAP_DIR/lib $IMAP_DIR/lib/c-client.a"
++				IMAP_LIBS="-L$IMAP_DIR/lib $IMAP_DIR/lib/libc-client4.a"
+ 			fi
+ 		fi
+ 		IMAP_INCLUDE="-I$IMAP_INC_DIR/"
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 770d24b..3d9d5d2 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -13,6 +13,7 @@ GD		"PHP3:   GD library support" ON \
 FreeType	"PHP3:   TrueType font rendering (implies GD)" OFF \
 zlib		"PHP3:   zlib library support" ON \
 pdflib		"PHP3:   pdflib support" OFF \
+IMAP		"PHP3:   IMAP support" OFF \
 MySQL		"PHP3:   MySQL database support" ON \
 PostgreSQL	"PHP3:   PostgreSQL database support" OFF \
 mSQL		"PHP3:   mSQL database support" OFF \
@@ -63,6 +64,10 @@ while [ "$1" ]; do
 			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
 			;;
+		\"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
+			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 84c48e2..4a43347 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/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.72 1999/04/11 22:23:30 dirk Exp $
+# $Id: Makefile,v 1.73 1999/04/13 15:40:20 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -94,6 +94,9 @@ pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 .endif
 
+post-extract:
+	@${LN} -s php-${VERSION_PHP3} ${WRKDIR}/php3
+
 pre-configure:
 	@cd ${WRKSRC} \
 	&& ./configure > /dev/null \
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 770d24b..3d9d5d2 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -13,6 +13,7 @@ GD		"PHP3:   GD library support" ON \
 FreeType	"PHP3:   TrueType font rendering (implies GD)" OFF \
 zlib		"PHP3:   zlib library support" ON \
 pdflib		"PHP3:   pdflib support" OFF \
+IMAP		"PHP3:   IMAP support" OFF \
 MySQL		"PHP3:   MySQL database support" ON \
 PostgreSQL	"PHP3:   PostgreSQL database support" OFF \
 mSQL		"PHP3:   mSQL database support" OFF \
@@ -63,6 +64,10 @@ while [ "$1" ]; do
 			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
 			;;
+		\"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
+			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 84c48e2..4a43347 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.72 1999/04/11 22:23:30 dirk Exp $
+# $Id: Makefile,v 1.73 1999/04/13 15:40:20 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -94,6 +94,9 @@ pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 .endif
 
+post-extract:
+	@${LN} -s php-${VERSION_PHP3} ${WRKDIR}/php3
+
 pre-configure:
 	@cd ${WRKSRC} \
 	&& ./configure > /dev/null \
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 770d24b..3d9d5d2 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -13,6 +13,7 @@ GD		"PHP3:   GD library support" ON \
 FreeType	"PHP3:   TrueType font rendering (implies GD)" OFF \
 zlib		"PHP3:   zlib library support" ON \
 pdflib		"PHP3:   pdflib support" OFF \
+IMAP		"PHP3:   IMAP support" OFF \
 MySQL		"PHP3:   MySQL database support" ON \
 PostgreSQL	"PHP3:   PostgreSQL database support" OFF \
 mSQL		"PHP3:   mSQL database support" OFF \
@@ -63,6 +64,10 @@ while [ "$1" ]; do
 			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
 			;;
+		\"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
+			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc