<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3beb8c93521f11320cf68dcfbfd22fa5d27bc1de">https://github.com/macports/macports-ports/commit/3beb8c93521f11320cf68dcfbfd22fa5d27bc1de</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3beb8c93521f11320cf68dcfbfd22fa5d27bc1de
</span>Author: Charlie Clark <charlie.clark@clark-consulting.eu>
AuthorDate: Thu Feb 24 13:16:56 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-libxml2: update to version 2.9.13
</span>---
python/py-libxml2/Portfile | 14 ++++++------
python/py-libxml2/files/patch-setup.py.diff | 34 +++++++++++++++++++----------
2 files changed, 30 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libxml2/Portfile b/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef92cbf6d97..ce3a3cd04db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
# Please keep the version of the libxml2 and py-libxml2 ports the same.
name py-libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.9.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.9.13
</span> revision 0
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,16 +18,16 @@ long_description ${description}
</span>
homepage http://xmlsoft.org/python.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.xmlsoft.org/sources/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://gd.tuwien.ac.at/pub/libxml/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://xmlsoft.org/libxml2/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.gnome.org/sources/libxml2/2.9/
</span>
distname libxml2-${version}
dist_subdir libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 766b9460b9e62b8152f431747c30c88c868c0c7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5681632
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dc9922afb45d2e7ba4840d13ce784a48d664687c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3243336
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
python.versions 27 35 36 37 38 39 310
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libxml2/files/patch-setup.py.diff b/python/py-libxml2/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a7f3dd4a74..dc33f157e25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libxml2/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-libxml2/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2014-10-16 00:35:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2014-10-20 21:44:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,11 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # - iconv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /Users/charlieclark/temp/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,9 +6,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-except ModuleNotFoundError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils.core import setup, Extension
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Below ROOT, we expect to find include, include/libxml2, lib and bin.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,11 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - libxml2/libxml/tree.h
</span> # - libxslt/xsltconfig.h
includes_dir = [
-"/usr/include",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,20 +23,20 @@
</span> -HOME
+"@PREFIX@/include",
];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xml_includes=""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # those are added in the linker search path for libraries
libdirs = [
-os.path.join(ROOT,'lib'),
+"@PREFIX@/lib"
]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,32 +118,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,32 +119,6 @@
</span> result.close()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> with_xslt=0
-if missing("libxslt-py.c") or missing("libxslt.py"):
- if missing("xsltgenerator.py") or missing("libxslt-api.xml"):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +64,6 @@
</span> - with_xslt=1
-else:
- with_xslt=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if with_xslt == 1:
xslt_includes=""
</pre><pre style='margin:0'>
</pre>