sync w/ base pkg

5 files changed, 15 insertions, 228 deletions

diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 398af118ff2..940d7a2bac2 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2014/10/20 19:11:23 drochner Exp $
 
-DISTNAME=	libxml2-2.9.1
+DISTNAME=	libxml2-2.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/
diff --git a/textproc/py-libxml2/distinfo b/textproc/py-libxml2/distinfo
index a24d897ddfd..13fce3cd3a4 100644
--- a/textproc/py-libxml2/distinfo
+++ b/textproc/py-libxml2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.30 2013/10/03 07:52:32 prlw1 Exp $
+$NetBSD: distinfo,v 1.31 2014/10/20 19:11:23 drochner Exp $
 
-SHA1 (libxml2-2.9.1.tar.gz) = eb3e2146c6d68aea5c2a4422ed76fe196f933c21
-RMD160 (libxml2-2.9.1.tar.gz) = 257285d9ac070ed9f58666b7bd7c4653651c871b
-Size (libxml2-2.9.1.tar.gz) = 5172503 bytes
+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) = 793db9f20df8bba2fbee61abf4239a879c182aa7
-SHA1 (patch-ac) = b2e8fac8221ae9fb00b3de33441dd83cd7422204
-SHA1 (patch-drv_libxml2.py) = 95b8b71bb619c25f092019a0f950b4416cd80738
+SHA1 (patch-ab) = fcf0c129f6c6a563806882271d16f57c1bc61d54
+SHA1 (patch-ac) = 4d14006810239491ecda6967dee2087eb382ba08
diff --git a/textproc/py-libxml2/patches/patch-ab b/textproc/py-libxml2/patches/patch-ab
index ef8f655b0b8..170ca59701b 100644
--- a/textproc/py-libxml2/patches/patch-ab
+++ b/textproc/py-libxml2/patches/patch-ab
@@ -1,37 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2013/10/03 07:52:32 prlw1 Exp $
+$NetBSD: patch-ab,v 1.3 2014/10/20 19:11:23 drochner Exp $
 
 - Fix build under Mac OS X (reorder os.path.join(ROOT,'include') )
-- White space changes for python 3 indentation (commit 4b61cf61)
 
---- setup.py.orig	2013-10-02 21:20:43.000000000 +0000
+--- setup.py.orig	2014-10-16 07:35:21.000000000 +0000
 +++ setup.py
-@@ -6,14 +6,14 @@ import sys, os
- from distutils.core import setup, Extension
- 
- # Below ROOT, we expect to find include, include/libxml2, lib and bin.
--# On *nix, it is not needed (but should not harm), 
-+# On *nix, it is not needed (but should not harm),
- # on Windows, it is set by configure.js.
--ROOT = r'/usr' 
-+ROOT = r'/usr'
- 
- # Thread-enabled libxml2
- with_threads = 1
- 
--# If this flag is set (windows only), 
-+# If this flag is set (windows only),
- # a private copy of the dlls are included in the package.
- # If this flag is not set, the libxml2 and libxslt
- # dlls must be found somewhere in the PATH at runtime.
-@@ -51,15 +51,15 @@ else:
-     libraryPrefix = ''
-     platformLibs = ["m","z"]
- 
--# those are examined to find 
-+# those are examined to find
- # - libxml2/libxml/tree.h
--# - iconv.h 
-+# - iconv.h
+@@ -56,10 +56,10 @@ else:
+ # - iconv.h
  # - libxslt/xsltconfig.h
  includes_dir = [
 +os.path.join(ROOT,'include'),
@@ -42,149 +16,3 @@ $NetBSD: patch-ab,v 1.2 2013/10/03 07:52:32 prlw1 Exp $
  HOME
  ];
  
