Import of pkgsrc-2016Q3

textproc/py-libxml2/Makefile

@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2014/10/20 19:11:23 drochner Exp $
+# $NetBSD: Makefile,v 1.53 2016/05/27 23:52:05 pgoyette Exp $
+
+.include "../../textproc/libxml2/Makefile.common"
 
-DISTNAME=	libxml2-2.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	textproc python
-MASTER_SITES=	ftp://xmlsoft.org/libxml2/
-#MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxml2/2.9/}
 
-MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	Python wrapper for libxml2
 LICENSE=	modified-bsd
 

textproc/py-libxml2/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.31 2014/10/20 19:11:23 drochner Exp $
+$NetBSD: distinfo,v 1.36 2016/05/28 06:48:03 wiz 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 (libxml2-2.9.4.tar.gz) = 958ae70baf186263a4bd801a81dd5d682aedd1db
+RMD160 (libxml2-2.9.4.tar.gz) = bb59656e0683d64a38a2f1a45ca9d918837e1e56
+SHA512 (libxml2-2.9.4.tar.gz) = f5174ab1a3a0ec0037a47f47aa47def36674e02bfb42b57f609563f84c6247c585dbbb133c056953a5adb968d328f18cbc102eb0d00d48eb7c95478389e5daf9
+Size (libxml2-2.9.4.tar.gz) = 5374830 bytes
 SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b
-SHA1 (patch-ab) = fcf0c129f6c6a563806882271d16f57c1bc61d54
+SHA1 (patch-ab) = 6e10620cf21df24a08b7d46990b47b7f33df827c
 SHA1 (patch-ac) = 4d14006810239491ecda6967dee2087eb382ba08

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