From 0fdceaee32ea7900ea061fd3f8a2700112ace2a0 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@pkgsrc.org>
Date: Fri, 16 Feb 2018 22:26:29 +0000
Subject: remove patches/patch-ext_imap_config.m4, it's not needed any more

mail/php-imap was changed to not use the option this patch adds; it was
also entirely ineffective in what it was supposed to do
---
 lang/php72/distinfo                         |  3 +--
 lang/php72/patches/patch-ext_imap_config.m4 | 30 -----------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 lang/php72/patches/patch-ext_imap_config.m4

(limited to 'lang/php72')

diff --git a/lang/php72/distinfo b/lang/php72/distinfo
index 041bca07046..daa5bad282d 100644
--- a/lang/php72/distinfo
+++ b/lang/php72/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2018/02/09 00:01:13 jdolecek Exp $
+$NetBSD: distinfo,v 1.21 2018/02/16 22:26:29 jdolecek Exp $
 
 SHA1 (php-7.2.2.tar.bz2) = 69903dabf7ceb4a84620683092e235b29d2d1066
 RMD160 (php-7.2.2.tar.bz2) = c7193e0298ae8e709ad19129023ff213085f50ca
@@ -6,7 +6,6 @@ SHA512 (php-7.2.2.tar.bz2) = d2bc3725b51c61ded552cfde276bbe0f9e4cce3401303219d37
 Size (php-7.2.2.tar.bz2) = 14618006 bytes
 SHA1 (patch-configure) = 47f2ede97390cc7e46d04c2769dd97459b19450a
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
-SHA1 (patch-ext_imap_config.m4) = 6a667b2580901dccfd0174aec56dad629689d7bd
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
diff --git a/lang/php72/patches/patch-ext_imap_config.m4 b/lang/php72/patches/patch-ext_imap_config.m4
deleted file mode 100644
index b0b77fba421..00000000000
--- a/lang/php72/patches/patch-ext_imap_config.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ext_imap_config.m4,v 1.2 2018/02/04 15:38:41 jdolecek Exp $
-
-Reported upstream as #26936
-
---- ext/imap/config.m4.orig	2015-06-23 17:33:33.000000000 +0000
-+++ ext/imap/config.m4
-@@ -48,6 +48,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], [
-   if test "$PHP_KERBEROS" != "no"; then
-     PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD,
-@@ -59,7 +67,7 @@ AC_DEFUN([PHP_IMAP_KRB_CHK], [
-       Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
-       ])
-     ])
--  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. 
- 
-- 
cgit v1.2.3