-@@ -67,7 +67,7 @@ xml_includes=""
- for dir in includes_dir:
-     if not missing(dir + "/libxml2/libxml/tree.h"):
-         xml_includes=dir + "/libxml2"
--	break;
-+        break;
- 
- if xml_includes == "":
-     print("failed to find headers for libxml2: update includes_dir")
-@@ -77,7 +77,7 @@ iconv_includes=""
- for dir in includes_dir:
-     if not missing(dir + "/iconv.h"):
-         iconv_includes=dir
--	break;
-+        break;
- 
- if iconv_includes == "":
-     print("failed to find headers for libiconv: update includes_dir")
-@@ -90,22 +90,22 @@ os.path.join(ROOT,'lib'),
- 
- xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
-              "libxml.c", "libxml.py", "libxml_wrap.h", "types.c",
--	     "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"]
-+             "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"]
- 
- xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml",
-              "libxslt.c", "libxsl.py", "libxslt_wrap.h",
--	     "xsltgenerator.py"]
-+             "xsltgenerator.py"]
- 
- if missing("libxml2-py.c") or missing("libxml2.py"):
-     try:
--	try:
--	    import xmlgenerator
--	except:
--	    import generator
-+        try:
-+            import xmlgenerator
-+        except:
-+            import generator
-     except:
--	print("failed to find and generate stubs for libxml2, aborting ...")
--	print(sys.exc_info()[0], sys.exc_info()[1])
--	sys.exit(1)
-+        print("failed to find and generate stubs for libxml2, aborting ...")
-+        print(sys.exc_info()[0], sys.exc_info()[1])
-+        sys.exit(1)
- 
-     head = open("libxml.py", "r")
-     generated = open("libxml2class.py", "r")
-@@ -116,7 +116,7 @@ if missing("libxml2-py.c") or missing("l
-         else:
-             result.write(line)
-     for line in generated.readlines():
--	result.write(line)
-+        result.write(line)
-     head.close()
-     generated.close()
-     result.close()
-@@ -126,39 +126,39 @@ if missing("libxslt-py.c") or missing("l
-     if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
-         print("libxslt stub generator not found, libxslt not built")
-     else:
--	try:
--	    import xsltgenerator
--	except:
--	    print("failed to generate stubs for libxslt, aborting ...")
--	    print(sys.exc_info()[0], sys.exc_info()[1])
--	else:
--	    head = open("libxsl.py", "r")
--	    generated = open("libxsltclass.py", "r")
--	    result = open("libxslt.py", "w")
--	    for line in head.readlines():
-+        try:
-+            import xsltgenerator
-+        except:
-+            print("failed to generate stubs for libxslt, aborting ...")
-+            print(sys.exc_info()[0], sys.exc_info()[1])
-+        else:
-+            head = open("libxsl.py", "r")
-+            generated = open("libxsltclass.py", "r")
-+            result = open("libxslt.py", "w")
-+            for line in head.readlines():
-                 if WITHDLLS:
-                     result.write(altImport(line))
-                 else:
-                     result.write(line)
--	    for line in generated.readlines():
--		result.write(line)
--	    head.close()
--	    generated.close()
--	    result.close()
--	    with_xslt=1
-+            for line in generated.readlines():
-+                result.write(line)
-+            head.close()
-+            generated.close()
-+            result.close()
-+            with_xslt=1
- else:
-     with_xslt=1
- 
- if with_xslt == 1:
-     xslt_includes=""
-     for dir in includes_dir:
--	if not missing(dir + "/libxslt/xsltconfig.h"):
--	    xslt_includes=dir + "/libxslt"
--	    break;
-+        if not missing(dir + "/libxslt/xsltconfig.h"):
-+            xslt_includes=dir + "/libxslt"
-+            break;
- 
-     if xslt_includes == "":
--	print("failed to find headers for libxslt: update includes_dir")
--	with_xslt = 0
-+        print("failed to find headers for libxslt: update includes_dir")
-+        with_xslt = 0
- 
- 
- descr = "libxml2 package"
-@@ -194,11 +194,11 @@ if with_xslt == 1:
- 
- 
- extens=[Extension('libxml2mod', c_files, include_dirs=includes,
--                  library_dirs=libdirs, 
--                  libraries=libs, define_macros=macros)] 
-+                  library_dirs=libdirs,
-+                  libraries=libs, define_macros=macros)]
- if with_xslt == 1:
-     extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes,
--			    library_dirs=libdirs, 
-+                            library_dirs=libdirs,
-                             libraries=libs, define_macros=macros))
- 
- if missing("MANIFEST"):
-@@ -208,8 +208,8 @@ if missing("MANIFEST"):
-     for file in xml_files:
-         manifest.write(file + "\n")
-     if with_xslt == 1:
--	for file in xslt_files:
--	    manifest.write(file + "\n")
-+        for file in xslt_files:
-+            manifest.write(file + "\n")
-     manifest.close()
- 
- if WITHDLLS:
diff --git a/textproc/py-libxml2/patches/patch-ac b/textproc/py-libxml2/patches/patch-ac
index e0f0ccd9b0d..913996d78a9 100644
--- a/textproc/py-libxml2/patches/patch-ac
+++ b/textproc/py-libxml2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2013/05/28 22:26:13 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2014/10/20 19:11:23 drochner Exp $
 
 fix for Python-2.6
 
---- libxml_wrap.h.orig	2013-04-02 02:25:28.000000000 +0000
+--- libxml_wrap.h.orig	2014-10-03 09:00:54.000000000 +0000
 +++ libxml_wrap.h
 @@ -28,7 +28,6 @@
   * and don't use Capsule but CObjects
@@ -13,8 +13,8 @@ fix for Python-2.6
  #define PyBytes_Size PyString_Size
  #define PyBytes_AsString PyString_AsString
 @@ -40,7 +39,6 @@
+ #define PyCapsule_CheckExact PyCObject_Check
  #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
- 
  #endif
 -#endif
  
diff --git a/textproc/py-libxml2/patches/patch-drv_libxml2.py b/textproc/py-libxml2/patches/patch-drv_libxml2.py
deleted file mode 100644
index 700ae4eac23..00000000000
--- a/textproc/py-libxml2/patches/patch-drv_libxml2.py
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-drv_libxml2.py,v 1.1 2013/10/03 07:52:32 prlw1 Exp $
-
-Python 3 fix
-commit 6c9c611b
-
---- drv_libxml2.py.orig	2009-07-30 15:24:34.000000000 +0000
-+++ drv_libxml2.py
-@@ -34,12 +34,20 @@ TODO
- 
- """
- 
--__author__  = u"Stéphane Bidoul <sbi@skynet.be>"
-+__author__  = "Stéphane Bidoul <sbi@skynet.be>"
- __version__ = "0.3"
- 
-+import sys
- import codecs
--from types import StringType, UnicodeType
--StringTypes = (StringType,UnicodeType)
-+
-+if sys.version < "3":
-+    __author__  = codecs.unicode_escape_decode(__author__)[0]
-+
-+    from types import StringType, UnicodeType
-+    StringTypes = (StringType,UnicodeType)
-+
-+else:
-+    StringTypes = (str)
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -65,7 +73,7 @@ def _d(s):
- 
- try:
-     import libxml2
--except ImportError, e:
-+except ImportError as e:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
-                                 "import error was: %s" % e)
-