3 files changed, 22 insertions, 9 deletions
diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index 07d3c694eb5..26c59312305 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/10/08 23:22:07 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/02 00:05:03 elric Exp $
 
 MODNAME=		imap
 CATEGORIES+=		mail
-PKGREVISION=		# empty
+PKGREVISION=		1
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
 USE_BUILDLINK2=		# defined
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
index dd0cee74cdc..aac57b58157 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/10/14 06:21:12 martti Exp $
+$NetBSD: distinfo,v 1.6 2002/11/02 00:05:04 elric Exp $
 
 SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
 Size (php-4.2.3.tar.gz) = 3413829 bytes
-SHA1 (patch-aa) = 15b68a0a73cdd6af903b1efc5a768b4bb20b38a4
+SHA1 (patch-aa) = 237256b28c175aa71e5fe76e3df363f9c8203682
 SHA1 (patch-ab) = d3df38e0ff0d818db39f5fe1980318eac2738bcd
diff --git a/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa
index 58db59c70b8..e0aba512a23 100644
--- a/mail/php4-imap/patches/patch-aa
+++ b/mail/php4-imap/patches/patch-aa
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2001/12/31 23:57:39 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/11/02 00:05:05 elric Exp $
 
---- config.m4.orig	Tue Aug  7 12:18:04 2001
-+++ config.m4
-@@ -65,8 +65,8 @@
+--- config.m4.orig	Tue Aug 20 19:09:01 2002
++++ config.m4	Thu Oct 31 17:59:46 2002
+@@ -40,12 +40,6 @@
+     PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
+     PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
+     PHP_ADD_LIBRARY(com_err,  1, IMAP_SHARED_LIBADD)
+-  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<=DIR> to your configure line. Check config.log for details.)
+-    ])
+   fi
+ 
+ ])
+@@ -65,8 +59,8 @@
    if test "$PHP_IMAP_SSL" != "no"; then
      AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
      PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
@@ -13,7 +26,7 @@ $NetBSD: patch-aa,v 1.2 2001/12/31 23:57:39 jlam Exp $
    else
      old_LIBS=$LIBS
      LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
-@@ -162,8 +162,7 @@
+@@ -162,8 +156,7 @@
      fi
  
      PHP_ADD_INCLUDE($IMAP_INC_DIR)