Update math/php4-imap to 4.1.0. No list of changes from version 4.0.6;

simply update to version from php-4.1.0 distribution, but add back
"--with-imap-ssl" to configure options as the IMAP client library does
both TLS _and_ IMAP over SSL, and the functionality isn't enabled in the
PHP4 client unless this option is specified.

4 files changed, 33 insertions, 25 deletions

diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index f0b9ba4aad0..78f3efae634 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/12/03 08:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/31 23:57:39 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
@@ -8,6 +8,7 @@ PKGREVISION=		# empty
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=${BUILDLINK_DIR}
 CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
 
 LIBS+=			-lssl -lcrypto
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
index 1f529b2dab2..b195030fa30 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+$NetBSD: distinfo,v 1.2 2001/12/31 23:57:39 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
+SHA1 (php-4.1.0.tar.gz) = d8ce2c3b1dd9551980340d20064a1e939ef49431
+Size (php-4.1.0.tar.gz) = 3371385 bytes
+SHA1 (patch-aa) = 15b68a0a73cdd6af903b1efc5a768b4bb20b38a4
+SHA1 (patch-ab) = 9e62d755be7bea0efeacef1acb61c1e7b112b0dc
diff --git a/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa
index 686949595c7..58db59c70b8 100644
--- a/mail/php4-imap/patches/patch-aa
+++ b/mail/php4-imap/patches/patch-aa
@@ -1,27 +1,24 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/31 23:57:39 jlam Exp $
 
---- config.m4.orig	Mon May 21 20:38:46 2001
+--- config.m4.orig	Tue Aug  7 12:18:04 2001
 +++ config.m4
-@@ -49,10 +49,11 @@
- 
+@@ -65,8 +65,8 @@
    if test "$PHP_IMAP_SSL" != "no"; then
+     AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
      PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_DEFER(crypto)
--    PHP_ADD_LIBRARY_DEFER(ssl)
+-    PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD)
+-    PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD)
 +    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)
- 
+   else
      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 @@
+     LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
+@@ -162,8 +162,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_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD)
 +    PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD)
      PHP_IMAP_KRB_CHK
      PHP_IMAP_SSL_CHK
diff --git a/mail/php4-imap/patches/patch-ab b/mail/php4-imap/patches/patch-ab
index 5965e016005..0b3e722f77f 100644
--- a/mail/php4-imap/patches/patch-ab
+++ b/mail/php4-imap/patches/patch-ab
@@ -1,12 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/12/31 23:57:39 jlam Exp $
 
---- php_imap.c.orig	Wed May 30 13:27:49 2001
+--- php_imap.c.orig	Fri Dec  7 11:47:59 2001
 +++ php_imap.c
-@@ -432,7 +432,11 @@
- 	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
+@@ -410,6 +410,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.
@@ -14,4 +13,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/10/16 05:39:57 jlam Exp $
 +#if 0
  #ifndef PHP_WIN32
  	mail_link(&unixdriver);		/* link in the unix driver */
- #endif
+ 	mail_link(&mhdriver);		/* link in the mh driver */
+@@ -430,6 +435,10 @@
+ 	mail_link(&tenexdriver);	/* link in the tenex driver */
+ 	mail_link(&mtxdriver);		/* link in the mtx driver */
+ 	mail_link(&dummydriver);	/* link in the dummy driver */
++#else
++        /* link in the c-client mail and auth drivers */
++#include "linkage.c"
++#endif
+ 
+ 	/* lets allow NIL */
+ 	REGISTER_MAIN_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS);