Adapt the imap-uw c-client linkage file use patches, so that

they are more acceptabtable for inclusion in master PHP sources.
No externally visible change, so pkg revision not bumped.

4 files changed, 37 insertions, 26 deletions

diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index 3004f539fa9..cc3769afb03 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/19 12:22:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/16 15:04:54 jdolecek Exp $
 
 MODNAME=		imap
 CATEGORIES+=		mail
@@ -12,6 +12,7 @@ DISTINFO_FILE=		${.CURDIR}/distinfo
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
 CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-${MODNAME}-linkage
 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 9bc2114f527..21bbaa64547 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
+$NetBSD: distinfo,v 1.9 2004/01/16 15:04:54 jdolecek Exp $
 
 SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
 Size (php-4.3.4.tar.bz2) = 3774324 bytes
-SHA1 (patch-aa) = 88bdeff65b4a8c2abe46b969715702b31020bb28
-SHA1 (patch-ab) = fbdb1acceacf4f514c28d7ef5dba61bcc451f308
+SHA1 (patch-aa) = 73333018762ba63adf026ff91ccb6d6edd461f42
+SHA1 (patch-ab) = 594c9ebf5e7979e049399d7ba9dcb00614bfc95e
diff --git a/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa
index 134ea4634a8..a6a4d192ee5 100644
--- a/mail/php4-imap/patches/patch-aa
+++ b/mail/php4-imap/patches/patch-aa
@@ -1,18 +1,28 @@
-$NetBSD: patch-aa,v 1.4 2003/08/31 19:55:48 jdolecek Exp $
+$NetBSD: patch-aa,v 1.5 2004/01/16 15:04:54 jdolecek Exp $
 
---- config.m4.orig	2003-08-31 15:11:49.000000000 +0200
-+++ config.m4	2003-08-31 15:12:05.000000000 +0200
-@@ -91,13 +91,6 @@
+--- config.m4.orig	2003-10-03 07:25:35.000000000 +0200
++++ config.m4
+@@ -54,6 +54,14 @@ AC_DEFUN(PHP_IMAP_TEST_BUILD, [
+   ])
+ ])
+ 
++dsl Must be before --with-kerberos, affects the check
++PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage,
++[  --with-imap-linkage     Use IMAP c-client linkage to determine supported items.])
++
++if test "$PHP_IMAP_LINKAGE" != "no"; then  
++	AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ])
++fi
++
+ AC_DEFUN(PHP_IMAP_KRB_CHK, [
+   AC_ARG_WITH(kerberos,
+   [  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[
+@@ -90,7 +98,7 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
      PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
      PHP_ADD_LIBRARY(com_err,  1, IMAP_SHARED_LIBADD)
      PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
 -  else
--    AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
--      AC_MSG_ERROR([This c-client library is built with Kerberos support. 
--
--      Add --with-kerberos to your configure line. Check config.log for details.
--      ])
--    ])
-   fi
++  elif test "$PHP_IMAP_LINKAGE" != "yes"; then
+     AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
+       AC_MSG_ERROR([This c-client library is built with Kerberos support. 
  
- ])
diff --git a/mail/php4-imap/patches/patch-ab b/mail/php4-imap/patches/patch-ab
index ef2efa0e6dc..7cfc9c48a34 100644
--- a/mail/php4-imap/patches/patch-ab
+++ b/mail/php4-imap/patches/patch-ab
@@ -1,27 +1,27 @@
-$NetBSD: patch-ab,v 1.4 2003/08/31 19:55:48 jdolecek Exp $
+$NetBSD: patch-ab,v 1.5 2004/01/16 15:04:54 jdolecek Exp $
 
---- php_imap.c.orig	2003-06-17 16:13:25.000000000 +0200
-+++ php_imap.c	2003-08-31 15:12:30.000000000 +0200
-@@ -408,6 +408,11 @@
+--- php_imap.c.orig	2003-09-04 09:48:30.000000000 +0200
++++ php_imap.c
+@@ -408,6 +408,11 @@ PHP_MINIT_FUNCTION(imap)
  
  	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
  
 +/*
-+ * Use the installed c-client linkage.c to determine which drivers and
-+ * authenticators are linked in.
++ * Optionally use the installed c-client linkage.c to determine which drivers
++ * are authenticators are linked in. Otherwise use this fixed list.
 + */
-+#if 0
++#ifndef HAVE_IMAP_LINKAGE
  #ifndef PHP_WIN32
  	mail_link(&unixdriver);		/* link in the unix driver */
  	mail_link(&mhdriver);		/* link in the mh driver */
-@@ -423,6 +428,10 @@
+@@ -423,6 +428,10 @@ PHP_MINIT_FUNCTION(imap)
  	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
++#else /* HAVE_IMAP_LINKAGE */
 +        /* link in the c-client mail and auth drivers */
 +#include "linkage.c"
-+#endif
++#endif /* HAVE_IMAP_LINKAGE */
  
  #ifndef PHP_WIN32
  	auth_link(&auth_log);		/* link in the log authenticator */