--- CMakeLists.txt.orig	2023-08-11 18:59:11 UTC

+++ CMakeLists.txt

@@ -395,13 +395,17 @@ if(LIBXML2_WITH_ICU)

 	if(WIN32)

 		set(ICU_LIBS "-licudt -licuin -licuuc")

 	else()

-		set(ICU_LIBS "-licudata -licui18n -licuuc")

+		set(ICU_LIBS_DIR "${ICU_INCLUDE_DIRS}")

+		STRING(REGEX REPLACE "include" "lib" ICU_LIBS_DIR ${ICU_LIBS_DIR})

+		set(ICU_LIBS "-L${ICU_LIBS_DIR} -licudata -licui18n -licuuc")

 	endif()

 endif()

 if(LIBXML2_WITH_LZMA)

 	target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)

-	set(LZMA_LIBS "-llzma")

+	set(LZMA_LIBS_DIR "${LIBLZMA_INCLUDE_DIRS}")

+	STRING(REGEX REPLACE "include" "lib" LZMA_LIBS_DIR ${LZMA_LIBS_DIR})

+	set(LZMA_LIBS "-L${LZMA_LIBS_DIR} -llzma")

 endif()

 if(LIBXML2_WITH_THREADS)

@@ -411,7 +415,9 @@ endif()

 if(LIBXML2_WITH_ZLIB)

 	target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)

-	set(Z_LIBS "-lz")

+	set(Z_LIBS_DIR "${ZLIB_INCLUDE_DIRS}")

+	STRING(REGEX REPLACE "include" "lib" Z_LIBS_DIR ${Z_LIBS_DIR})

+	set(Z_LIBS "-L${Z_LIBS_DIR} -lz")

 endif()

 set_target_properties(

--- python/libxml.c.orig	2023-08-11 20:30:35 UTC

+++ python/libxml.c

@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,

     PyObject *message;

     PyObject *result;

     char str[1000];

+    unsigned char *ptr = (unsigned char *)str;

 #ifdef DEBUG_ERROR

     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);

 #endif

+#if PY_MAJOR_VERSION >= 3

+    /* Ensure the error string doesn't start at UTF8 continuation. */

+    while (*ptr && (*ptr & 0xc0) == 0x80)

+        ptr++;

+#endif

+

     if (libxml_xmlPythonErrorFuncHandler == NULL) {

         va_start(ap, msg);

         vfprintf(stderr, msg, ap);

@@ -1625,9 +1632,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,

         list = PyTuple_New(2);

         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);

         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);

-        message = libxml_charPtrConstWrap(str);

+        message = libxml_charPtrConstWrap(ptr);

         PyTuple_SetItem(list, 1, message);

         result = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);

+        /* Forget any errors caused in the error handler. */

+        PyErr_Clear();

         Py_XDECREF(list);

         Py_XDECREF(result);

     }

Revert the following commit, it makes the freebsd doc chain fail.

From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001

From: Dennis Filder <d.filder@web.de>

Date: Fri, 13 Jun 2014 14:56:14 +0800

Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths

For https://bugzilla.gnome.org/show_bug.cgi?id=731063

xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns

bogus values when called with URIs that have rootless paths

(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be

correct)

--- uri.c.orig	2019-10-22 18:46:01 UTC

+++ uri.c

@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) {

                 if (temp == NULL) goto mem_error;

                 ret = temp;

 	    }

+	    ret[len++] = '/';

+	    ret[len++] = '/';

 	}

 	if (uri->path != NULL) {

 	    p = uri->path;

share/man/man1/xml2-config.1.gz

share/man/man1/xmlcatalog.1.gz

share/man/man1/xmllint.1.gz

%%PORTDOCS%%%%DOCSDIR%%/examples/index.html

%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c

%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c

%%PORTDOCS%%%%DOCSDIR%%/examples/parse1.c

%%PORTDOCS%%%%DOCSDIR%%/examples/parse2.c

%%PORTDOCS%%%%DOCSDIR%%/examples/parse3.c

%%PORTDOCS%%%%DOCSDIR%%/examples/parse4.c

%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.c

%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c

%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c

%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c

%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c

%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c

%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c

%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c

%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/apd.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ape.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/apf.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/apg.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/aph.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/api.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s02.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s03.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s04.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s05.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s06.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s07.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s08.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s09.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/blank.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/1.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/10.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/2.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/3.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/4.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/5.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/6.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/7.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/8.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/9.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/caution.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/draft.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/home.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/important.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/next.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/note.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/prev.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/tip.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-blank.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-minus.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-plus.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/up.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/warning.png

%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddattribute.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddkeyword.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeconvert.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/includegetattribute.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/includekeyword.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c

%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html

%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html

PORTREVISION=	1

CATEGORIES=	textproc gnome python

PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

COMMENT=	Python interface for XML parser library for GNOME

USES+=		gnome python shebangfix

USE_GNOME=	libxml2

USE_PYTHON=	flavors

SHEBANG_FILES=	*.py doc/*.py python/*.py python/tests/*.py

# Help CMake determine the correct version of Python if

# multiple versions are installed

CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}

MASTERDIR=	${.CURDIR}/../libxml2

DESCR=		${.CURDIR}/pkg-descr

PLIST=		${.CURDIR}/pkg-plist

OPTIONS_EXCLUDE=	${OPTIONS_DEFINE}

# Tell master port we're a slave port

LIBXML2_SLAVE=	python

do-install:

		${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}

		${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}

		${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}

		${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}

.include "${MASTERDIR}/Makefile"

%%PYTHON_SITELIBDIR%%/__pycache__/drv_libxml2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc

%%PYTHON_SITELIBDIR%%/__pycache__/drv_libxml2%%PYTHON_EXT_SUFFIX%%.pyc

%%PYTHON_SITELIBDIR%%/__pycache__/libxml2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc

%%PYTHON_SITELIBDIR%%/__pycache__/libxml2%%PYTHON_EXT_SUFFIX%%.pyc

%%PYTHON_SITELIBDIR%%/drv_libxml2.py

%%PYTHON_SITELIBDIR%%/libxml2.py

%%PYTHON_SITELIBDIR%%/libxml2mod.so

-