Import of pkgsrc-2016Q3

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")