Fix packages' broken iconv.h detection by removing it. Have faith in that

that pkgsrc will provide the correct iconv.h to use in either the buildlink
directory or otherwise in the compiler's default search path.

3 files changed, 27 insertions, 20 deletions

diff --git a/textproc/py-libxml2/distinfo b/textproc/py-libxml2/distinfo
index 13fce3cd3a4..875da3df9e9 100644
--- a/textproc/py-libxml2/distinfo
+++ b/textproc/py-libxml2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2014/10/20 19:11:23 drochner Exp $
+$NetBSD: distinfo,v 1.32 2015/10/23 20:01:08 tnn Exp $
 
 SHA1 (libxml2-2.9.2.tar.gz) = f46a37ea6d869f702e03f393c376760f3cbee673
 RMD160 (libxml2-2.9.2.tar.gz) = 969b4ed8782f455fd4a6ca1c1b4ffa7651090070
 Size (libxml2-2.9.2.tar.gz) = 5444991 bytes
 SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b
-SHA1 (patch-ab) = fcf0c129f6c6a563806882271d16f57c1bc61d54
+SHA1 (patch-ab) = 6e10620cf21df24a08b7d46990b47b7f33df827c
 SHA1 (patch-ac) = 4d14006810239491ecda6967dee2087eb382ba08
diff --git a/textproc/py-libxml2/patches/patch-ab b/textproc/py-libxml2/patches/patch-ab
index 170ca59701b..c051e60fcab 100644
--- a/textproc/py-libxml2/patches/patch-ab
+++ b/textproc/py-libxml2/patches/patch-ab
@@ -1,18 +1,34 @@
-$NetBSD: patch-ab,v 1.3 2014/10/20 19:11:23 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2015/10/23 20:01:08 tnn Exp $
 
-- Fix build under Mac OS X (reorder os.path.join(ROOT,'include') )
+Trust pkgsrc to know which iconv to use.
+It will be either in the buildlink directory, or in the compiler's
+default search path.
 
 --- setup.py.orig	2014-10-16 07:35:21.000000000 +0000
 +++ setup.py
-@@ -56,10 +56,10 @@ else:
+@@ -56,11 +56,7 @@ else:
  # - iconv.h
  # - libxslt/xsltconfig.h
  includes_dir = [
-+os.path.join(ROOT,'include'),
- "/usr/include",
- "/usr/local/include",
- "/opt/include",
+-"/usr/include",
+-"/usr/local/include",
+-"/opt/include",
 -os.path.join(ROOT,'include'),
- HOME
+-HOME
++os.path.join(ROOT,'include')
  ];
  
+ xml_includes=""
+@@ -73,11 +69,7 @@ if xml_includes == "":
+     print("failed to find headers for libxml2: update includes_dir")
+     sys.exit(1)
+ 
+-iconv_includes=""
+-for dir in includes_dir:
+-    if not missing(dir + "/iconv.h"):
+-        iconv_includes=dir
+-        break;
++iconv_includes=os.path.join(ROOT,'include')
+ 
+ if iconv_includes == "":
+     print("failed to find headers for libiconv: update includes_dir")
diff --git a/textproc/py-libxslt/files/setup.py b/textproc/py-libxslt/files/setup.py
index 56b43e52df3..09ed4c32255 100755
--- a/textproc/py-libxslt/files/setup.py
+++ b/textproc/py-libxslt/files/setup.py
@@ -36,7 +36,6 @@ else:
 # - iconv.h 
 # - libxslt/xsltconfig.h
 includes_dir = [
-"@LIBICONVDIR@/include",
 "@LIBXML2DIR@/include",
 "@LIBXSLTDIR@/include"
 ];
@@ -51,15 +50,7 @@ if xml_includes == "":
     print "failed to find headers for libxml2: update includes_dir"
     sys.exit(1)
 
-iconv_includes=""
-for dir in includes_dir:
-    if not missing(dir + "/iconv.h"):
-        iconv_includes=dir
-	break;
-
-if iconv_includes == "":
-    print "failed to find headers for libiconv: update includes_dir"
-    sys.exit(1)
+iconv_includes="@LIBICONVDIR@/include"
 
 # those are added in the linker search path for libraries
 libdirs = ["@LIBXML2DIR@/lib"]