Update php4-imap to the version from the php-4.0.6 distribution. There is

no list of changes from version 4.0.5.  Also move from the www category.

5 files changed, 72 insertions, 0 deletions

diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
new file mode 100644
index 00000000000..227e4e5b668
--- /dev/null
+++ b/mail/php4-imap/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+
+.include "../php4/Makefile.module"
+
+MODNAME=		imap
+CATEGORIES+=		mail
+PHP_PKG_VERS=		# empty
+COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
+
+CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=shared,${BUILDLINK_DIR}
+CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
+
+LIBS+=			-lssl -lcrypto
+
+.include "../../mail/imap-uw/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
new file mode 100644
index 00000000000..1f529b2dab2
--- /dev/null
+++ b/mail/php4-imap/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+
+SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03
+Size (php-4.0.6.tar.gz) = 3157346 bytes
+SHA1 (patch-aa) = 6ab8da82de4c6cb9f1ecd8c583bdef75e0b0a65b
+SHA1 (patch-ab) = e457c007c8fb4875de30d33ace849303f6f08c30
diff --git a/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa
new file mode 100644
index 00000000000..686949595c7
--- /dev/null
+++ b/mail/php4-imap/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+
+--- config.m4.orig	Mon May 21 20:38:46 2001
++++ config.m4
+@@ -49,10 +49,11 @@
+ 
+   if test "$PHP_IMAP_SSL" != "no"; then
+     PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_DEFER(crypto)
+-    PHP_ADD_LIBRARY_DEFER(ssl)
++    PHP_ADD_LIBRARY_WITH_PATH(crypto, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
++    PHP_ADD_LIBRARY_WITH_PATH(ssl, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
+ 
+     old_LIBS=$LIBS
++    LIBS="$LIBS -lssl -lcrypto"
+     LIBS="$LIBS -lc-client"
+     if test $PHP_KERBEROS != "no"; then
+       LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+@@ -133,8 +134,7 @@
+     fi
+ 
+     PHP_ADD_INCLUDE($IMAP_INC_DIR)
+-    PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_DEFER($IMAP_LIB)
++    PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+     PHP_IMAP_KRB_CHK
+     PHP_IMAP_SSL_CHK
+ fi
diff --git a/mail/php4-imap/patches/patch-ab b/mail/php4-imap/patches/patch-ab
new file mode 100644
index 00000000000..5965e016005
--- /dev/null
+++ b/mail/php4-imap/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+
+--- php_imap.c.orig	Wed May 30 13:27:49 2001
++++ php_imap.c
+@@ -432,7 +432,11 @@
+ 	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
+ 
+ 
+-#if 1
++/*
++ * Use the installed c-client linkage.c to determine which drivers and
++ * authenticators are linked in.
++ */
++#if 0
+ #ifndef PHP_WIN32
+ 	mail_link(&unixdriver);		/* link in the unix driver */
+ #endif
diff --git a/mail/php4-imap/pkg/DESCR b/mail/php4-imap/pkg/DESCR
new file mode 100644
index 00000000000..6a0fd17e939
--- /dev/null
+++ b/mail/php4-imap/pkg/DESCR
@@ -0,0 +1,3 @@
+PHP is a programming language designed to be embedded into web pages.
+This module provides PHP4 access to IMAP (Internet Mailbox Access Protocol)
+servers.