move php4-imap patches into php4/patches and use USE_PHP_EXT_PATCHES

5 files changed, 16 insertions, 19 deletions

diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index c897efb00ac..cce9745b581 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/07/06 19:52:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/31 18:23:24 jdolecek Exp $
 
 MODNAME=		imap
 PKGREVISION=		# empty
@@ -6,7 +6,7 @@ CATEGORIES+=		mail
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
 USE_BUILDLINK3=		YES
-DISTINFO_FILE=		${.CURDIR}/distinfo
+USE_PHP_EXT_PATCHES=	yes
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
deleted file mode 100644
index 9a0a62e586e..00000000000
--- a/mail/php4-imap/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.13 2004/10/03 15:30:39 kim Exp $
-
-SHA1 (php-4.3.9.tar.bz2) = 9995ce1f0b84a6d3c230552446dbcd91dbf426b0
-Size (php-4.3.9.tar.bz2) = 4001681 bytes
-SHA1 (patch-aa) = 73333018762ba63adf026ff91ccb6d6edd461f42
-SHA1 (patch-ab) = 594c9ebf5e7979e049399d7ba9dcb00614bfc95e
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 4989d9eee3f..8eeb9b7a4c3 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2004/09/28 12:41:13 jdolecek Exp $
+$NetBSD: distinfo,v 1.33 2004/10/31 18:23:24 jdolecek Exp $
 
 SHA1 (php-4.3.9.tar.bz2) = 9995ce1f0b84a6d3c230552446dbcd91dbf426b0
 Size (php-4.3.9.tar.bz2) = 4001681 bytes
@@ -6,3 +6,6 @@ SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
 SHA1 (patch-ab) = fd09b2a1f56d50859f2ee632f7feab28e624fe15
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
+SHA1 (patch-ai) = 0b9c1c9fb75a64026f2fb3cbd44cc19e0a1f186c
+SHA1 (patch-aj) = 132b5b5b802f1795deda9487db5f22cfe9edce5d
+SHA1 (patch-ak) = bd2aac1a91ed77208b45747c9d11e87731c6b46f
diff --git a/mail/php4-imap/patches/patch-aa b/www/php4/patches/patch-aj
index a6a4d192ee5..33836fe0a87 100644
--- a/mail/php4-imap/patches/patch-aa
+++ b/www/php4/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/01/16 15:04:54 jdolecek Exp $
+$NetBSD: patch-aj,v 1.8 2004/10/31 18:23:24 jdolecek Exp $
 
---- config.m4.orig	2003-10-03 07:25:35.000000000 +0200
-+++ config.m4
-@@ -54,6 +54,14 @@ AC_DEFUN(PHP_IMAP_TEST_BUILD, [
+--- ext/imap/config.m4.orig	2004-01-17 01:01:06.000000000 +0100
++++ ext/imap/config.m4	2004-10-31 18:49:03.000000000 +0100
+@@ -54,6 +54,14 @@
    ])
  ])
  
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.5 2004/01/16 15:04:54 jdolecek Exp $
  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, [
+@@ -90,7 +98,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)
diff --git a/mail/php4-imap/patches/patch-ab b/www/php4/patches/patch-ak
index 7cfc9c48a34..57571907c5a 100644
--- a/mail/php4-imap/patches/patch-ab
+++ b/www/php4/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2004/01/16 15:04:54 jdolecek Exp $
+$NetBSD: patch-ak,v 1.3 2004/10/31 18:23:24 jdolecek Exp $
 
---- php_imap.c.orig	2003-09-04 09:48:30.000000000 +0200
-+++ php_imap.c
-@@ -408,6 +408,11 @@ PHP_MINIT_FUNCTION(imap)
+--- ext/imap/php_imap.c.orig	2004-08-12 21:32:59.000000000 +0200
++++ ext/imap/php_imap.c	2004-10-31 18:49:03.000000000 +0100
+@@ -414,6 +414,11 @@
  
  	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.5 2004/01/16 15:04:54 jdolecek Exp $
  #ifndef PHP_WIN32
  	mail_link(&unixdriver);		/* link in the unix driver */
  	mail_link(&mhdriver);		/* link in the mh driver */
-@@ -423,6 +428,10 @@ PHP_MINIT_FUNCTION(imap)
+@@ -429,6 +434,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 */