[127108] trunk/dports/python/py-libxml2

[mcalhoun at macports.org]

Revision: 127108
          https://trac.macports.org/changeset/127108
Author:   mcalhoun at macports.org
Date:     2014-10-20 21:59:24 -0700 (Mon, 20 Oct 2014)
Log Message:
-----------
py-libxml2: Revert part of r127065. Attempt to fix #45526.

Revision Links:
--------------
    https://trac.macports.org/changeset/127065

Modified Paths:
--------------
    trunk/dports/python/py-libxml2/Portfile

Added Paths:
-----------
    trunk/dports/python/py-libxml2/files/
    trunk/dports/python/py-libxml2/files/patch-setup.py.diff

Modified: trunk/dports/python/py-libxml2/Portfile
===================================================================
--- trunk/dports/python/py-libxml2/Portfile	2014-10-21 04:40:49 UTC (rev 127107)
+++ trunk/dports/python/py-libxml2/Portfile	2014-10-21 04:59:24 UTC (rev 127108)
@@ -37,6 +37,8 @@
     post-patch {
       reinplace "s|@PREFIX@|$prefix|" ${worksrcpath}/setup.py
     }
+
+    patchfiles              patch-setup.py.diff
     
     post-destroot {
       set docdir ${prefix}/share/doc/${subport}

Added: trunk/dports/python/py-libxml2/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-libxml2/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py-libxml2/files/patch-setup.py.diff	2014-10-21 04:59:24 UTC (rev 127108)
@@ -0,0 +1,57 @@
+--- setup.py.orig	2014-10-16 00:35:21.000000000 -0700
++++ setup.py	2014-10-20 21:44:57.000000000 -0700
+@@ -56,11 +56,7 @@
+ # - iconv.h
+ # - libxslt/xsltconfig.h
+ includes_dir = [
+-"/usr/include",
+-"/usr/local/include",
+-"/opt/include",
+-os.path.join(ROOT,'include'),
+-HOME
++"@PREFIX@/include",
+ ];
+ 
+ xml_includes=""
+@@ -85,7 +81,7 @@
+ 
+ # those are added in the linker search path for libraries
+ libdirs = [
+-os.path.join(ROOT,'lib'),
++"@PREFIX@/lib"
+ ]
+ 
+ xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
+@@ -122,32 +118,6 @@
+     result.close()
+ 
+ with_xslt=0
+-if missing("libxslt-py.c") or missing("libxslt.py"):
+-    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():
+-                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
+-else:
+-    with_xslt=1
+ 
+ if with_xslt == 1:
+     xslt_includes=""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141020/cf8aa3a8/attachment.html>