[pkgsrc/trunk]: pkgsrc/lang/php5 add patches necessary to build php-imap with...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4952c107e914
branches:  trunk
changeset: 482657:4952c107e914
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Oct 31 21:14:54 2004 +0000

description:
add patches necessary to build php-imap with PHP5

diffstat:

 lang/php5/distinfo         |   4 +++-
 lang/php5/patches/patch-aj |  28 ++++++++++++++++++++++++++++
 lang/php5/patches/patch-ak |  27 +++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletions(-)

diffs (74 lines):

diff -r be2328e714eb -r 4952c107e914 lang/php5/distinfo
--- a/lang/php5/distinfo        Sun Oct 31 21:14:23 2004 +0000
+++ b/lang/php5/distinfo        Sun Oct 31 21:14:54 2004 +0000
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/29 20:31:54 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2004/10/31 21:14:54 jdolecek Exp $
 
 SHA1 (php-5.0.2.tar.bz2) = 85e4635ce764199d60329a578421159f338be082
 Size (php-5.0.2.tar.bz2) = 4577974 bytes
+SHA1 (patch-aj) = 88e456015f4d8e92ea57019df39195905b3f6c28
+SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43
diff -r be2328e714eb -r 4952c107e914 lang/php5/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/patches/patch-aj        Sun Oct 31 21:14:54 2004 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-aj,v 1.1 2004/10/31 21:14:54 jdolecek Exp $
+
+--- ext/imap/config.m4.orig    2004-02-23 04:24:58.000000000 +0100
++++ ext/imap/config.m4 2004-10-31 21:11:57.000000000 +0100
+@@ -42,6 +42,14 @@
+   ])
+ ])
+ 
++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.],[
+@@ -78,7 +86,7 @@
+     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
++  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 -r be2328e714eb -r 4952c107e914 lang/php5/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/patches/patch-ak        Sun Oct 31 21:14:54 2004 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-ak,v 1.1 2004/10/31 21:14:54 jdolecek Exp $
+
+--- ext/imap/php_imap.c.orig   2004-08-12 21:32:18.000000000 +0200
++++ ext/imap/php_imap.c        2004-10-31 21:11:57.000000000 +0100
+@@ -428,6 +428,11 @@
+ 
+       ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
+ 
++/*
++ * Optionally use the installed c-client linkage.c to determine which drivers
++ * are authenticators are linked in. Otherwise use this fixed list.
++ */
++#ifndef HAVE_IMAP_LINKAGE
+ #ifndef PHP_WIN32
+       mail_link(&unixdriver);         /* link in the unix driver */
+       mail_link(&mhdriver);           /* link in the mh driver */
+@@ -443,6 +448,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 /* HAVE_IMAP_LINKAGE */
++        /* link in the c-client mail and auth drivers */
++#include "linkage.c"
++#endif /* HAVE_IMAP_LINKAGE */
+ 
+ #ifndef PHP_WIN32
+       auth_link(&auth_log);           /* link in the log authenticator */