libxml2: don't show non-existent -I/usr/include in "xml2-config --cflags"

Check that the iconv include directory actually exists before adding it
to xml2-config. This fixes build of lang/llvm on Darwin. Bump PKGREVISION.

3 files changed, 23 insertions, 11 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index aeeba9c6db8..7e7aabc9a3d 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.159 2021/05/23 19:31:47 nia Exp $
+# $NetBSD: Makefile,v 1.160 2021/07/21 13:55:07 tnn Exp $
 
+PKGREVISION=	1
 .include "../../textproc/libxml2/Makefile.common"
 
 COMMENT=	XML parser library from the GNOME project
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 95ffc8a20f8..9aeaa50e141 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.136 2021/06/12 17:02:51 gutteridge Exp $
+$NetBSD: distinfo,v 1.137 2021/07/21 13:55:07 tnn Exp $
 
 SHA1 (libxml2-2.9.12.tar.gz) = 339fe5bb2a7d0c13f068c26d8f7cd194c13f9a2a
 RMD160 (libxml2-2.9.12.tar.gz) = 766b9460b9e62b8152f431747c30c88c868c0c7e
@@ -6,7 +6,7 @@ SHA512 (libxml2-2.9.12.tar.gz) = df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d268
 Size (libxml2-2.9.12.tar.gz) = 5681632 bytes
 SHA1 (patch-Makefile.in) = e687eaa9805b855b0c8a944ec5c597bd34954472
 SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
-SHA1 (patch-configure) = f6e9f08377a537657df08deee17a5cc66c60b808
+SHA1 (patch-configure) = 313d8067c8ff76472cc834af4e54a992bb377f01
 SHA1 (patch-doc_examples_Makefile.in) = 4eede9719724f94402e850ee6d6043a74aaf62b2
 SHA1 (patch-encoding.c) = 62b3343f0a0ea51e3fb8eb693e495520eefb6ffd
 SHA1 (patch-python_libxml.c) = a8d89922589f51db99c2b8960b32d37ddda8a7a9
diff --git a/textproc/libxml2/patches/patch-configure b/textproc/libxml2/patches/patch-configure
index 05a437dff38..db9671e75b1 100644
--- a/textproc/libxml2/patches/patch-configure
+++ b/textproc/libxml2/patches/patch-configure
@@ -1,15 +1,17 @@
-$NetBSD: patch-configure,v 1.2 2019/11/06 13:19:43 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2021/07/21 13:55:07 tnn Exp $
 
 Various configure fixes:
+ * Don't leak non-existent include directories to xml2-config.
+   Important for CMake on Darwin.
  * Add run-path to XML_LIBDIR
  * Fix handling of pthreads
  * Add portability to OpenBSD, MirBSD, FreeBSD, NetBSD and DragonFly
  * Fix test for SAX
    Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859
 
---- configure.orig	2019-10-30 19:14:22.000000000 +0000
+--- configure.orig	2021-05-13 18:54:55.000000000 +0000
 +++ configure
-@@ -14970,7 +14970,7 @@ fi
+@@ -15005,7 +15005,7 @@ fi
  fi
  
  
@@ -18,7 +20,7 @@ Various configure fixes:
  XML_INCLUDEDIR='-I${includedir}/libxml2'
  
  XML_CFLAGS=""
-@@ -15443,13 +15443,13 @@ else
+@@ -15478,13 +15478,13 @@ else
          if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
              ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
  if test "x$ac_cv_header_pthread_h" = xyes; then :
@@ -35,7 +37,7 @@ Various configure fixes:
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -15481,7 +15481,7 @@ fi
+@@ -15516,7 +15516,7 @@ fi
  $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
  if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
  
@@ -44,7 +46,7 @@ Various configure fixes:
  
  $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
  
-@@ -15503,12 +15503,12 @@ fi
+@@ -15538,12 +15538,12 @@ fi
         *beos*) WITH_THREADS="1"
  	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
         ;;
@@ -59,7 +61,7 @@ Various configure fixes:
  	           if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
  		   then
  		       THREAD_LIBS=""
-@@ -15525,6 +15525,10 @@ fi
+@@ -15560,6 +15560,10 @@ fi
  	       fi
  	   fi
         ;;
@@ -70,7 +72,7 @@ Various configure fixes:
      esac
      if test "$WITH_THREADS" = "1" ; then
  	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
-@@ -15795,7 +15799,7 @@ else
+@@ -15830,7 +15834,7 @@ else
      TEST_SAX=SAXtests
  fi
  
@@ -79,3 +81,12 @@ Various configure fixes:
    WITH_SAX1_SOURCES_TRUE=
    WITH_SAX1_SOURCES_FALSE='#'
  else
+@@ -16015,7 +16019,7 @@ WITH_ICONV=0
+ if test "$with_iconv" = "no" ; then
+     echo Disabling ICONV support
+ else
+-    if test "$with_iconv" != "yes" -a "$with_iconv" != "" ; then
++    if test -e "$with_iconv/include" ; then
+ 	CPPFLAGS="${CPPFLAGS} -I$with_iconv/include"
+ 	# Export this since our headers include iconv.h
+ 	XML_INCLUDEDIR="${XML_INCLUDEDIR} -I$with_iconv/include"