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

4 files changed, 2 insertions, 63 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/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa
deleted file mode 100644
index a6a4d192ee5..00000000000
--- a/mail/php4-imap/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/01/16 15:04:54 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, [
-   ])
- ])
- 
-+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
-+  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
deleted file mode 100644
index 7cfc9c48a34..00000000000
--- a/mail/php4-imap/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/01/16 15:04:54 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)
- 
- 	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 */
-@@ -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 /* 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 */