Attachment #232198 for bug #262288




# Created by: Yukihiro Nakai <Nakai@technologist.com>

PORTNAME=	libxml2
DISTVERSION=	2.9.13
PORTREVISION?=	0
CATEGORIES?=	textproc gnome
MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
DIST_SUBDIR=	gnome2

MAINTAINER=	desktop@FreeBSD.org
COMMENT?=	XML parser library for GNOME

LICENSE=	MIT

USES+=		cmake cpe iconv localbase:ldflags pathfix pkgconfig tar:xz
LICENSE_FILE_MIT=	${WRKSRC}/COPYING
LICENSE_FILE_TRIO=	${FILESDIR}/LICENSE.TRIO
LICENSE_PERMS_TRIO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES+=		compiler cpe iconv libtool pathfix pkgconfig shebangfix
GNU_CONFIGURE=	yes
CPE_VENDOR=	xmlsoft
SHEBANG_FILES=	*.py */*.py */*/*.py
USE_LDCONFIG=	yes

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
		--with-html-dir=${PREFIX}/share/doc \
		--with-html-subdir=${PORTNAME} \
		--without-icu \
		--with-lzma=/usr \
		--without-python

PLIST_SUB+=	LIBVERSION=${DISTVERSION}

# Don't build with Python support unless requested
CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON

OPTIONS_DEFINE=		DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC TEST
OPTIONS_DEFAULT=	ICU READLINE
OPTIONS_SUB=		yes

MEM_DEBUG_DESC=		Memory debugging (DEVELOPERS ONLY!)
SCHEMA_DESC=		XML schema support
THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
READLINE_DESC=		History for xmllint

DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-docs
ICU_LIB_DEPENDS=	libicudata.so:devel/icu
ICU_CMAKE_BOOL=		LIBXML2_WITH_ICU
MEM_DEBUG_CAKE_BOOL=	LIBXML2_WITH_MEM_DEBUG
READLINE_LIB_DEPENDS=	libreadline.so:devel/readline
READLINE_CMAKE_OFF=	-DHAVE_LIBHISTORY=false -DHAVE_LIBREADLINE=false
THREAD_ALLOC_CMAKE_BOOL=LIBXML2_WITH_THREAD_ALLOC
TEST_CMAKE_BOOL=	LIBXML2_WITH_TESTS
TEST_TEST_TARGET=	test

.if !defined(MASTERDIR)
post-install:
	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
.endif

.include <bsd.port.pre.mk>

post-patch:
.for d in . doc doc/devhelp doc/examples
	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
		${WRKSRC}/${d}/Makefile.in
.endfor
.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
	@${REINPLACE_CMD} -e \
		's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \
		 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \
		${WRKSRC}/${f}
.endfor

.if !defined(LIBXML2_SLAVE)
post-install:
	${RM} ${STAGEDIR}${DOCSDIR}/xmlcatalog.1
	${RM} ${STAGEDIR}${DOCSDIR}/xmllint.1.bak
	${RM} ${STAGEDIR}${DOCSDIR}/xmllint.1
	${RLN} ${STAGEDIR}${PREFIX}/lib/libxml2.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxml2.so.2
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/libxml2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1622963062	1	TIMESTAMP = 1645459375
2	SHA256 (gnome2/libxml2-2.9.12.tar.gz) = c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92	2	SHA256 (gnome2/libxml2-2.9.13.tar.xz) = 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
3	SIZE (gnome2/libxml2-2.9.12.tar.gz) = 5681632	3	SIZE (gnome2/libxml2-2.9.13.tar.xz) = 3243336




(Following sentences are from trio.c of libxml2-2.9.4.tar.gz.)

Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.

Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.

Added Link Here

(-)b/textproc/libxml2/files/extra-patch-docs (+11 lines)
1	--- CMakeLists.txt.orig 2022-02-22 00:19:24 UTC
2	+++ CMakeLists.txt
3	@@ -650,7 +650,7 @@ endif()
4	install(FILES libxml.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation)
5	install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
6	install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
7	-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE)
8	+#install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE)
9
10	configure_package_config_file(
11	libxml2-config.cmake.cmake.in libxml2-config.cmake

Added Link Here

(-)b/textproc/libxml2/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2022-02-19 16:23:47 UTC
2	+++ CMakeLists.txt
3	@@ -699,7 +699,7 @@ set(XML_PRIVATE_LIBS "${Z_LIBS} ${LZMA_LIBS} ${THREAD_
4	file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
5	string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
6
7	-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
8	+set(prefix ${CMAKE_INSTALL_PREFIX})
9	set(exec_prefix "\${prefix}")
10	set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
11	set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")




--- Makefile.in.orig	2021-06-09 19:53:33 UTC
+++ Makefile.in
@@ -760,7 +760,7 @@ man_MANS = xml2-config.1 libxml.3
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libxml.m4
 runtest_SOURCES = runtest.c
-runtest_LDFLAGS = 
+runtest_LDFLAGS = -pthread
 runtest_DEPENDENCIES = $(DEPS)
 runtest_LDADD = $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
 testrecurse_SOURCES = testrecurse.c
@@ -808,7 +808,7 @@ testC14N_LDFLAGS = 
 testC14N_DEPENDENCIES = $(DEPS)
 testC14N_LDADD = $(LDADDS)
 testThreads_SOURCES = testThreads.c
-testThreads_LDFLAGS = 
+testThreads_LDFLAGS = -pthread
 testThreads_DEPENDENCIES = $(DEPS)
 testThreads_LDADD = $(BASE_THREAD_LIBS) $(LDADDS)
 testURI_SOURCES = testURI.c
@@ -1285,7 +1285,7 @@ am--depfiles: $(am__depfiles_remade)
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -1774,7 +1774,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 		config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
@@ -1911,7 +1911,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-cmakeDATA install-data-local \
+install-data-am: install-cmakeDATA \
 	install-m4dataDATA install-man install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive

Removed Link Here

(-)a/textproc/libxml2/files/patch-config.h.in (-11 lines)
1	--- config.h.in.orig 2018-03-05 15:54:17 UTC
2	+++ config.h.in
3	@@ -1,5 +1,8 @@
4	/* config.h.in. Generated from configure.ac by autoheader. */
5
6	+/* XXX */
7	+#define HAVE_VFSCANF
8	+
9	/* Type cast for the gethostbyname() argument */
10	#undef GETHOSTBYNAME_ARG_CAST
11

Removed Link Here

(-)a/textproc/libxml2/files/patch-configure (-11 lines)
1	--- configure.orig 2019-10-30 19:14:22 UTC
2	+++ configure
3	@@ -15525,6 +15525,8 @@ fi
4	fi
5	fi
6	;;
7	+ freebsd) THREAD_LIBS=""
8	+ ;;
9	esac
10	if test "$WITH_THREADS" = "1" ; then
11	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"




From 85b1792e37b131e7a51af98a37f92472e8de5f3f Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Tue, 18 May 2021 20:08:28 +0200
Subject: [PATCH] Work around lxml API abuse

Make xmlNodeDumpOutput and htmlNodeDumpFormatOutput work with corrupted
parent pointers. This used to work with the old recursive code but the
non-recursive rewrite required parent pointers to be set correctly.

Unfortunately, lxml relies on the old behavior and passes subtrees with
a corrupted structure. Fall back to a recursive function call if an
invalid parent pointer is detected.

Fixes #255.
---
 HTMLtree.c | 46 ++++++++++++++++++++++++++++------------------
 xmlsave.c  | 31 +++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/HTMLtree.c b/HTMLtree.c
index 24434d45..bdd639c7 100644
--- HTMLtree.c
+++ HTMLtree.c
@@ -744,7 +744,7 @@ void
 htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
 	                 xmlNodePtr cur, const char *encoding ATTRIBUTE_UNUSED,
                          int format) {
-    xmlNodePtr root;
+    xmlNodePtr root, parent;
     xmlAttrPtr attr;
     const htmlElemDesc * info;
 
@@ -755,6 +755,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
     }
 
     root = cur;
+    parent = cur->parent;
     while (1) {
         switch (cur->type) {
         case XML_HTML_DOCUMENT_NODE:
@@ -762,13 +763,25 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
             if (((xmlDocPtr) cur)->intSubset != NULL) {
                 htmlDtdDumpOutput(buf, (xmlDocPtr) cur, NULL);
             }
-            if (cur->children != NULL) {
+            /* Always validate cur->parent when descending. */
+            if ((cur->parent == parent) && (cur->children != NULL)) {
+                parent = cur;
                 cur = cur->children;
                 continue;
             }
             break;
 
         case XML_ELEMENT_NODE:
+            /*
+             * Some users like lxml are known to pass nodes with a corrupted
+             * tree structure. Fall back to a recursive call to handle this
+             * case.
+             */
+            if ((cur->parent != parent) && (cur->children != NULL)) {
+                htmlNodeDumpFormatOutput(buf, doc, cur, encoding, format);
+                break;
+            }
+
             /*
              * Get specific HTML info for that node.
              */
@@ -817,6 +830,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
                     (cur->name != NULL) &&
                     (cur->name[0] != 'p')) /* p, pre, param */
                     xmlOutputBufferWriteString(buf, "\n");
+                parent = cur;
                 cur = cur->children;
                 continue;
             }
@@ -825,9 +839,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
                 (info != NULL) && (!info->isinline)) {
                 if ((cur->next->type != HTML_TEXT_NODE) &&
                     (cur->next->type != HTML_ENTITY_REF_NODE) &&
-                    (cur->parent != NULL) &&
-                    (cur->parent->name != NULL) &&
-                    (cur->parent->name[0] != 'p')) /* p, pre, param */
+                    (parent != NULL) &&
+                    (parent->name != NULL) &&
+                    (parent->name[0] != 'p')) /* p, pre, param */
                     xmlOutputBufferWriteString(buf, "\n");
             }
 
@@ -842,9 +856,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
                 break;
             if (((cur->name == (const xmlChar *)xmlStringText) ||
                  (cur->name != (const xmlChar *)xmlStringTextNoenc)) &&
-                ((cur->parent == NULL) ||
-                 ((xmlStrcasecmp(cur->parent->name, BAD_CAST "script")) &&
-                  (xmlStrcasecmp(cur->parent->name, BAD_CAST "style"))))) {
+                ((parent == NULL) ||
+                 ((xmlStrcasecmp(parent->name, BAD_CAST "script")) &&
+                  (xmlStrcasecmp(parent->name, BAD_CAST "style"))))) {
                 xmlChar *buffer;
 
                 buffer = xmlEncodeEntitiesReentrant(doc, cur->content);
@@ -902,13 +916,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
                 break;
             }
 
-            /*
-             * The parent should never be NULL here but we want to handle
-             * corrupted documents gracefully.
-             */
-            if (cur->parent == NULL)
-                return;
-            cur = cur->parent;
+            cur = parent;
+            /* cur->parent was validated when descending. */
+            parent = cur->parent;
 
             if ((cur->type == XML_HTML_DOCUMENT_NODE) ||
                 (cur->type == XML_DOCUMENT_NODE)) {
@@ -939,9 +949,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
                     (cur->next != NULL)) {
                     if ((cur->next->type != HTML_TEXT_NODE) &&
                         (cur->next->type != HTML_ENTITY_REF_NODE) &&
-                        (cur->parent != NULL) &&
-                        (cur->parent->name != NULL) &&
-                        (cur->parent->name[0] != 'p')) /* p, pre, param */
+                        (parent != NULL) &&
+                        (parent->name != NULL) &&
+                        (parent->name[0] != 'p')) /* p, pre, param */
                         xmlOutputBufferWriteString(buf, "\n");
                 }
             }
diff --git a/xmlsave.c b/xmlsave.c
index 61a40459..aedbd5e7 100644
--- xmlsave.c
+++ xmlsave.c
@@ -847,7 +847,7 @@ htmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
 static void
 xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
     int format = ctxt->format;
-    xmlNodePtr tmp, root, unformattedNode = NULL;
+    xmlNodePtr tmp, root, unformattedNode = NULL, parent;
     xmlAttrPtr attr;
     xmlChar *start, *end;
     xmlOutputBufferPtr buf;
@@ -856,6 +856,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
     buf = ctxt->buf;
 
     root = cur;
+    parent = cur->parent;
     while (1) {
         switch (cur->type) {
         case XML_DOCUMENT_NODE:
@@ -868,7 +869,9 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
             break;
 
         case XML_DOCUMENT_FRAG_NODE:
-            if (cur->children != NULL) {
+            /* Always validate cur->parent when descending. */
+            if ((cur->parent == parent) && (cur->children != NULL)) {
+                parent = cur;
                 cur = cur->children;
                 continue;
             }
@@ -887,7 +890,18 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
             break;
 
         case XML_ELEMENT_NODE:
-	    if ((cur != root) && (ctxt->format == 1) && (xmlIndentTreeOutput))
+            /*
+             * Some users like lxml are known to pass nodes with a corrupted
+             * tree structure. Fall back to a recursive call to handle this
+             * case.
+             */
+            if ((cur->parent != parent) && (cur->children != NULL)) {
+                xmlNodeDumpOutputInternal(ctxt, cur);
+                break;
+            }
+
+	    if ((ctxt->level > 0) && (ctxt->format == 1) &&
+                (xmlIndentTreeOutput))
 		xmlOutputBufferWrite(buf, ctxt->indent_size *
 				     (ctxt->level > ctxt->indent_nr ?
 				      ctxt->indent_nr : ctxt->level),
@@ -942,6 +956,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
                 xmlOutputBufferWrite(buf, 1, ">");
                 if (ctxt->format == 1) xmlOutputBufferWrite(buf, 1, "\n");
                 if (ctxt->level >= 0) ctxt->level++;
+                parent = cur;
                 cur = cur->children;
                 continue;
             }
@@ -1058,13 +1073,9 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
                 break;
             }
 
-            /*
-             * The parent should never be NULL here but we want to handle
-             * corrupted documents gracefully.
-             */
-            if (cur->parent == NULL)
-                return;
-            cur = cur->parent;
+            cur = parent;
+            /* cur->parent was validated when descending. */
+            parent = cur->parent;
 
             if (cur->type == XML_ELEMENT_NODE) {
                 if (ctxt->level > 0) ctxt->level--;
-- 
GitLab





From b66ce0bba83febe2f4d119097a0391f5d886c3b4 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Tue, 1 Mar 2022 12:39:02 +0100
Subject: [PATCH] Don't include ICU headers in public headers

There's no need to make these implementation details public.
---
 configure.ac              |  2 --
 encoding.c                | 14 ++++++++++++++
 include/libxml/encoding.h | 21 +++------------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/encoding.c b/encoding.c
index 0847934a..bfa5a304 100644
--- encoding.c
+++ encoding.c
@@ -48,6 +48,20 @@
 #include "buf.h"
 #include "enc.h"
 
+#ifdef LIBXML_ICU_ENABLED
+#include <unicode/ucnv.h>
+/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
+#define ICU_PIVOT_BUF_SIZE 1024
+typedef struct _uconv_t uconv_t;
+struct _uconv_t {
+  UConverter *uconv; /* for conversion between an encoding and UTF-16 */
+  UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
+  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
+  UChar      *pivot_source;
+  UChar      *pivot_target;
+};
+#endif
+
 static xmlCharEncodingHandlerPtr xmlUTF16LEHandler = NULL;
 static xmlCharEncodingHandlerPtr xmlUTF16BEHandler = NULL;
 
diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
index c875af6f..77f137f4 100644
--- include/libxml/encoding.h
+++ include/libxml/encoding.h
@@ -27,9 +27,7 @@
 #ifdef LIBXML_ICONV_ENABLED
 #include <iconv.h>
 #endif
-#ifdef LIBXML_ICU_ENABLED
-#include <unicode/ucnv.h>
-#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -128,19 +126,6 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
  * Block defining the handlers for non UTF-8 encodings.
  * If iconv is supported, there are two extra fields.
  */
-#ifdef LIBXML_ICU_ENABLED
-/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
-#define ICU_PIVOT_BUF_SIZE 1024
-struct _uconv_t {
-  UConverter *uconv; /* for conversion between an encoding and UTF-16 */
-  UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
-  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
-  UChar      *pivot_source;
-  UChar      *pivot_target;
-};
-typedef struct _uconv_t uconv_t;
-#endif
-
 typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
 typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
 struct _xmlCharEncodingHandler {
@@ -152,8 +137,8 @@ struct _xmlCharEncodingHandler {
     iconv_t                    iconv_out;
 #endif /* LIBXML_ICONV_ENABLED */
 #ifdef LIBXML_ICU_ENABLED
-    uconv_t                    *uconv_in;
-    uconv_t                    *uconv_out;
+    struct _uconv_t            *uconv_in;
+    struct _uconv_t            *uconv_out;
 #endif /* LIBXML_ICU_ENABLED */
 };
 
-- 
GitLab





From 13ad8736d294536da4cbcd70a96b0a2fbf47070c Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Tue, 25 May 2021 10:55:25 +0200
Subject: [PATCH] Fix regression in xmlNodeDumpOutputInternal

Commit 85b1792e could cause additional whitespace if xmlNodeDump was
called with a non-zero starting level.
---
 xmlsave.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xmlsave.c b/xmlsave.c
index aedbd5e7..489505f4 100644
--- xmlsave.c
+++ xmlsave.c
@@ -890,6 +890,13 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
             break;
 
         case XML_ELEMENT_NODE:
+	    if ((cur != root) && (ctxt->format == 1) &&
+                (xmlIndentTreeOutput))
+		xmlOutputBufferWrite(buf, ctxt->indent_size *
+				     (ctxt->level > ctxt->indent_nr ?
+				      ctxt->indent_nr : ctxt->level),
+				     ctxt->indent);
+
             /*
              * Some users like lxml are known to pass nodes with a corrupted
              * tree structure. Fall back to a recursive call to handle this
@@ -900,13 +907,6 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
                 break;
             }
 
-	    if ((ctxt->level > 0) && (ctxt->format == 1) &&
-                (xmlIndentTreeOutput))
-		xmlOutputBufferWrite(buf, ctxt->indent_size *
-				     (ctxt->level > ctxt->indent_nr ?
-				      ctxt->indent_nr : ctxt->level),
-				     ctxt->indent);
-
             xmlOutputBufferWrite(buf, 1, "<");
             if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
                 xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
-- 
GitLab





From 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Wed, 2 Jun 2021 17:31:49 +0200
Subject: [PATCH] Fix XPath recursion limit

Fix accounting of recursion depth when parsing XPath expressions.

This silly bug introduced in commit 804c5297 could lead to spurious
errors when parsing larger expressions or XSLT documents.

Should fix #264.
---
 xpath.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xpath.c b/xpath.c
index 7497ba07..1aa2f1ab 100644
--- xpath.c
+++ xpath.c
@@ -10983,7 +10983,7 @@ xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt, int sort) {
     }
 
     if (xpctxt != NULL)
-        xpctxt->depth -= 1;
+        xpctxt->depth -= 10;
 }
 
 /**
-- 
GitLab





From 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 7 Jun 2021 15:09:53 +0200
Subject: [PATCH] Fix whitespace when serializing empty HTML documents

The old, non-recursive HTML serialization code would always terminate
the output with a newline. The new implementation omitted the newline
if the document node had no children. Readd the newline when
serializing empty documents.

Fixes #266.
---
 HTMLtree.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/HTMLtree.c b/HTMLtree.c
index bdd639c7..7a2b8558 100644
--- HTMLtree.c
+++ HTMLtree.c
@@ -763,11 +763,15 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
             if (((xmlDocPtr) cur)->intSubset != NULL) {
                 htmlDtdDumpOutput(buf, (xmlDocPtr) cur, NULL);
             }
-            /* Always validate cur->parent when descending. */
-            if ((cur->parent == parent) && (cur->children != NULL)) {
-                parent = cur;
-                cur = cur->children;
-                continue;
+            if (cur->children != NULL) {
+                /* Always validate cur->parent when descending. */
+                if (cur->parent == parent) {
+                    parent = cur;
+                    cur = cur->children;
+                    continue;
+                }
+            } else {
+                xmlOutputBufferWriteString(buf, "\n");
             }
             break;
 
-- 
GitLab


Removed Link Here

(-)a/textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in (-9 lines)
1	--- libxml-2.0-uninstalled.pc.in.orig 2016-02-09 10:17:32 UTC
2	+++ libxml-2.0-uninstalled.pc.in
3	@@ -8,5 +8,5 @@ Name: libXML
4	Version: @VERSION@
5	Description: libXML library version2.
6	Requires:
7	-Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
8	+Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
9	Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@

Removed Link Here

(-)a/textproc/libxml2/files/patch-libxml-2.0.pc.in (-9 lines)
1	--- libxml-2.0.pc.in.orig 2016-02-09 10:17:32 UTC
2	+++ libxml-2.0.pc.in
3	@@ -9,5 +9,5 @@ Version: @VERSION@
4	Description: libXML library version2.
5	Requires:
6	Libs: -L${libdir} -lxml2
7	-Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
8	+Libs.private: @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
9	Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@




--- python/Makefile.in.orig	2019-11-16 14:42:34 UTC
+++ python/Makefile.in
@@ -493,7 +493,7 @@ top_srcdir = @top_srcdir@
 
 # Makefile for libxml2 python library
 AUTOMAKE_OPTIONS = 1.4 foreign
-SUBDIRS = . tests
+SUBDIRS = .
 docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
 dist_docs_DATA = TODO
 EXTRA_DIST = \
@@ -513,7 +513,7 @@ EXTRA_DIST = \
 @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
 @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
 @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
-@WITH_PYTHON_TRUE@        $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
+@WITH_PYTHON_TRUE@        -lxml2 $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
 
 @WITH_PYTHON_TRUE@BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
 @WITH_PYTHON_TRUE@dist_python_DATA = \

Removed Link Here

(-)a/textproc/libxml2/files/patch-python_tests_Makefile.in (-11 lines)
1	--- python/tests/Makefile.in.orig 2019-11-16 14:42:34 UTC
2	+++ python/tests/Makefile.in
3	@@ -387,7 +387,7 @@ target_alias = @target_alias@
4	top_build_prefix = @top_build_prefix@
5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@
7	-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
8	+exampledir = $(datadir)/examples/py-libxml2
9	dist_example_DATA = $(PYTESTS) $(XMLS)
10	PYTESTS = \
11	build.py \




--- xml2Conf.sh.in.orig	2019-10-22 18:28:43 UTC
+++ xml2Conf.sh.in
@@ -1,6 +1,12 @@
 #
 # Configuration file for using the XML library in GNOME applications
 #
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
 XML2_LIBDIR="@XML_LIBDIR@"
 XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@"
 XML2_INCLUDEDIR="@XML_INCLUDEDIR@"




include/libxml2/libxml/xpath.h
include/libxml2/libxml/xpathInternals.h
include/libxml2/libxml/xpointer.h
lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config-version.cmake
lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config.cmake
lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export.cmake
lib/libxml2.so
lib/libxml2.so.2
lib/libxml2.so.%%LIBVERSION%%
lib/xml2Conf.sh
libdata/pkgconfig/libxml-2.0.pc
share/aclocal/libxml.m4
man/man1/xml2-config.1.gz
man/man1/xmlcatalog.1.gz
man/man1/xmllint.1.gz
man/man3/libxml.3.gz
%%PORTDOCS%%%%DOCSDIR%%/APIchunk0.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk1.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk10.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk11.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk12.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk13.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk14.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk15.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk16.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk17.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk18.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk19.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk2.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk20.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk21.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk22.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk23.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk24.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk25.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk26.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk27.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk28.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk29.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk3.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk4.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk5.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk6.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk7.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk8.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk9.html
%%PORTDOCS%%%%DOCSDIR%%/APIconstructors.html
%%PORTDOCS%%%%DOCSDIR%%/APIfiles.html
%%PORTDOCS%%%%DOCSDIR%%/APIfunctions.html
%%PORTDOCS%%%%DOCSDIR%%/APIsymbols.html
%%PORTDOCS%%%%DOCSDIR%%/DOM.gif
%%PORTDOCS%%%%DOCSDIR%%/DOM.html
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-180x168.gif
%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-90x34.gif
%%PORTDOCS%%%%DOCSDIR%%/XMLinfo.html
%%PORTDOCS%%%%DOCSDIR%%/XSLT.html
%%PORTDOCS%%%%DOCSDIR%%/api.xsl
%%PORTDOCS%%%%DOCSDIR%%/apibuild.py
%%PORTDOCS%%%%DOCSDIR%%/architecture.html
%%PORTDOCS%%%%DOCSDIR%%/bugs.html
%%PORTDOCS%%%%DOCSDIR%%/catalog.gif
%%PORTDOCS%%%%DOCSDIR%%/catalog.html
%%PORTDOCS%%%%DOCSDIR%%/checkapisym.xsl
%%PORTDOCS%%%%DOCSDIR%%/contribs.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/devhelp2.xsl
%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/html.xsl
%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-DOCBparser.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-HTMLparser.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-HTMLtree.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-SAX.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-SAX2.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-c14n.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-catalog.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-chvalid.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-debugXML.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-dict.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-encoding.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-entities.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-globals.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-hash.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-list.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-nanoftp.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-nanohttp.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-parser.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-parserInternals.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-pattern.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-relaxng.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-schemasInternals.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-schematron.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-threads.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-tree.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-uri.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-valid.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xinclude.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xlink.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlIO.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlautomata.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlerror.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlexports.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlmemory.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlmodule.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlreader.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlregexp.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlsave.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlschemas.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlschemastypes.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlstring.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlunicode.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlversion.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlwriter.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpath.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpathInternals.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpointer.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2.devhelp2
%%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
%%PORTDOCS%%%%DOCSDIR%%/docs.html
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
%%PORTDOCS%%%%DOCSDIR%%/elfgcchack.xsl
%%PORTDOCS%%%%DOCSDIR%%/encoding.html
%%PORTDOCS%%%%DOCSDIR%%/entities.html
%%PORTDOCS%%%%DOCSDIR%%/example.html
%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xsl
%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
%%PORTDOCS%%%%DOCSDIR%%/examples/index.py
%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
%%PORTDOCS%%%%DOCSDIR%%/examples/io1.res
%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
%%PORTDOCS%%%%DOCSDIR%%/examples/io2.res
%%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/reader1.res
%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c
%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c
%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.res
%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c
%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.res
%%PORTDOCS%%%%DOCSDIR%%/examples/test1.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/test2.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/test3.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c
%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c
%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.res
%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c
%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.res
%%PORTDOCS%%%%DOCSDIR%%/examples/tst.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/writer.xml
%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c
%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.res
%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c
%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.res
%%PORTDOCS%%%%DOCSDIR%%/guidelines.html
%%PORTDOCS%%%%DOCSDIR%%/help.html
%%PORTDOCS%%%%DOCSDIR%%/html/book1.html
%%PORTDOCS%%%%DOCSDIR%%/html/home.png
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/left.png
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-DOCBparser.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-HTMLparser.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-HTMLtree.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-SAX.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-SAX2.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-c14n.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-catalog.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-chvalid.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-debugXML.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-dict.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-encoding.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-entities.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-globals.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-hash.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-lib.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-list.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-nanoftp.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-nanohttp.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-parser.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-parserInternals.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-pattern.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-relaxng.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-schemasInternals.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-schematron.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-threads.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-tree.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-uri.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-valid.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xinclude.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xlink.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlIO.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlautomata.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlerror.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlexports.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlmemory.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlmodule.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlreader.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlregexp.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlsave.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlschemas.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlschemastypes.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlstring.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlunicode.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlversion.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlwriter.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xpath.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xpathInternals.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xpointer.html
%%PORTDOCS%%%%DOCSDIR%%/html/right.png
%%PORTDOCS%%%%DOCSDIR%%/html/up.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/index.py
%%PORTDOCS%%%%DOCSDIR%%/interface.html
%%PORTDOCS%%%%DOCSDIR%%/intro.html
%%PORTDOCS%%%%DOCSDIR%%/library.html
%%PORTDOCS%%%%DOCSDIR%%/libxml.gif
%%PORTDOCS%%%%DOCSDIR%%/libxml2-api.xml
%%PORTDOCS%%%%DOCSDIR%%/libxml2.xsa
%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
%%PORTDOCS%%%%DOCSDIR%%/newapi.xsl
%%PORTDOCS%%%%DOCSDIR%%/news.html
%%PORTDOCS%%%%DOCSDIR%%/news.xsl
%%PORTDOCS%%%%DOCSDIR%%/python.html
%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
%%PORTDOCS%%%%DOCSDIR%%/search.php
%%PORTDOCS%%%%DOCSDIR%%/searches.html
%%PORTDOCS%%%%DOCSDIR%%/searches.xsl
%%PORTDOCS%%%%DOCSDIR%%/site.xsl
%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
%%PORTDOCS%%%%DOCSDIR%%/structure.gif
%%PORTDOCS%%%%DOCSDIR%%/symbols.xml
%%PORTDOCS%%%%DOCSDIR%%/syms.xsl
%%PORTDOCS%%%%DOCSDIR%%/threads.html
%%PORTDOCS%%%%DOCSDIR%%/tree.html
%%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
%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
%%PORTDOCS%%%%DOCSDIR%%/w3c.png
%%PORTDOCS%%%%DOCSDIR%%/wiki.xsl
%%PORTDOCS%%%%DOCSDIR%%/xml.html
%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.html
%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.xml
%%PORTDOCS%%%%DOCSDIR%%/xmldtd.html
%%PORTDOCS%%%%DOCSDIR%%/xmlio.html
%%PORTDOCS%%%%DOCSDIR%%/xmllint.html
%%PORTDOCS%%%%DOCSDIR%%/xmllint.xml
%%PORTDOCS%%%%DOCSDIR%%/xmlmem.html
%%PORTDOCS%%%%DOCSDIR%%/xmlreader.html
%%PORTDOCS%%%%DOCSDIR%%/xsa.xsl




# Created by: Ade Lovett <ade@FreeBSD.org>

PORTNAME=	libxslt
DISTVERSION=	1.1.35
PORTREVISION=	2
CATEGORIES=	textproc gnome
MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
		https://mirror.umd.edu/xbmc/build-deps/sources/
DIST_SUBDIR=	gnome2

MAINTAINER=	desktop@FreeBSD.org

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
		libgpg-error.so:security/libgpg-error

USES=		cmake cpe gnome localbase:ldflags pathfix pkgconfig tar:xz
CPE_VENDOR=	xmlsoft
GNU_CONFIGURE=	yes
USE_GNOME=	libxml2
USE_LDCONFIG=	yes

CMAKE_OFF=	LIBXSLT_WITH_PROFILER \
		LIBXSLT_WITH_PYTHON
CMAKE_ON=	LIBXSLT_WITH_CRYPTO
INSTALL_TARGET=	install-strip
TEST_TARGET=	check

OPTIONS_DEFINE=	DOCS DEBUG MEM_DEBUG TEST
OPTIONS_SUB=	yes

CRYPTO_DESC=	Enable crypto support
MEM_DEBUG_DESC=	Enable memory debugging

DEBUG_CMAKE_BOOL=	LIBXSLT_WITH_XSLT_DEBUG
DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-docs
MEM_DEBUG_CMAKE_BOOL=	LIBXSLT_WITH_MEM_DEBUG
TEST_CMAKE_BOOL=	LIBXSLT_WITH_TESTS
TEST_TEST_TARGET=	test

post-install:
	${RLN} ${STAGEDIR}${PREFIX}/lib/libexslt.so.0.8.20 ${STAGEDIR}${PREFIX}/lib/libexslt.so.0
	${RLN} ${STAGEDIR}${PREFIX}/lib/libxslt.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxslt.so.1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/libxslt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1572803425	1	TIMESTAMP = 1645748296
2	SHA256 (gnome2/libxslt-1.1.34.tar.gz) = 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f	2	SHA256 (gnome2/libxslt-1.1.35.tar.xz) = 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
3	SIZE (gnome2/libxslt-1.1.34.tar.gz) = 3552258	3	SIZE (gnome2/libxslt-1.1.35.tar.xz) = 1827548

Added Link Here

(-)b/textproc/libxslt/files/extra-patch-docs (+11 lines)
1	--- CMakeLists.txt.orig 2022-02-26 05:49:51 UTC
2	+++ CMakeLists.txt
3	@@ -430,7 +430,7 @@ endif()
4	install(FILES libexslt/libexslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation)
5	install(FILES libxslt/libxslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation)
6	install(FILES doc/xsltproc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
7	-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE)
8	+#install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE)
9
10	if(LIBXSLT_WITH_CRYPTO)
11	install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development)

Added Link Here

(-)b/textproc/libxslt/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2022-02-27 21:14:47 UTC
2	+++ CMakeLists.txt
3	@@ -480,7 +480,7 @@ set(EXSLT_PRIVATE_LIBS "${XSLT_PRIVATE_LIBS} ${LIBGCRY
4	file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
5	string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")
6
7	-set(prefix "\${pcfiledir}/${PACKAGE_RELATIVE_PATH}")
8	+set(prefix ${CMAKE_INSTALL_PREFIX})
9	set(exec_prefix "\${prefix}")
10	set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
11	set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")




From 9ae2f94df1721e002941b40665efb762aefcea1a Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 17 Aug 2020 03:42:11 +0200
Subject: [PATCH] Stop using maxParserDepth XPath limit

This will be removed again from libxml2.
---
 tests/fuzz/fuzz.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c
index f502ca2c..75234ad6 100644
--- tests/fuzz/fuzz.c
+++ tests/fuzz/fuzz.c
@@ -183,8 +183,7 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p,
     xpctxt = tctxt->xpathCtxt;
 
     /* Resource limits to avoid timeouts and call stack overflows */
-    xpctxt->maxParserDepth = 15;
-    xpctxt->maxDepth = 100;
+    xpctxt->maxDepth = 500;
     xpctxt->opLimit = 500000;
 
     /* Test namespaces used in xpath.xml */
@@ -317,8 +316,7 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p,
 
 static void
 xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) {
-    ctxt->maxParserDepth = 15;
-    ctxt->maxDepth = 100;
+    ctxt->maxDepth = 200;
     ctxt->opLimit = 100000;
 }
 
-- 
GitLab





From 824657768aea2cce9c23e72ba8085cb5e44350c7 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 17 Aug 2020 04:27:13 +0200
Subject: [PATCH] Transfer XPath limits to XPtr context

Expressions like document('doc.xml#xpointer(evil_expr)') ignored the
XPath limits.
---
 libxslt/functions.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/libxslt/functions.c b/libxslt/functions.c
index b350545a..975ea790 100644
--- libxslt/functions.c
+++ libxslt/functions.c
@@ -178,10 +178,22 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
 	goto out_fragment;
     }
 
+#if LIBXML_VERSION >= 20911 || \
+    defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
+    xptrctxt->opLimit = ctxt->context->opLimit;
+    xptrctxt->opCount = ctxt->context->opCount;
+    xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth;
+
+    resObj = xmlXPtrEval(fragment, xptrctxt);
+
+    ctxt->context->opCount = xptrctxt->opCount;
+#else
     resObj = xmlXPtrEval(fragment, xptrctxt);
-    xmlXPathFreeContext(xptrctxt);
 #endif
 
+    xmlXPathFreeContext(xptrctxt);
+#endif /* LIBXML_XPTR_ENABLED */
+
     if (resObj == NULL)
 	goto out_fragment;
 
-- 
GitLab





From 77c26bad0433541f486b1e7ced44ca9979376908 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Wed, 26 Aug 2020 00:34:38 +0200
Subject: [PATCH] Don't set maxDepth in XPath contexts

The maximum recursion depth is hardcoded in libxml2 now.
---
 libxslt/functions.c |  2 +-
 tests/fuzz/fuzz.c   | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/libxslt/functions.c b/libxslt/functions.c
index 975ea790..7887dda7 100644
--- libxslt/functions.c
+++ libxslt/functions.c
@@ -182,7 +182,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
     defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
     xptrctxt->opLimit = ctxt->context->opLimit;
     xptrctxt->opCount = ctxt->context->opCount;
-    xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth;
+    xptrctxt->depth = ctxt->context->depth;
 
     resObj = xmlXPtrEval(fragment, xptrctxt);
 
diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c
index 75234ad6..780c2d41 100644
--- tests/fuzz/fuzz.c
+++ tests/fuzz/fuzz.c
@@ -183,7 +183,6 @@ xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p,
     xpctxt = tctxt->xpathCtxt;
 
     /* Resource limits to avoid timeouts and call stack overflows */
-    xpctxt->maxDepth = 500;
     xpctxt->opLimit = 500000;
 
     /* Test namespaces used in xpath.xml */
@@ -314,12 +313,6 @@ xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p,
     return 0;
 }
 
-static void
-xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) {
-    ctxt->maxDepth = 200;
-    ctxt->opLimit = 100000;
-}
-
 xmlChar *
 xsltFuzzXslt(const char *data, size_t size) {
     xmlDocPtr xsltDoc;
@@ -349,7 +342,7 @@ xsltFuzzXslt(const char *data, size_t size) {
         xmlFreeDoc(xsltDoc);
         return NULL;
     }
-    xsltSetXPathResourceLimits(sheet->xpathCtxt);
+    sheet->xpathCtxt->opLimit = 100000;
     sheet->xpathCtxt->opCount = 0;
     if (xsltParseStylesheetUser(sheet, xsltDoc) != 0) {
         xsltFreeStylesheet(sheet);
@@ -361,7 +354,7 @@ xsltFuzzXslt(const char *data, size_t size) {
     xsltSetCtxtSecurityPrefs(sec, ctxt);
     ctxt->maxTemplateDepth = 100;
     ctxt->opLimit = 20000;
-    xsltSetXPathResourceLimits(ctxt->xpathCtxt);
+    ctxt->xpathCtxt->opLimit = 100000;
     ctxt->xpathCtxt->opCount = sheet->xpathCtxt->opCount;
 
     result = xsltApplyStylesheetUser(sheet, doc, NULL, NULL, NULL, ctxt);
-- 
GitLab





--- doc/xsltproc.1.orig	2020-01-14 06:28:43 UTC
+++ doc/xsltproc.1
@@ -1,736 +1,358 @@
-'\" t
 .\"     Title: xsltproc
 .\"    Author: John Fleck <jfleck@inkstain.net>
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: $Date$
+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\"      Date: $Date: 2008-04-21 16:28:56 +0200 (Mon, 21 Apr 2008) $
 .\"    Manual: xsltproc Manual
 .\"    Source: libxslt
-.\"  Language: English
 .\"
-.TH "XSLTPROC" "1" "$Date$" "libxslt" "xsltproc Manual"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
+.TH "XSLTPROC" "1" "$Date: 2008\-04\-21 16:28:56 +0200 (Mon, 21 Apr 2008) $" "libxslt" "xsltproc Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-
-
-
-
-
 .SH "NAME"
-xsltproc \- command line XSLT processor
-
+xsltproc - command line XSLT processor
 .SH "SYNOPSIS"
-
-	.HP \w'\fBxsltproc\fR\ 'u
-
-		\fBxsltproc\fR
-		 [
-			 [
-				 | \fB\-V\fR
-				 | \fB\-\-version\fR
-			]
-			 [
-				 | \fB\-v\fR
-				 | \fB\-\-verbose\fR
-			]
-			 [
-				 {
-					 | \fB\-o\fR
-					 | \fB\-\-output\fR
-				}
-				 {
-					 | \fIFILE\fR
-					 | \fIDIRECTORY\fR
-				}
-			]
-			 | \fB\-\-timing\fR
-			 | \fB\-\-repeat\fR
-			 | \fB\-\-debug\fR
-			 | \fB\-\-novalid\fR
-			 | \fB\-\-noout\fR
-			 | \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR
-			 | \fB\-\-html\fR
-			 | \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR
-			 | \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR
-			 | \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR
-			 | \fB\-\-nonet\fR
-			 | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
-			 | \fB\-\-load\-trace\fR
-			 | \fB\-\-catalogs\fR
-			 | \fB\-\-xinclude\fR
-			 | [\ |\ \fB\-\-profile\fR\ |\ \fB\-\-norman\fR\ ]
-			 | \fB\-\-dumpextensions\fR
-			 | \fB\-\-nowrite\fR
-			 | \fB\-\-nomkdir\fR
-			 | \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR
-			 | \fB\-\-nodtdattr\fR
-		]
-		 [\fISTYLESHEET\fR]
-		 {
-			 | \fIXML\-FILE\fR...
-			 | \-
-		}
-	
-
-
+.HP 9
+\fBxsltproc\fR [[\fB\-V\fR | \fB\-\-version\fR] [\fB\-v\fR | \fB\-\-verbose\fR] [{\fB\-o\fR | \fB\-\-output\fR} {\fIFILE\fR | \fIDIRECTORY\fR}] | \fB\-\-timing\fR | \fB\-\-repeat\fR | \fB\-\-debug\fR | \fB\-\-novalid\fR | \fB\-\-noout\fR | \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR | \fB\-\-html\fR | \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR | \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR | \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-catalogs\fR | \fB\-\-xinclude\fR | [\fB\-\-profile\fR\ |\ \fB\-\-norman\fR] | \fB\-\-dumpextensions\fR | \fB\-\-nowrite\fR | \fB\-\-nomkdir\fR | \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR | \fB\-\-nodtdattr\fR] [\fISTYLESHEET\fR] {\fIXML\-FILE\fR | \-}
 .SH "DESCRIPTION"
+.PP
 
-	
-	.PP
 \fBxsltproc\fR
 is a command line tool for applying
 XSLT
 stylesheets to
 XML
-documents\&. It is part of
-\fBlibxslt\fR(3), the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&.
+documents\. It is part of
+\fBlibxslt\fR(3), the XSLT C library for GNOME\. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\.
+.PP
 
-	.PP
 \fBxsltproc\fR
-is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is
-\fB\-\fR
-\&.
-
-	.PP
+is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\. It will use the standard input if a filename provided is
+\fB\-\fR\.
+.PP
 If a stylesheet is included in an
 XML
-document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\&.
-\fBxsltproc\fR
-will automatically detect the included stylesheet and use it\&.
-
-	.PP
+document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\. \fBxsltproc\fR will automatically detect the included stylesheet and use it\.
+.PP
 By default, output is to
-stdout\&. You can specify a file for output using the
+\fIstdout\fR\. You can specify a file for output using the
 \fB\-o\fR
 or
 \fB\-\-output\fR
-option\&.
-
-
+option\.
 .SH "OPTIONS"
+.PP
 
-	
-	.PP
 \fBxsltproc\fR
 accepts the following options (in alphabetical order):
-
-	
-
-
-		.PP
+.PP
 \fB\-\-catalogs\fR
 .RS 4
-
-	
-	
-		Use the
+Use the
 SGML
 catalog specified in
 \fBSGML_CATALOG_FILES\fR
-to resolve the location of external entities\&. By default,
+to resolve the location of external entities\. By default,
 \fBxsltproc\fR
 looks for the catalog specified in
-\fBXML_CATALOG_FILES\fR\&. If that is not specified, it uses
-/etc/xml/catalog\&.
-
-	
-		.RE
-
-		.PP
+\fBXML_CATALOG_FILES\fR\. If that is not specified, it uses
+\fI/etc/xml/catalog\fR\.
+.RE
+.PP
 \fB\-\-debug\fR
 .RS 4
-
-	
-	
-		Output an
+Output an
 XML
-tree of the transformed document for debugging purposes\&.
-
-	
-		.RE
-
-		.PP
+tree of the transformed document for debugging purposes\.
+.RE
+.PP
 \fB\-\-dumpextensions\fR
 .RS 4
-
-	
-	
-		Dumps the list of all registered extensions on
-stdout\&.
-
-	
-		.RE
-
-		.PP
+Dumps the list of all registered extensions on
+\fIstdout\fR\.
+.RE
+.PP
 \fB\-\-html\fR
 .RS 4
-
-	
-	
-		The input document is an
+The input document is an
 HTML
-file\&.
-
-	
-		.RE
-
-		.PP
+file\.
+.RE
+.PP
 \fB\-\-load\-trace\fR
 .RS 4
-
-	
-	
-		Display all the documents loaded during the processing to
-stderr\&.
-
-	
-		.RE
-
-		.PP
+Display all the documents loaded during the processing to
+\fIstderr\fR\.
+.RE
+.PP
 \fB\-\-maxdepth \fR\fB\fIVALUE\fR\fR
 .RS 4
-
-	
-	
-		Adjust the maximum depth of the template stack before
+Adjust the maximum depth of the template stack before
 \fBlibxslt\fR(3)
-concludes it is in an infinite loop\&. The default is 3000\&.
-
-	
-		.RE
-
-		.PP
+concludes it is in an infinite loop\. The default is 3000\.
+.RE
+.PP
 \fB\-\-nodtdattr\fR
 .RS 4
-
-	
-	
-		Do not apply default attributes from the document\*(Aqs
-DTD\&.
-
-	
-		.RE
-
-		.PP
+Do not apply default attributes from the document\'s
+DTD\.
+.RE
+.PP
 \fB\-\-nomkdir\fR
 .RS 4
-
-	
-	
-		Refuses to create directories\&.
-
-	
-		.RE
-
-		.PP
+Refuses to create directories\.
+.RE
+.PP
 \fB\-\-nonet\fR
 .RS 4
-
-	
-	
-		Do not use the Internet to fetch
-DTDs, entities or documents\&.
-
-	
-		.RE
-
-		.PP
+Do not use the Internet to fetch
+DTDs, entities or documents\.
+.RE
+.PP
 \fB\-\-noout\fR
 .RS 4
-
-	
-	
-		Do not output the result\&.
-
-	
-		.RE
-
-		.PP
+Do not output the result\.
+.RE
+.PP
 \fB\-\-novalid\fR
 .RS 4
-
-	
-	
-		Skip loading the document\*(Aqs
-DTD\&.
-
-	
-		.RE
-
-		.PP
+Skip loading the document\'s
+DTD\.
+.RE
+.PP
 \fB\-\-nowrite\fR
 .RS 4
-
-	
-	
-		Refuses to write to any file or resource\&.
-
-	
-		.RE
-
-		.PP
+Refuses to write to any file or resource\.
+.RE
+.PP
 \fB\-o\fR or \fB\-\-output\fR \fIFILE\fR | \fIDIRECTORY\fR
 .RS 4
-
-	
-	
-		Direct output to the given
-\fIFILE\fR\&. Using the option with a
+Direct output to the given
+\fIFILE\fR\. Using the option with a
 \fIDIRECTORY\fR
-directs the output files to the specified directory\&. This can be useful for multiple outputs (also known as "chunking") or manpage processing\&.
-
-		.if n \{\
+directs the output files to the specified directory\. This can be useful for multiple outputs (also known as "chunking") or manpage processing\.
 .sp
-.\}
-.RS 4
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.ps +1
-\fBImportant\fR
-.ps -1
-.br
-
-			The given directory
+Important
+The given directory
 \fBmust\fR
-already exist\&.
-
-		.sp .5v
-.RE
-		.if n \{\
+already exist\.
 .sp
-.\}
-.RS 4
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-
-			Make sure that
+Note
+Make sure that
 \fIFILE\fR
 and
 \fIDIRECTORY\fR
 follow the
 \(lqURI reference computation\(rq
-as described in RFC 2396 and laters\&. This means, that e\&.g\&.
+as described in RFC 2396 and laters\. This means, that e\.g\.
 \fB\-o directory\fR
 will maybe not work, but
 \fB\-o directory/\fR
-will\&.
-
-		.sp .5v
+will\.
 .RE
-	
-		.RE
-
-		.PP
+.PP
 \fB\-\-encoding \fR\fB\fIENCODING\fR\fR
 .RS 4
-
-	
-	
-		Allow to specify the encoding for the input\&.
-
-	
-		.RE
-		.PP
+Allow to specify the encoding for the input\.
+.RE
+.PP
 \fB\-\-param \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
 .RS 4
-
-	
-	
-		Pass a parameter of name
+Pass a parameter of name
 \fIPARAMNAME\fR
 and value
 \fIPARAMVALUE\fR
-to the stylesheet\&. You may pass multiple name/value pairs up to a maximum of 32\&. If the value being passed is a string, you can use
+to the stylesheet\. You may pass multiple name/value pairs up to a maximum of 32\. If the value being passed is a string, you can use
 \fB\-\-stringparam\fR
-instead, to avoid additional quote characters that appear in string expressions\&. Note: the XPath expression must be UTF\-8 encoded\&.
-
-	
-		.RE
-
-		.PP
+instead, to avoid additional quote characters that appear in string expressions\. Note: the XPath expression must be UTF\-8 encoded\.
+.RE
+.PP
 \fB\-\-path "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
 .RS 4
-
-	
-	
-		Use the (space\- or colon\-separated) list of filesystem paths specified by
+Use the (space\- or colon\-separated) list of filesystem paths specified by
 \fIPATHS\fR
 to load
-DTDs, entities or documents\&. Enclose space\-separated lists by quotation marks\&.
-
-	
-		.RE
-
-		.PP
+DTDs, entities or documents\. Enclose space\-separated lists by quotation marks\.
+.RE
+.PP
 \fB\-\-profile\fR or \fB\-\-norman\fR
 .RS 4
-
-	
-	
-		Output profiling information detailing the amount of time spent in each part of the stylesheet\&. This is useful in optimizing stylesheet performance\&.
-
-	
-		.RE
-
-		.PP
+Output profiling information detailing the amount of time spent in each part of the stylesheet\. This is useful in optimizing stylesheet performance\.
+.RE
+.PP
 \fB\-\-repeat\fR
 .RS 4
-
-	
-	
-		Run the transformation 20 times\&. Used for timing tests\&.
-
-	
-		.RE
-
-		.PP
+Run the transformation 20 times\. Used for timing tests\.
+.RE
+.PP
 \fB\-\-stringparam \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
 .RS 4
-
-	
-	
-		Pass a parameter of name
+Pass a parameter of name
 \fIPARAMNAME\fR
 and value
 \fIPARAMVALUE\fR
 where
 \fIPARAMVALUE\fR
-is a string rather than a node identifier\&.
+is a string rather than a node identifier\.
 \fBNote:\fR
-The string must be UTF\-8 encoded\&.
-
-	
-		.RE
-
-		.PP
+The string must be UTF\-8 encoded\.
+.RE
+.PP
 \fB\-\-timing\fR
 .RS 4
-
-	
-	
-		Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\&. Displayed in milliseconds\&.
-
-	
-		.RE
-
-		.PP
+Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\. Displayed in milliseconds\.
+.RE
+.PP
 \fB\-v\fR or \fB\-\-verbose\fR
 .RS 4
-
-	
-	
-		Output each step taken by
+Output each step taken by
 \fBxsltproc\fR
-in processing the stylesheet and the document\&.
-
-	
-		.RE
-
-		.PP
+in processing the stylesheet and the document\.
+.RE
+.PP
 \fB\-V\fR or \fB\-\-version\fR
 .RS 4
-
-	
-	
-		Show the version of
+Show the version of
 \fBlibxml\fR(3)
 and
 \fBlibxslt\fR(3)
-used\&.
-
-	
-		.RE
-
-		.PP
+used\.
+.RE
+.PP
 \fB\-\-writesubtree \fR\fB\fIPATH\fR\fR
 .RS 4
-
-	
-	
-		Allow file write only within the
+Allow file write only within the
 \fIPATH\fR
-subtree\&.
-
-	
-		.RE
-
-		.PP
+subtree\.
+.RE
+.PP
 \fB\-\-xinclude\fR
 .RS 4
-
-	
-	
-		Process the input document using the XInclude specification\&. More details on this can be found in the XInclude specification:
-\m[blue]\fB\%http://www.w3.org/TR/xinclude/\fR\m[]
-
-	
-		.RE
-
-	
-
+Process the input document using the XInclude specification\. More details on this can be found in the XInclude specification:
+\fI\%http://www.w3.org/TR/xinclude/\fR
+.RE
 .SH "ENVIRONMENT"
-
-	
-	
-
-
-		.PP
+.PP
 \fBSGML_CATALOG_FILES\fR
 .RS 4
-
-	
-	
-		SGML
-catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
+SGML
+catalog behavior can be changed by redirecting queries to the user\'s own set of catalogs\. This can be done by setting the
 \fBSGML_CATALOG_FILES\fR
-environment variable to a list of catalogs\&. An empty one should deactivate loading the default
-/etc/sgml/catalog
-catalog\&.
-
-	
-		.RE
-
-		.PP
+environment variable to a list of catalogs\. An empty one should deactivate loading the default
+\fI/etc/sgml/catalog\fR
+catalog\.
+.RE
+.PP
 \fBXML_CATALOG_FILES\fR
 .RS 4
-
-	
-	
-		XML
-catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
+XML
+catalog behavior can be changed by redirecting queries to the user\'s own set of catalogs\. This can be done by setting the
 \fBXML_CATALOG_FILES\fR
-environment variable to a list of catalogs\&. An empty one should deactivate loading the default
-/etc/xml/catalog
-catalog\&.
-
-	
-		.RE
-
-	
-
+environment variable to a list of catalogs\. An empty one should deactivate loading the default
+\fI/etc/xml/catalog\fR
+catalog\.
+.RE
 .SH "DIAGNOSTICS"
+.PP
 
-	
-	.PP
 \fBxsltproc\fR
-return codes provide information that can be used when calling it from scripts\&.
-
-	
-
-
-		.PP
+return codes provide information that can be used when calling it from scripts\.
+.PP
 \fB0\fR
 .RS 4
-
-	
-	
-		No error (normal operation)
-
-	
-		.RE
-
-		.PP
+No error (normal operation)
+.RE
+.PP
 \fB1\fR
 .RS 4
-
-	
-	
-		No argument
-
-	
-		.RE
-
-		.PP
+No argument
+.RE
+.PP
 \fB2\fR
 .RS 4
-
-	
-	
-		Too many parameters
-
-	
-		.RE
-
-		.PP
+Too many parameters
+.RE
+.PP
 \fB3\fR
 .RS 4
-
-	
-	
-		Unknown option
-
-	
-		.RE
-
-		.PP
+Unknown option
+.RE
+.PP
 \fB4\fR
 .RS 4
-
-	
-	
-		Failed to parse the stylesheet
-
-	
-		.RE
-
-		.PP
+Failed to parse the stylesheet
+.RE
+.PP
 \fB5\fR
 .RS 4
-
-	
-	
-		Error in the stylesheet
-
-	
-		.RE
-
-		.PP
+Error in the stylesheet
+.RE
+.PP
 \fB6\fR
 .RS 4
-
-	
-	
-		Error in one of the documents
-
-	
-		.RE
-
-		.PP
+Error in one of the documents
+.RE
+.PP
 \fB7\fR
 .RS 4
-
-	
-	
-		Unsupported xsl:output method
-
-	
-		.RE
-
-		.PP
+Unsupported xsl:output method
+.RE
+.PP
 \fB8\fR
 .RS 4
-
-	
-	
-		String parameter contains both quote and double\-quotes
-
-	
-		.RE
-
-		.PP
+String parameter contains both quote and double\-quotes
+.RE
+.PP
 \fB9\fR
 .RS 4
-
-	
-	
-		Internal processing error
-
-	
-		.RE
-
-		.PP
+Internal processing error
+.RE
+.PP
 \fB10\fR
 .RS 4
-
-	
-	
-		Processing was stopped by a terminating message
-
-	
-		.RE
-
-		.PP
+Processing was stopped by a terminating message
+.RE
+.PP
 \fB11\fR
 .RS 4
-
-	
-	
-		Could not write the result to the output file
-
-	
-		.RE
-
-	
-
+Could not write the result to the output file
+.RE
 .SH "SEE ALSO"
-
-	
-	.PP
+.PP
 \fBlibxml\fR(3),
 \fBlibxslt\fR(3)
-
-	.PP
+.PP
 More information can be found at
 .sp
 .RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-				\fBlibxml\fR(3)
+\h'-04'\(bu\h'+03'\fBlibxml\fR(3)
 web page
-\m[blue]\fB\%http://www.xmlsoft.org/\fR\m[]
-
-			.RE
+\fI\%http://www.xmlsoft.org/\fR
+.RE
 .sp
 .RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-
-				W3C
+\h'-04'\(bu\h'+03'W3C
 XSLT
 page
-\m[blue]\fB\%http://www.w3.org/TR/xslt\fR\m[]
-
-			.RE
+\fI\%http://www.w3.org/TR/xslt\fR
+.RE
 .sp
-
-
-
+.RE
 .SH "AUTHOR"
 .PP
-\fBJohn Fleck\fR <\&jfleck@inkstain\&.net\&>
-.br
-
-				
-			
-.RS 4
+\fBJohn Fleck\fR <\&jfleck@inkstain\.net\&>
+.sp -1n
+.IP "" 4
 Author.
-.RE
 .SH "COPYRIGHT"
-.br
 Copyright \(co 2001, 2002
 .br




--- python/Makefile.in.orig	2012-10-22 16:16:50.000000000 +0000
+++ python/Makefile.in	2012-10-22 16:17:40.000000000 +0000
@@ -344,7 +344,7 @@
 	-I../libexslt
 
 AM_CFLAGS = $(LIBXML_CFLAGS)
-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
+DOCS_DIR = $(datadir)/doc/py-libxslt
 # libxsltclass.txt is generated
 DOCS = TODO
 EXTRA_DIST = \
@@ -359,8 +359,8 @@
 
 libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
 @WITH_PYTHON_TRUE@mylibs = \
-@WITH_PYTHON_TRUE@	$(top_builddir)/libxslt/libxslt.la \
-@WITH_PYTHON_TRUE@	$(top_builddir)/libexslt/libexslt.la
+@WITH_PYTHON_TRUE@	-lxslt \
+@WITH_PYTHON_TRUE@	-lexslt
 
 @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la
 @WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c

Removed Link Here

(-)a/textproc/libxslt/files/patch-python__tests__Makefile.in (-11 lines)
1	--- python/tests/Makefile.in.orig 2008-05-23 23:11:10.000000000 -0500
2	+++ python/tests/Makefile.in 2008-05-23 23:11:33.000000000 -0500
3	@@ -204,7 +204,7 @@
4	target_alias = @target_alias@
5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@
7	-EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples
8	+EXAMPLE_DIR = $(datadir)/examples/py-libxslt
9	TESTSPY = \
10	basic.py \
11	exslt.py \

Lines 7-10 Saxon's evaluate and expressions extensions. Link Here

(-)b/textproc/libxslt/pkg-descr (-1 / +1 lines)
7	People can either embed the library in their application or use xsltproc the	7	People can either embed the library in their application or use xsltproc the
8	command line processing tool.	8	command line processing tool.
9		9
10	WWW: http://xmlsoft.org/XSLT/	10	WWW: https://gitlab.gnome.org/GNOME/libxslt/




include/libxslt/xsltexports.h
include/libxslt/xsltlocale.h
include/libxslt/xsltutils.h
lib/cmake/libxslt-1.1.35/FindGcrypt.cmake
lib/cmake/libxslt-1.1.35/libxslt-config-version.cmake
lib/cmake/libxslt-1.1.35/libxslt-config.cmake
lib/cmake/libxslt-1.1.35/libxslt-export-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libxslt-1.1.35/libxslt-export.cmake
lib/libexslt.so
lib/libexslt.so.0
lib/libexslt.so.0.8.20
lib/libxslt.a
lib/libxslt.so
lib/libxslt.so.1
lib/libxslt.so.1.1.35
lib/xsltConf.sh
libdata/pkgconfig/libexslt.pc
libdata/pkgconfig/libxslt.pc
share/aclocal/libxslt.m4
man/man1/xsltproc.1.gz
man/man3/libexslt.3.gz
man/man3/libxslt.3.gz
%%PORTDOCS%%%%DOCSDIR%%/API.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk0.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk1.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk10.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk11.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk12.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk2.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk3.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk4.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk5.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk6.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk7.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk8.html
%%PORTDOCS%%%%DOCSDIR%%/APIchunk9.html
%%PORTDOCS%%%%DOCSDIR%%/APIconstructors.html
%%PORTDOCS%%%%DOCSDIR%%/APIfiles.html
%%PORTDOCS%%%%DOCSDIR%%/APIfunctions.html
%%PORTDOCS%%%%DOCSDIR%%/APIsymbols.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIchunk0.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIconstructors.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIfiles.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIfunctions.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIsymbols.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/bugs.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/devhelp2.xsl
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/general.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/home.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/html.xsl
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/index.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/left.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/libexslt-exslt.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/libexslt-exsltexports.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/libexslt.devhelp2
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/right.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/style.css
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/up.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/docs.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/downloads.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/exslt.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/help.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/book1.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/home.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/left.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/libexslt-exslt.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/libexslt-exsltexports.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/libexslt-lib.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/right.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/up.png
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/index.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/intro.html
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/libexslt-api.xml
%%PORTDOCS%%%%DOCSDIR%%/EXSLT/libexslt-refs.xml
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
%%PORTDOCS%%%%DOCSDIR%%/Libxslt-Logo-180x168.gif
%%PORTDOCS%%%%DOCSDIR%%/Libxslt-Logo-90x34.gif
%%PORTDOCS%%%%DOCSDIR%%/api.xsl
%%PORTDOCS%%%%DOCSDIR%%/apibuild.py
%%PORTDOCS%%%%DOCSDIR%%/bugs.html
%%PORTDOCS%%%%DOCSDIR%%/checkapisym.xsl
%%PORTDOCS%%%%DOCSDIR%%/contexts.gif
%%PORTDOCS%%%%DOCSDIR%%/contribs.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/devhelp2.xsl
%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/html.xsl
%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-attributes.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-documents.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-extensions.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-extra.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-functions.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-imports.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-keys.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-namespaces.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-numbersInternals.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-pattern.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-preproc.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-security.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-templates.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-transform.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-variables.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xslt.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltInternals.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltexports.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltlocale.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltutils.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt.devhelp2
%%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
%%PORTDOCS%%%%DOCSDIR%%/docbook.html
%%PORTDOCS%%%%DOCSDIR%%/docs.html
%%PORTDOCS%%%%DOCSDIR%%/downloads.html
%%PORTDOCS%%%%DOCSDIR%%/duck.png
%%PORTDOCS%%%%DOCSDIR%%/epatents.png
%%PORTDOCS%%%%DOCSDIR%%/extensions.html
%%PORTDOCS%%%%DOCSDIR%%/gnome2.png
%%PORTDOCS%%%%DOCSDIR%%/help.html
%%PORTDOCS%%%%DOCSDIR%%/html/book1.html
%%PORTDOCS%%%%DOCSDIR%%/html/home.png
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/left.png
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-attributes.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-documents.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-extensions.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-extra.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-functions.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-imports.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-keys.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-lib.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-namespaces.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-numbersInternals.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-pattern.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-preproc.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-security.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-templates.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-transform.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-variables.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xslt.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltInternals.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltexports.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltlocale.html
%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltutils.html
%%PORTDOCS%%%%DOCSDIR%%/html/right.png
%%PORTDOCS%%%%DOCSDIR%%/html/up.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/10.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/2.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/3.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/4.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/5.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/6.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/7.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/8.png
%%PORTDOCS%%%%DOCSDIR%%/images/callouts/9.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/internals.html
%%PORTDOCS%%%%DOCSDIR%%/intro.html
%%PORTDOCS%%%%DOCSDIR%%/libxslt-api.xml
%%PORTDOCS%%%%DOCSDIR%%/libxslt-refs.xml
%%PORTDOCS%%%%DOCSDIR%%/libxslt.xsa
%%PORTDOCS%%%%DOCSDIR%%/newapi.xsl
%%PORTDOCS%%%%DOCSDIR%%/news.html
%%PORTDOCS%%%%DOCSDIR%%/news.xsl
%%PORTDOCS%%%%DOCSDIR%%/node.gif
%%PORTDOCS%%%%DOCSDIR%%/object.gif
%%PORTDOCS%%%%DOCSDIR%%/processing.gif
%%PORTDOCS%%%%DOCSDIR%%/python.html
%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
%%PORTDOCS%%%%DOCSDIR%%/search.xml
%%PORTDOCS%%%%DOCSDIR%%/site.xsl
%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
%%PORTDOCS%%%%DOCSDIR%%/stylesheet.gif
%%PORTDOCS%%%%DOCSDIR%%/symbols.xml
%%PORTDOCS%%%%DOCSDIR%%/syms.xsl
%%PORTDOCS%%%%DOCSDIR%%/templates.gif
%%PORTDOCS%%%%DOCSDIR%%/tutorial/libxslt_tutorial.c
%%PORTDOCS%%%%DOCSDIR%%/tutorial/libxslttutorial.html
%%PORTDOCS%%%%DOCSDIR%%/tutorial/libxslttutorial.xml
%%PORTDOCS%%%%DOCSDIR%%/tutorial2/libxslt_pipes.c
%%PORTDOCS%%%%DOCSDIR%%/tutorial2/libxslt_pipes.html
%%PORTDOCS%%%%DOCSDIR%%/tutorial2/libxslt_pipes.xml
%%PORTDOCS%%%%DOCSDIR%%/w3c.png
%%PORTDOCS%%%%DOCSDIR%%/xsa.xsl
%%PORTDOCS%%%%DOCSDIR%%/xslt.html
%%PORTDOCS%%%%DOCSDIR%%/xsltproc.1
%%PORTDOCS%%%%DOCSDIR%%/xsltproc.html
%%PORTDOCS%%%%DOCSDIR%%/xsltproc.xml
%%PORTDOCS%%%%DOCSDIR%%/xsltproc2.html




CATEGORIES=	textproc gnome python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	desktop@FreeBSD.org
COMMENT=	Python interface for XML parser library for GNOME

MASTERDIR=	${.CURDIR}/../libxml2
BUILD_WRKSRC=	${WRKSRC}/python
INSTALL_WRKSRC=	${BUILD_WRKSRC}
DESCR=		${.CURDIR}/pkg-descr
PLIST=		${.CURDIR}/pkg-plist

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}
		--with-html-dir=${PREFIX}/share/doc \
		--with-html-subdir=${PORTNAME} \
		--with-python=${PYTHON_CMD}

OPTIONS_SLAVE=	${OPTIONS_DEFINE:NTEST}
EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2

# Tell master port we're a slave port
LIBXML2_SLAVE=	python
# Grab pkg-descr from slave port
DESCR=		${.CURDIR}/pkg-descr
# Don't append pkg-plist from master port
PLIST=
PLIST_FILES=	${PYTHON_SITELIBDIR}/drv_libxml2.py \
		${PYTHON_SITELIBDIR}/libxml2.py \
		${PYTHON_SITELIBDIR}/libxml2mod.so \
		${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}

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}
		${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}

.include "${MASTERDIR}/Makefile"

Return to bug 262288

Lines 1-81 Link Here

(-)b/textproc/libxml2/Makefile (-52 / +30 lines)
1	# Created by: Yukihiro Nakai <Nakai@technologist.com>	1	# Created by: Yukihiro Nakai <Nakai@technologist.com>
2		2
3	PORTNAME= libxml2	3	PORTNAME= libxml2
4	DISTVERSION= 2.9.12	4	DISTVERSION= 2.9.13
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES?= textproc gnome	6	CATEGORIES?= textproc gnome
7	MASTER_SITES= http://xmlsoft.org/sources/	7	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
8	DIST_SUBDIR= gnome2	8	DIST_SUBDIR= gnome2
9		9
10	MAINTAINER?= desktop@FreeBSD.org	10	MAINTAINER= desktop@FreeBSD.org
11	COMMENT?= XML parser library for GNOME	11	COMMENT?= XML parser library for GNOME
12		12
13	LICENSE= MIT TRIO	13	LICENSE= MIT
14	LICENSE_COMB= multi	14
15	LICENSE_NAME_TRIO= Trio License	15	USES+= cmake cpe iconv localbase:ldflags pathfix pkgconfig tar:xz
16	LICENSE_FILE_MIT= ${WRKSRC}/COPYING
17	LICENSE_FILE_TRIO= ${FILESDIR}/LICENSE.TRIO
18	LICENSE_PERMS_TRIO= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
19		16
20	USES+= compiler cpe iconv libtool pathfix pkgconfig shebangfix
21	GNU_CONFIGURE= yes
22	CPE_VENDOR= xmlsoft	17	CPE_VENDOR= xmlsoft
23	SHEBANG_FILES= .py /.py //.py
24	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
25		19
26	INSTALL_TARGET= install-strip
27	TEST_TARGET= check
28
29	CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
30	--with-html-dir=${PREFIX}/share/doc \
31	--with-html-subdir=${PORTNAME} \
32	--without-icu \
33	--with-lzma=/usr \
34	--without-python
35
36	PLIST_SUB+= LIBVERSION=${DISTVERSION}	20	PLIST_SUB+= LIBVERSION=${DISTVERSION}
37		21
38	.if !defined(MASTERDIR)	22	# Don't build with Python support unless requested
		23	CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON
39		24
40	OPTIONS_DEFINE= MEM_DEBUG SCHEMA THREAD_ALLOC THREADS VALIDATION \	25	OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC TEST
41	XMLLINT_HIST	26	OPTIONS_DEFAULT= ICU READLINE
42	OPTIONS_DEFAULT= SCHEMA VALIDATION THREADS	27	OPTIONS_SUB= yes
43		28
44	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)	29	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
45	SCHEMA_DESC= XML schema support
46	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)	30	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
47	VALIDATION_DESC= Validation support	31	READLINE_DESC= History for xmllint
48	XMLLINT_HIST_DESC= History for xmllint	32
49		33	DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-docs
50	MEM_DEBUG_CONFIGURE_WITH= mem-debug	34	ICU_LIB_DEPENDS= libicudata.so:devel/icu
51	SCHEMA_CONFIGURE_WITH= schemas	35	ICU_CMAKE_BOOL= LIBXML2_WITH_ICU
52	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc	36	MEM_DEBUG_CAKE_BOOL= LIBXML2_WITH_MEM_DEBUG
53	THREADS_CONFIGURE_WITH= threads	37	READLINE_LIB_DEPENDS= libreadline.so:devel/readline
54	VALIDATION_CONFIGURE_OFF= --without-valid	38	READLINE_CMAKE_OFF= -DHAVE_LIBHISTORY=false -DHAVE_LIBREADLINE=false
55	XMLLINT_HIST_CONFIGURE_WITH= history	39	THREAD_ALLOC_CMAKE_BOOL=LIBXML2_WITH_THREAD_ALLOC
56		40	TEST_CMAKE_BOOL= LIBXML2_WITH_TESTS
57	.endif # !defined(MASTERDIR)	41	TEST_TEST_TARGET= test
58
59	.if !defined(MASTERDIR)
60	post-install:
61	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
62	.endif
63
64	.include <bsd.port.pre.mk>
65		42
66	post-patch:	43	post-patch:
67	.for d in . doc doc/devhelp doc/examples
68	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \
69	${WRKSRC}/${d}/Makefile.in
70	.endfor
71	.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1	44	.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
72	@${REINPLACE_CMD} -e \	45	@${REINPLACE_CMD} -e \
73	's\|/etc/xml/catalog\|${LOCALBASE}/share/xml/catalog\|g; \	46	's\|/etc/xml/catalog\|${LOCALBASE}/share/xml/catalog\|g; \
74	s\|/etc/sgml/catalog\|${LOCALBASE}/share/sgml/catalog\|g' \	47	s\|/etc/sgml/catalog\|${LOCALBASE}/share/sgml/catalog\|g' \
75	${WRKSRC}/${f}	48	${WRKSRC}/${f}
76	.endfor	49	.endfor
77	.if ${CHOSEN_COMPILER_TYPE} == gcc	50
78	@${REINPLACE_CMD} -e 's/ -Wno-array-bounds//' ${WRKSRC}/configure	51	.if !defined(LIBXML2_SLAVE)
		52	post-install:
		53	${RM} ${STAGEDIR}${DOCSDIR}/xmlcatalog.1
		54	${RM} ${STAGEDIR}${DOCSDIR}/xmllint.1.bak
		55	${RM} ${STAGEDIR}${DOCSDIR}/xmllint.1
		56	${RLN} ${STAGEDIR}${PREFIX}/lib/libxml2.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxml2.so.2
79	.endif	57	.endif
80		58
81	.include <bsd.port.post.mk>	59	.include <bsd.port.mk>

Removed Link Here

(-)a/textproc/libxml2/files/LICENSE.TRIO (-12 lines)
1	(Following sentences are from trio.c of libxml2-2.9.4.tar.gz.)
2
3	Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
4
5	Permission to use, copy, modify, and distribute this software for any
6	purpose with or without fee is hereby granted, provided that the above
7	copyright notice and this permission notice appear in all copies.
8
9	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
10	WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
11	MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
12	CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.

Removed Link Here

(-)a/textproc/libxml2/files/patch-Makefile.in (-47 lines)
1	--- Makefile.in.orig 2021-06-09 19:53:33 UTC
2	+++ Makefile.in
3	@@ -760,7 +760,7 @@ man_MANS = xml2-config.1 libxml.3
4	m4datadir = $(datadir)/aclocal
5	m4data_DATA = libxml.m4
6	runtest_SOURCES = runtest.c
7	-runtest_LDFLAGS =
8	+runtest_LDFLAGS = -pthread
9	runtest_DEPENDENCIES = $(DEPS)
10	runtest_LDADD = $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
11	testrecurse_SOURCES = testrecurse.c
12	@@ -808,7 +808,7 @@ testC14N_LDFLAGS =
13	testC14N_DEPENDENCIES = $(DEPS)
14	testC14N_LDADD = $(LDADDS)
15	testThreads_SOURCES = testThreads.c
16	-testThreads_LDFLAGS =
17	+testThreads_LDFLAGS = -pthread
18	testThreads_DEPENDENCIES = $(DEPS)
19	testThreads_LDADD = $(BASE_THREAD_LIBS) $(LDADDS)
20	testURI_SOURCES = testURI.c
21	@@ -1285,7 +1285,7 @@ am--depfiles: $(am__depfiles_remade)
22	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
23
24	.c.lo:
25	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
26	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
27	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo
28	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
29	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
30	@@ -1774,7 +1774,7 @@ check-am: all-am
31	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
32	check: $(BUILT_SOURCES)
33	$(MAKE) $(AM_MAKEFLAGS) check-recursive
34	-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
35	+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
36	config.h
37	install-binPROGRAMS: install-libLTLIBRARIES
38
39	@@ -1911,7 +1911,7 @@ info: info-recursive
40
41	info-am:
42
43	-install-data-am: install-cmakeDATA install-data-local \
44	+install-data-am: install-cmakeDATA \
45	install-m4dataDATA install-man install-pkgconfigDATA
46
47	install-dvi: install-dvi-recursive

Removed Link Here

(-)a/textproc/libxml2/files/patch-git-01-85b1792e37b131e7a51af98a37f92472e8de5f3f (-211 lines)
1	From 85b1792e37b131e7a51af98a37f92472e8de5f3f Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Tue, 18 May 2021 20:08:28 +0200
4	Subject: [PATCH] Work around lxml API abuse
5
6	Make xmlNodeDumpOutput and htmlNodeDumpFormatOutput work with corrupted
7	parent pointers. This used to work with the old recursive code but the
8	non-recursive rewrite required parent pointers to be set correctly.
9
10	Unfortunately, lxml relies on the old behavior and passes subtrees with
11	a corrupted structure. Fall back to a recursive function call if an
12	invalid parent pointer is detected.
13
14	Fixes #255.
15	---
16	HTMLtree.c \| 46 ++++++++++++++++++++++++++++------------------
17	xmlsave.c \| 31 +++++++++++++++++++++----------
18	2 files changed, 49 insertions(+), 28 deletions(-)
19
20	diff --git a/HTMLtree.c b/HTMLtree.c
21	index 24434d45..bdd639c7 100644
22	--- HTMLtree.c
23	+++ HTMLtree.c
24	@@ -744,7 +744,7 @@ void
25	htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
26	xmlNodePtr cur, const char *encoding ATTRIBUTE_UNUSED,
27	int format) {
28	- xmlNodePtr root;
29	+ xmlNodePtr root, parent;
30	xmlAttrPtr attr;
31	const htmlElemDesc * info;
32
33	@@ -755,6 +755,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
34	}
35
36	root = cur;
37	+ parent = cur->parent;
38	while (1) {
39	switch (cur->type) {
40	case XML_HTML_DOCUMENT_NODE:
41	@@ -762,13 +763,25 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
42	if (((xmlDocPtr) cur)->intSubset != NULL) {
43	htmlDtdDumpOutput(buf, (xmlDocPtr) cur, NULL);
44	}
45	- if (cur->children != NULL) {
46	+ /* Always validate cur->parent when descending. */
47	+ if ((cur->parent == parent) && (cur->children != NULL)) {
48	+ parent = cur;
49	cur = cur->children;
50	continue;
51	}
52	break;
53
54	case XML_ELEMENT_NODE:
55	+ /*
56	+ * Some users like lxml are known to pass nodes with a corrupted
57	+ * tree structure. Fall back to a recursive call to handle this
58	+ * case.
59	+ */
60	+ if ((cur->parent != parent) && (cur->children != NULL)) {
61	+ htmlNodeDumpFormatOutput(buf, doc, cur, encoding, format);
62	+ break;
63	+ }
64	+
65	/*
66	* Get specific HTML info for that node.
67	*/
68	@@ -817,6 +830,7 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
69	(cur->name != NULL) &&
70	(cur->name[0] != 'p')) /* p, pre, param */
71	xmlOutputBufferWriteString(buf, "\n");
72	+ parent = cur;
73	cur = cur->children;
74	continue;
75	}
76	@@ -825,9 +839,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
77	(info != NULL) && (!info->isinline)) {
78	if ((cur->next->type != HTML_TEXT_NODE) &&
79	(cur->next->type != HTML_ENTITY_REF_NODE) &&
80	- (cur->parent != NULL) &&
81	- (cur->parent->name != NULL) &&
82	- (cur->parent->name[0] != 'p')) /* p, pre, param */
83	+ (parent != NULL) &&
84	+ (parent->name != NULL) &&
85	+ (parent->name[0] != 'p')) /* p, pre, param */
86	xmlOutputBufferWriteString(buf, "\n");
87	}
88
89	@@ -842,9 +856,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
90	break;
91	if (((cur->name == (const xmlChar *)xmlStringText) \|\|
92	(cur->name != (const xmlChar *)xmlStringTextNoenc)) &&
93	- ((cur->parent == NULL) \|\|
94	- ((xmlStrcasecmp(cur->parent->name, BAD_CAST "script")) &&
95	- (xmlStrcasecmp(cur->parent->name, BAD_CAST "style"))))) {
96	+ ((parent == NULL) \|\|
97	+ ((xmlStrcasecmp(parent->name, BAD_CAST "script")) &&
98	+ (xmlStrcasecmp(parent->name, BAD_CAST "style"))))) {
99	xmlChar *buffer;
100
101	buffer = xmlEncodeEntitiesReentrant(doc, cur->content);
102	@@ -902,13 +916,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
103	break;
104	}
105
106	- /*
107	- * The parent should never be NULL here but we want to handle
108	- * corrupted documents gracefully.
109	- */
110	- if (cur->parent == NULL)
111	- return;
112	- cur = cur->parent;
113	+ cur = parent;
114	+ /* cur->parent was validated when descending. */
115	+ parent = cur->parent;
116
117	if ((cur->type == XML_HTML_DOCUMENT_NODE) \|\|
118	(cur->type == XML_DOCUMENT_NODE)) {
119	@@ -939,9 +949,9 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
120	(cur->next != NULL)) {
121	if ((cur->next->type != HTML_TEXT_NODE) &&
122	(cur->next->type != HTML_ENTITY_REF_NODE) &&
123	- (cur->parent != NULL) &&
124	- (cur->parent->name != NULL) &&
125	- (cur->parent->name[0] != 'p')) /* p, pre, param */
126	+ (parent != NULL) &&
127	+ (parent->name != NULL) &&
128	+ (parent->name[0] != 'p')) /* p, pre, param */
129	xmlOutputBufferWriteString(buf, "\n");
130	}
131	}
132	diff --git a/xmlsave.c b/xmlsave.c
133	index 61a40459..aedbd5e7 100644
134	--- xmlsave.c
135	+++ xmlsave.c
136	@@ -847,7 +847,7 @@ htmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
137	static void
138	xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
139	int format = ctxt->format;
140	- xmlNodePtr tmp, root, unformattedNode = NULL;
141	+ xmlNodePtr tmp, root, unformattedNode = NULL, parent;
142	xmlAttrPtr attr;
143	xmlChar start, end;
144	xmlOutputBufferPtr buf;
145	@@ -856,6 +856,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
146	buf = ctxt->buf;
147
148	root = cur;
149	+ parent = cur->parent;
150	while (1) {
151	switch (cur->type) {
152	case XML_DOCUMENT_NODE:
153	@@ -868,7 +869,9 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
154	break;
155
156	case XML_DOCUMENT_FRAG_NODE:
157	- if (cur->children != NULL) {
158	+ /* Always validate cur->parent when descending. */
159	+ if ((cur->parent == parent) && (cur->children != NULL)) {
160	+ parent = cur;
161	cur = cur->children;
162	continue;
163	}
164	@@ -887,7 +890,18 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
165	break;
166
167	case XML_ELEMENT_NODE:
168	- if ((cur != root) && (ctxt->format == 1) && (xmlIndentTreeOutput))
169	+ /*
170	+ * Some users like lxml are known to pass nodes with a corrupted
171	+ * tree structure. Fall back to a recursive call to handle this
172	+ * case.
173	+ */
174	+ if ((cur->parent != parent) && (cur->children != NULL)) {
175	+ xmlNodeDumpOutputInternal(ctxt, cur);
176	+ break;
177	+ }
178	+
179	+ if ((ctxt->level > 0) && (ctxt->format == 1) &&
180	+ (xmlIndentTreeOutput))
181	xmlOutputBufferWrite(buf, ctxt->indent_size *
182	(ctxt->level > ctxt->indent_nr ?
183	ctxt->indent_nr : ctxt->level),
184	@@ -942,6 +956,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
185	xmlOutputBufferWrite(buf, 1, ">");
186	if (ctxt->format == 1) xmlOutputBufferWrite(buf, 1, "\n");
187	if (ctxt->level >= 0) ctxt->level++;
188	+ parent = cur;
189	cur = cur->children;
190	continue;
191	}
192	@@ -1058,13 +1073,9 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
193	break;
194	}
195
196	- /*
197	- * The parent should never be NULL here but we want to handle
198	- * corrupted documents gracefully.
199	- */
200	- if (cur->parent == NULL)
201	- return;
202	- cur = cur->parent;
203	+ cur = parent;
204	+ /* cur->parent was validated when descending. */
205	+ parent = cur->parent;
206
207	if (cur->type == XML_ELEMENT_NODE) {
208	if (ctxt->level > 0) ctxt->level--;
209	--
210	GitLab
211

Added Link Here

(-)b/textproc/libxml2/files/patch-git-01-b66ce0bba83febe2f4d119097a0391f5d886c3b4 (+86 lines)
1	From b66ce0bba83febe2f4d119097a0391f5d886c3b4 Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Tue, 1 Mar 2022 12:39:02 +0100
4	Subject: [PATCH] Don't include ICU headers in public headers
5
6	There's no need to make these implementation details public.
7	---
8	configure.ac \| 2 --
9	encoding.c \| 14 ++++++++++++++
10	include/libxml/encoding.h \| 21 +++------------------
11	3 files changed, 17 insertions(+), 20 deletions(-)
12
13	diff --git a/encoding.c b/encoding.c
14	index 0847934a..bfa5a304 100644
15	--- encoding.c
16	+++ encoding.c
17	@@ -48,6 +48,20 @@
18	#include "buf.h"
19	#include "enc.h"
20
21	+#ifdef LIBXML_ICU_ENABLED
22	+#include <unicode/ucnv.h>
23	+/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
24	+#define ICU_PIVOT_BUF_SIZE 1024
25	+typedef struct _uconv_t uconv_t;
26	+struct _uconv_t {
27	+ UConverter uconv; / for conversion between an encoding and UTF-16 */
28	+ UConverter utf8; / for conversion between UTF-8 and UTF-16 */
29	+ UChar pivot_buf[ICU_PIVOT_BUF_SIZE];
30	+ UChar *pivot_source;
31	+ UChar *pivot_target;
32	+};
33	+#endif
34	+
35	static xmlCharEncodingHandlerPtr xmlUTF16LEHandler = NULL;
36	static xmlCharEncodingHandlerPtr xmlUTF16BEHandler = NULL;
37
38	diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
39	index c875af6f..77f137f4 100644
40	--- include/libxml/encoding.h
41	+++ include/libxml/encoding.h
42	@@ -27,9 +27,7 @@
43	#ifdef LIBXML_ICONV_ENABLED
44	#include <iconv.h>
45	#endif
46	-#ifdef LIBXML_ICU_ENABLED
47	-#include <unicode/ucnv.h>
48	-#endif
49	+
50	#ifdef __cplusplus
51	extern "C" {
52	#endif
53	@@ -128,19 +126,6 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char out, int outlen,
54	* Block defining the handlers for non UTF-8 encodings.
55	* If iconv is supported, there are two extra fields.
56	*/
57	-#ifdef LIBXML_ICU_ENABLED
58	-/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
59	-#define ICU_PIVOT_BUF_SIZE 1024
60	-struct _uconv_t {
61	- UConverter uconv; / for conversion between an encoding and UTF-16 */
62	- UConverter utf8; / for conversion between UTF-8 and UTF-16 */
63	- UChar pivot_buf[ICU_PIVOT_BUF_SIZE];
64	- UChar *pivot_source;
65	- UChar *pivot_target;
66	-};
67	-typedef struct _uconv_t uconv_t;
68	-#endif
69	-
70	typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
71	typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
72	struct _xmlCharEncodingHandler {
73	@@ -152,8 +137,8 @@ struct _xmlCharEncodingHandler {
74	iconv_t iconv_out;
75	#endif /* LIBXML_ICONV_ENABLED */
76	#ifdef LIBXML_ICU_ENABLED
77	- uconv_t *uconv_in;
78	- uconv_t *uconv_out;
79	+ struct _uconv_t *uconv_in;
80	+ struct _uconv_t *uconv_out;
81	#endif /* LIBXML_ICU_ENABLED */
82	};
83
84	--
85	GitLab
86

Removed Link Here

(-)a/textproc/libxml2/files/patch-git-02-13ad8736d294536da4cbcd70a96b0a2fbf47070c (-46 lines)
1	From 13ad8736d294536da4cbcd70a96b0a2fbf47070c Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Tue, 25 May 2021 10:55:25 +0200
4	Subject: [PATCH] Fix regression in xmlNodeDumpOutputInternal
5
6	Commit 85b1792e could cause additional whitespace if xmlNodeDump was
7	called with a non-zero starting level.
8	---
9	xmlsave.c \| 14 +++++++-------
10	1 file changed, 7 insertions(+), 7 deletions(-)
11
12	diff --git a/xmlsave.c b/xmlsave.c
13	index aedbd5e7..489505f4 100644
14	--- xmlsave.c
15	+++ xmlsave.c
16	@@ -890,6 +890,13 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
17	break;
18
19	case XML_ELEMENT_NODE:
20	+ if ((cur != root) && (ctxt->format == 1) &&
21	+ (xmlIndentTreeOutput))
22	+ xmlOutputBufferWrite(buf, ctxt->indent_size *
23	+ (ctxt->level > ctxt->indent_nr ?
24	+ ctxt->indent_nr : ctxt->level),
25	+ ctxt->indent);
26	+
27	/*
28	* Some users like lxml are known to pass nodes with a corrupted
29	* tree structure. Fall back to a recursive call to handle this
30	@@ -900,13 +907,6 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
31	break;
32	}
33
34	- if ((ctxt->level > 0) && (ctxt->format == 1) &&
35	- (xmlIndentTreeOutput))
36	- xmlOutputBufferWrite(buf, ctxt->indent_size *
37	- (ctxt->level > ctxt->indent_nr ?
38	- ctxt->indent_nr : ctxt->level),
39	- ctxt->indent);
40	-
41	xmlOutputBufferWrite(buf, 1, "<");
42	if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
43	xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
44	--
45	GitLab
46

Removed Link Here

(-)a/textproc/libxml2/files/patch-git-03-3e1aad4fe584747fd7d17cc7b2863a78e2d21a77 (-31 lines)
1	From 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77 Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Wed, 2 Jun 2021 17:31:49 +0200
4	Subject: [PATCH] Fix XPath recursion limit
5
6	Fix accounting of recursion depth when parsing XPath expressions.
7
8	This silly bug introduced in commit 804c5297 could lead to spurious
9	errors when parsing larger expressions or XSLT documents.
10
11	Should fix #264.
12	---
13	xpath.c \| 2 +-
14	1 file changed, 1 insertion(+), 1 deletion(-)
15
16	diff --git a/xpath.c b/xpath.c
17	index 7497ba07..1aa2f1ab 100644
18	--- xpath.c
19	+++ xpath.c
20	@@ -10983,7 +10983,7 @@ xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt, int sort) {
21	}
22
23	if (xpctxt != NULL)
24	- xpctxt->depth -= 1;
25	+ xpctxt->depth -= 10;
26	}
27
28	/**
29	--
30	GitLab
31

Removed Link Here

(-)a/textproc/libxml2/files/patch-git-04-92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f (-43 lines)
1	From 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Mon, 7 Jun 2021 15:09:53 +0200
4	Subject: [PATCH] Fix whitespace when serializing empty HTML documents
5
6	The old, non-recursive HTML serialization code would always terminate
7	the output with a newline. The new implementation omitted the newline
8	if the document node had no children. Readd the newline when
9	serializing empty documents.
10
11	Fixes #266.
12	---
13	HTMLtree.c \| 14 +++++++++-----
14	1 file changed, 9 insertions(+), 5 deletions(-)
15
16	diff --git a/HTMLtree.c b/HTMLtree.c
17	index bdd639c7..7a2b8558 100644
18	--- HTMLtree.c
19	+++ HTMLtree.c
20	@@ -763,11 +763,15 @@ htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
21	if (((xmlDocPtr) cur)->intSubset != NULL) {
22	htmlDtdDumpOutput(buf, (xmlDocPtr) cur, NULL);
23	}
24	- /* Always validate cur->parent when descending. */
25	- if ((cur->parent == parent) && (cur->children != NULL)) {
26	- parent = cur;
27	- cur = cur->children;
28	- continue;
29	+ if (cur->children != NULL) {
30	+ /* Always validate cur->parent when descending. */
31	+ if (cur->parent == parent) {
32	+ parent = cur;
33	+ cur = cur->children;
34	+ continue;
35	+ }
36	+ } else {
37	+ xmlOutputBufferWriteString(buf, "\n");
38	}
39	break;
40
41	--
42	GitLab
43

Removed Link Here

(-)a/textproc/libxml2/files/patch-python_Makefile.in (-20 lines)
1	--- python/Makefile.in.orig 2019-11-16 14:42:34 UTC
2	+++ python/Makefile.in
3	@@ -493,7 +493,7 @@ top_srcdir = @top_srcdir@
4
5	# Makefile for libxml2 python library
6	AUTOMAKE_OPTIONS = 1.4 foreign
7	-SUBDIRS = . tests
8	+SUBDIRS = .
9	docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
10	dist_docs_DATA = TODO
11	EXTRA_DIST = \
12	@@ -513,7 +513,7 @@ EXTRA_DIST = \
13	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
14	@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
15	@WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
16	-@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
17	+@WITH_PYTHON_TRUE@ -lxml2 $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
18
19	@WITH_PYTHON_TRUE@BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
20	@WITH_PYTHON_TRUE@dist_python_DATA = \

Removed Link Here

(-)a/textproc/libxml2/files/patch-xml2Conf.sh.in (-15 lines)
1	--- xml2Conf.sh.in.orig 2019-10-22 18:28:43 UTC
2	+++ xml2Conf.sh.in
3	@@ -1,6 +1,12 @@
4	#
5	# Configuration file for using the XML library in GNOME applications
6	#
7	+
8	+prefix=@prefix@
9	+exec_prefix=@exec_prefix@
10	+includedir=@includedir@
11	+libdir=@libdir@
12	+
13	XML2_LIBDIR="@XML_LIBDIR@"
14	XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@"
15	XML2_INCLUDEDIR="@XML_INCLUDEDIR@"

Lines 48-62 include/libxml2/libxml/xmlwriter.h Link Here

(-)b/textproc/libxml2/pkg-plist (-4 / +291 lines)
48	include/libxml2/libxml/xpath.h	48	include/libxml2/libxml/xpath.h
49	include/libxml2/libxml/xpathInternals.h	49	include/libxml2/libxml/xpathInternals.h
50	include/libxml2/libxml/xpointer.h	50	include/libxml2/libxml/xpointer.h
51	lib/cmake/libxml2/libxml2-config.cmake	51	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config-version.cmake
52	lib/libxml2.a	52	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config.cmake
		53	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export-%%CMAKE_BUILD_TYPE%%.cmake
		54	lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export.cmake
53	lib/libxml2.so	55	lib/libxml2.so
54	lib/libxml2.so.2	56	lib/libxml2.so.2
55	lib/libxml2.so.%%LIBVERSION%%	57	lib/libxml2.so.%%LIBVERSION%%
56	lib/xml2Conf.sh	58	lib/xml2Conf.sh
57	libdata/pkgconfig/libxml-2.0.pc	59	libdata/pkgconfig/libxml-2.0.pc
58	share/aclocal/libxml.m4
59	man/man1/xml2-config.1.gz
60	man/man1/xmlcatalog.1.gz	60	man/man1/xmlcatalog.1.gz
61	man/man1/xmllint.1.gz	61	man/man1/xmllint.1.gz
62	man/man3/libxml.3.gz	62	man/man3/libxml.3.gz
		63	%%PORTDOCS%%%%DOCSDIR%%/APIchunk0.html
		64	%%PORTDOCS%%%%DOCSDIR%%/APIchunk1.html
		65	%%PORTDOCS%%%%DOCSDIR%%/APIchunk10.html
		66	%%PORTDOCS%%%%DOCSDIR%%/APIchunk11.html
		67	%%PORTDOCS%%%%DOCSDIR%%/APIchunk12.html
		68	%%PORTDOCS%%%%DOCSDIR%%/APIchunk13.html
		69	%%PORTDOCS%%%%DOCSDIR%%/APIchunk14.html
		70	%%PORTDOCS%%%%DOCSDIR%%/APIchunk15.html
		71	%%PORTDOCS%%%%DOCSDIR%%/APIchunk16.html
		72	%%PORTDOCS%%%%DOCSDIR%%/APIchunk17.html
		73	%%PORTDOCS%%%%DOCSDIR%%/APIchunk18.html
		74	%%PORTDOCS%%%%DOCSDIR%%/APIchunk19.html
		75	%%PORTDOCS%%%%DOCSDIR%%/APIchunk2.html
		76	%%PORTDOCS%%%%DOCSDIR%%/APIchunk20.html
		77	%%PORTDOCS%%%%DOCSDIR%%/APIchunk21.html
		78	%%PORTDOCS%%%%DOCSDIR%%/APIchunk22.html
		79	%%PORTDOCS%%%%DOCSDIR%%/APIchunk23.html
		80	%%PORTDOCS%%%%DOCSDIR%%/APIchunk24.html
		81	%%PORTDOCS%%%%DOCSDIR%%/APIchunk25.html
		82	%%PORTDOCS%%%%DOCSDIR%%/APIchunk26.html
		83	%%PORTDOCS%%%%DOCSDIR%%/APIchunk27.html
		84	%%PORTDOCS%%%%DOCSDIR%%/APIchunk28.html
		85	%%PORTDOCS%%%%DOCSDIR%%/APIchunk29.html
		86	%%PORTDOCS%%%%DOCSDIR%%/APIchunk3.html
		87	%%PORTDOCS%%%%DOCSDIR%%/APIchunk4.html
		88	%%PORTDOCS%%%%DOCSDIR%%/APIchunk5.html
		89	%%PORTDOCS%%%%DOCSDIR%%/APIchunk6.html
		90	%%PORTDOCS%%%%DOCSDIR%%/APIchunk7.html
		91	%%PORTDOCS%%%%DOCSDIR%%/APIchunk8.html
		92	%%PORTDOCS%%%%DOCSDIR%%/APIchunk9.html
		93	%%PORTDOCS%%%%DOCSDIR%%/APIconstructors.html
		94	%%PORTDOCS%%%%DOCSDIR%%/APIfiles.html
		95	%%PORTDOCS%%%%DOCSDIR%%/APIfunctions.html
		96	%%PORTDOCS%%%%DOCSDIR%%/APIsymbols.html
		97	%%PORTDOCS%%%%DOCSDIR%%/DOM.gif
		98	%%PORTDOCS%%%%DOCSDIR%%/DOM.html
		99	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
		100	%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-180x168.gif
		101	%%PORTDOCS%%%%DOCSDIR%%/Libxml2-Logo-90x34.gif
		102	%%PORTDOCS%%%%DOCSDIR%%/XMLinfo.html
		103	%%PORTDOCS%%%%DOCSDIR%%/XSLT.html
		104	%%PORTDOCS%%%%DOCSDIR%%/api.xsl
		105	%%PORTDOCS%%%%DOCSDIR%%/apibuild.py
		106	%%PORTDOCS%%%%DOCSDIR%%/architecture.html
		107	%%PORTDOCS%%%%DOCSDIR%%/bugs.html
		108	%%PORTDOCS%%%%DOCSDIR%%/catalog.gif
		109	%%PORTDOCS%%%%DOCSDIR%%/catalog.html
		110	%%PORTDOCS%%%%DOCSDIR%%/checkapisym.xsl
		111	%%PORTDOCS%%%%DOCSDIR%%/contribs.html
		112	%%PORTDOCS%%%%DOCSDIR%%/devhelp/devhelp2.xsl
		113	%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
		114	%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
		115	%%PORTDOCS%%%%DOCSDIR%%/devhelp/html.xsl
		116	%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
		117	%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png
		118	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-DOCBparser.html
		119	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-HTMLparser.html
		120	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-HTMLtree.html
		121	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-SAX.html
		122	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-SAX2.html
		123	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-c14n.html
		124	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-catalog.html
		125	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-chvalid.html
		126	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-debugXML.html
127	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-dict.html
128	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-encoding.html
129	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-entities.html
130	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-globals.html
131	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-hash.html
132	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-list.html
133	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-nanoftp.html
134	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-nanohttp.html
135	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-parser.html
136	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-parserInternals.html
137	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-pattern.html
138	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-relaxng.html
139	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-schemasInternals.html
140	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-schematron.html
141	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-threads.html
142	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-tree.html
143	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-uri.html
144	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-valid.html
145	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xinclude.html
146	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xlink.html
147	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlIO.html
148	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlautomata.html
149	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlerror.html
150	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlexports.html
151	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlmemory.html
152	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlmodule.html
153	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlreader.html
154	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlregexp.html
155	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlsave.html
156	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlschemas.html
157	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlschemastypes.html
158	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlstring.html
159	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlunicode.html
160	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlversion.html
161	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlwriter.html
162	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpath.html
163	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpathInternals.html
164	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpointer.html
165	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2.devhelp2
166	%%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
167	%%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
168	%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
169	%%PORTDOCS%%%%DOCSDIR%%/docs.html
170	%%PORTDOCS%%%%DOCSDIR%%/downloads.html
171	%%PORTDOCS%%%%DOCSDIR%%/elfgcchack.xsl
172	%%PORTDOCS%%%%DOCSDIR%%/encoding.html
173	%%PORTDOCS%%%%DOCSDIR%%/entities.html
174	%%PORTDOCS%%%%DOCSDIR%%/example.html
175	%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xml
176	%%PORTDOCS%%%%DOCSDIR%%/examples/examples.xsl
177	%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
178	%%PORTDOCS%%%%DOCSDIR%%/examples/index.py
179	%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
180	%%PORTDOCS%%%%DOCSDIR%%/examples/io1.res
181	%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
182	%%PORTDOCS%%%%DOCSDIR%%/examples/io2.res
183	%%PORTDOCS%%%%DOCSDIR%%/examples/parse1.c
184	%%PORTDOCS%%%%DOCSDIR%%/examples/parse2.c
185	%%PORTDOCS%%%%DOCSDIR%%/examples/parse3.c
186	%%PORTDOCS%%%%DOCSDIR%%/examples/parse4.c
187	%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.c
188	%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.res
189	%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c
190	%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c
191	%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.res
192	%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c
193	%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.res
194	%%PORTDOCS%%%%DOCSDIR%%/examples/test1.xml
195	%%PORTDOCS%%%%DOCSDIR%%/examples/test2.xml
196	%%PORTDOCS%%%%DOCSDIR%%/examples/test3.xml
197	%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c
198	%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c
199	%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.res
200	%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c
201	%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.res
202	%%PORTDOCS%%%%DOCSDIR%%/examples/tst.xml
203	%%PORTDOCS%%%%DOCSDIR%%/examples/writer.xml
204	%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c
205	%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.res
206	%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c
207	%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.res
208	%%PORTDOCS%%%%DOCSDIR%%/guidelines.html
209	%%PORTDOCS%%%%DOCSDIR%%/help.html
210	%%PORTDOCS%%%%DOCSDIR%%/html/book1.html
211	%%PORTDOCS%%%%DOCSDIR%%/html/home.png
212	%%PORTDOCS%%%%DOCSDIR%%/html/index.html
213	%%PORTDOCS%%%%DOCSDIR%%/html/left.png
214	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-DOCBparser.html
215	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-HTMLparser.html
216	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-HTMLtree.html
217	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-SAX.html
218	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-SAX2.html
219	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-c14n.html
220	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-catalog.html
221	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-chvalid.html
222	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-debugXML.html
223	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-dict.html
224	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-encoding.html
225	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-entities.html
226	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-globals.html
227	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-hash.html
228	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-lib.html
229	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-list.html
230	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-nanoftp.html
231	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-nanohttp.html
232	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-parser.html
233	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-parserInternals.html
234	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-pattern.html
235	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-relaxng.html
236	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-schemasInternals.html
237	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-schematron.html
238	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-threads.html
239	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-tree.html
240	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-uri.html
241	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-valid.html
242	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xinclude.html
243	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xlink.html
244	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlIO.html
245	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlautomata.html
246	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlerror.html
247	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlexports.html
248	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlmemory.html
249	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlmodule.html
250	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlreader.html
251	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlregexp.html
252	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlsave.html
253	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlschemas.html
254	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlschemastypes.html
255	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlstring.html
256	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlunicode.html
257	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlversion.html
258	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xmlwriter.html
259	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xpath.html
260	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xpathInternals.html
261	%%PORTDOCS%%%%DOCSDIR%%/html/libxml-xpointer.html
262	%%PORTDOCS%%%%DOCSDIR%%/html/right.png
263	%%PORTDOCS%%%%DOCSDIR%%/html/up.png
264	%%PORTDOCS%%%%DOCSDIR%%/index.html
265	%%PORTDOCS%%%%DOCSDIR%%/index.py
266	%%PORTDOCS%%%%DOCSDIR%%/interface.html
267	%%PORTDOCS%%%%DOCSDIR%%/intro.html
268	%%PORTDOCS%%%%DOCSDIR%%/library.html
269	%%PORTDOCS%%%%DOCSDIR%%/libxml.gif
270	%%PORTDOCS%%%%DOCSDIR%%/libxml2-api.xml
271	%%PORTDOCS%%%%DOCSDIR%%/libxml2.xsa
272	%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
273	%%PORTDOCS%%%%DOCSDIR%%/newapi.xsl
274	%%PORTDOCS%%%%DOCSDIR%%/news.html
275	%%PORTDOCS%%%%DOCSDIR%%/news.xsl
276	%%PORTDOCS%%%%DOCSDIR%%/python.html
277	%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
278	%%PORTDOCS%%%%DOCSDIR%%/search.php
279	%%PORTDOCS%%%%DOCSDIR%%/searches.html
280	%%PORTDOCS%%%%DOCSDIR%%/searches.xsl
281	%%PORTDOCS%%%%DOCSDIR%%/site.xsl
282	%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
283	%%PORTDOCS%%%%DOCSDIR%%/structure.gif
284	%%PORTDOCS%%%%DOCSDIR%%/symbols.xml
285	%%PORTDOCS%%%%DOCSDIR%%/syms.xsl
286	%%PORTDOCS%%%%DOCSDIR%%/threads.html
287	%%PORTDOCS%%%%DOCSDIR%%/tree.html
288	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html
289	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html
290	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html
291	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apd.html
292	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ape.html
293	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apf.html
294	%%PORTDOCS%%%%DOCSDIR%%/tutorial/apg.html
295	%%PORTDOCS%%%%DOCSDIR%%/tutorial/aph.html
296	%%PORTDOCS%%%%DOCSDIR%%/tutorial/api.html
297	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s02.html
298	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s03.html
299	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s04.html
300	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s05.html
301	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s06.html
302	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s07.html
303	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s08.html
304	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s09.html
305	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/blank.png
306	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/1.png
307	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/10.png
308	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/2.png
309	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/3.png
310	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/4.png
311	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/5.png
312	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/6.png
313	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/7.png
314	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/8.png
315	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/9.png
316	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/caution.png
317	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/draft.png
318	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/home.png
319	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/important.png
320	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/next.png
321	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/note.png
322	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/prev.png
323	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/tip.png
324	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-blank.png
325	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-minus.png
326	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-plus.png
327	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/up.png
328	%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/warning.png
329	%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddattribute.c
330	%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddkeyword.c
331	%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeconvert.c
332	%%PORTDOCS%%%%DOCSDIR%%/tutorial/includegetattribute.c
333	%%PORTDOCS%%%%DOCSDIR%%/tutorial/includekeyword.c
334	%%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c
335	%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
336	%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
337	%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
338	%%PORTDOCS%%%%DOCSDIR%%/w3c.png
339	%%PORTDOCS%%%%DOCSDIR%%/wiki.xsl
340	%%PORTDOCS%%%%DOCSDIR%%/xml.html
341	%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.html
342	%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.xml
343	%%PORTDOCS%%%%DOCSDIR%%/xmldtd.html
344	%%PORTDOCS%%%%DOCSDIR%%/xmlio.html
345	%%PORTDOCS%%%%DOCSDIR%%/xmllint.html
346	%%PORTDOCS%%%%DOCSDIR%%/xmllint.xml
347	%%PORTDOCS%%%%DOCSDIR%%/xmlmem.html
348	%%PORTDOCS%%%%DOCSDIR%%/xmlreader.html
349	%%PORTDOCS%%%%DOCSDIR%%/xsa.xsl

Lines 1-11 Link Here

(-)b/textproc/libxslt/Makefile (-21 / +19 lines)
1	# Created by: Ade Lovett <ade@FreeBSD.org>	1	# Created by: Ade Lovett <ade@FreeBSD.org>
2		2
3	PORTNAME= libxslt	3	PORTNAME= libxslt
4	DISTVERSION= 1.1.34	4	DISTVERSION= 1.1.35
5	PORTREVISION= 2
6	CATEGORIES= textproc gnome	5	CATEGORIES= textproc gnome
7	MASTER_SITES= http://xmlsoft.org/sources/ \	6	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
8	https://mirror.umd.edu/xbmc/build-deps/sources/
9	DIST_SUBDIR= gnome2	7	DIST_SUBDIR= gnome2
10		8
11	MAINTAINER= desktop@FreeBSD.org	9	MAINTAINER= desktop@FreeBSD.org
Lines 14-44 COMMENT= XML stylesheet transformation library Link Here
14	LICENSE= MIT	12	LICENSE= MIT
15	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
16		14
17	USES= cpe gmake gnome localbase libtool pathfix pkgconfig	15	LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
		16	libgpg-error.so:security/libgpg-error
		17
		18	USES= cmake cpe gnome localbase:ldflags pathfix pkgconfig tar:xz
18	CPE_VENDOR= xmlsoft	19	CPE_VENDOR= xmlsoft
19	GNU_CONFIGURE= yes
20	USE_GNOME= libxml2	20	USE_GNOME= libxml2
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22		22
23	CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \	23	CMAKE_OFF= LIBXSLT_WITH_PROFILER \
24	--without-python	24	LIBXSLT_WITH_PYTHON
25		25	CMAKE_ON= LIBXSLT_WITH_CRYPTO
26	INSTALL_TARGET= install-strip
27	TEST_TARGET= check
28		26
29	OPTIONS_DEFINE= CRYPTO MEM_DEBUG	27	OPTIONS_DEFINE= DOCS DEBUG MEM_DEBUG TEST
30	OPTIONS_DEFAULT=CRYPTO	28	OPTIONS_SUB= yes
31		29
32	CRYPTO_DESC= Enable crypto support
33	MEM_DEBUG_DESC= Enable memory debugging	30	MEM_DEBUG_DESC= Enable memory debugging
34		31
35	CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \	32	DEBUG_CMAKE_BOOL= LIBXSLT_WITH_XSLT_DEBUG
36	libgpg-error.so:security/libgpg-error	33	DOCS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-docs
37	CRYPTO_CONFIGURE_WITH= crypto	34	MEM_DEBUG_CMAKE_BOOL= LIBXSLT_WITH_MEM_DEBUG
38	MEM_DEBUG_CONFIGURE_ON= --with-mem-debug	35	TEST_CMAKE_BOOL= LIBXSLT_WITH_TESTS
		36	TEST_TEST_TARGET= test
39		37
40	post-patch:	38	post-install:
41	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \	39	${RLN} ${STAGEDIR}${PREFIX}/lib/libexslt.so.0.8.20 ${STAGEDIR}${PREFIX}/lib/libexslt.so.0
42	${WRKSRC}/doc/Makefile.in	40	${RLN} ${STAGEDIR}${PREFIX}/lib/libxslt.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxslt.so.1
43		41
44	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Removed Link Here

(-)a/textproc/libxslt/files/patch-git-01-9ae2f94df1721e002941b40665efb762aefcea1a (-37 lines)
1	From 9ae2f94df1721e002941b40665efb762aefcea1a Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Mon, 17 Aug 2020 03:42:11 +0200
4	Subject: [PATCH] Stop using maxParserDepth XPath limit
5
6	This will be removed again from libxml2.
7	---
8	tests/fuzz/fuzz.c \| 6 ++----
9	1 file changed, 2 insertions(+), 4 deletions(-)
10
11	diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c
12	index f502ca2c..75234ad6 100644
13	--- tests/fuzz/fuzz.c
14	+++ tests/fuzz/fuzz.c
15	@@ -183,8 +183,7 @@ xsltFuzzXPathInit(int argc_p ATTRIBUTE_UNUSED, char **argv_p,
16	xpctxt = tctxt->xpathCtxt;
17
18	/* Resource limits to avoid timeouts and call stack overflows */
19	- xpctxt->maxParserDepth = 15;
20	- xpctxt->maxDepth = 100;
21	+ xpctxt->maxDepth = 500;
22	xpctxt->opLimit = 500000;
23
24	/* Test namespaces used in xpath.xml */
25	@@ -317,8 +316,7 @@ xsltFuzzXsltInit(int argc_p ATTRIBUTE_UNUSED, char **argv_p,
26
27	static void
28	xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) {
29	- ctxt->maxParserDepth = 15;
30	- ctxt->maxDepth = 100;
31	+ ctxt->maxDepth = 200;
32	ctxt->opLimit = 100000;
33	}
34
35	--
36	GitLab
37

Removed Link Here

(-)a/textproc/libxslt/files/patch-git-02-824657768aea2cce9c23e72ba8085cb5e44350c7 (-42 lines)
1	From 824657768aea2cce9c23e72ba8085cb5e44350c7 Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Mon, 17 Aug 2020 04:27:13 +0200
4	Subject: [PATCH] Transfer XPath limits to XPtr context
5
6	Expressions like document('doc.xml#xpointer(evil_expr)') ignored the
7	XPath limits.
8	---
9	libxslt/functions.c \| 14 +++++++++++++-
10	1 file changed, 13 insertions(+), 1 deletion(-)
11
12	diff --git a/libxslt/functions.c b/libxslt/functions.c
13	index b350545a..975ea790 100644
14	--- libxslt/functions.c
15	+++ libxslt/functions.c
16	@@ -178,10 +178,22 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
17	goto out_fragment;
18	}
19
20	+#if LIBXML_VERSION >= 20911 \|\| \
21	+ defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
22	+ xptrctxt->opLimit = ctxt->context->opLimit;
23	+ xptrctxt->opCount = ctxt->context->opCount;
24	+ xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth;
25	+
26	+ resObj = xmlXPtrEval(fragment, xptrctxt);
27	+
28	+ ctxt->context->opCount = xptrctxt->opCount;
29	+#else
30	resObj = xmlXPtrEval(fragment, xptrctxt);
31	- xmlXPathFreeContext(xptrctxt);
32	#endif
33
34	+ xmlXPathFreeContext(xptrctxt);
35	+#endif /* LIBXML_XPTR_ENABLED */
36	+
37	if (resObj == NULL)
38	goto out_fragment;
39
40	--
41	GitLab
42

Removed Link Here

(-)a/textproc/libxslt/files/patch-git-03-77c26bad0433541f486b1e7ced44ca9979376908 (-70 lines)
1	From 77c26bad0433541f486b1e7ced44ca9979376908 Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Wed, 26 Aug 2020 00:34:38 +0200
4	Subject: [PATCH] Don't set maxDepth in XPath contexts
5
6	The maximum recursion depth is hardcoded in libxml2 now.
7	---
8	libxslt/functions.c \| 2 +-
9	tests/fuzz/fuzz.c \| 11 ++---------
10	2 files changed, 3 insertions(+), 10 deletions(-)
11
12	diff --git a/libxslt/functions.c b/libxslt/functions.c
13	index 975ea790..7887dda7 100644
14	--- libxslt/functions.c
15	+++ libxslt/functions.c
16	@@ -182,7 +182,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
17	defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
18	xptrctxt->opLimit = ctxt->context->opLimit;
19	xptrctxt->opCount = ctxt->context->opCount;
20	- xptrctxt->maxDepth = ctxt->context->maxDepth - ctxt->context->depth;
21	+ xptrctxt->depth = ctxt->context->depth;
22
23	resObj = xmlXPtrEval(fragment, xptrctxt);
24
25	diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c
26	index 75234ad6..780c2d41 100644
27	--- tests/fuzz/fuzz.c
28	+++ tests/fuzz/fuzz.c
29	@@ -183,7 +183,6 @@ xsltFuzzXPathInit(int argc_p ATTRIBUTE_UNUSED, char **argv_p,
30	xpctxt = tctxt->xpathCtxt;
31
32	/* Resource limits to avoid timeouts and call stack overflows */
33	- xpctxt->maxDepth = 500;
34	xpctxt->opLimit = 500000;
35
36	/* Test namespaces used in xpath.xml */
37	@@ -314,12 +313,6 @@ xsltFuzzXsltInit(int argc_p ATTRIBUTE_UNUSED, char **argv_p,
38	return 0;
39	}
40
41	-static void
42	-xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) {
43	- ctxt->maxDepth = 200;
44	- ctxt->opLimit = 100000;
45	-}
46	-
47	xmlChar *
48	xsltFuzzXslt(const char *data, size_t size) {
49	xmlDocPtr xsltDoc;
50	@@ -349,7 +342,7 @@ xsltFuzzXslt(const char *data, size_t size) {
51	xmlFreeDoc(xsltDoc);
52	return NULL;
53	}
54	- xsltSetXPathResourceLimits(sheet->xpathCtxt);
55	+ sheet->xpathCtxt->opLimit = 100000;
56	sheet->xpathCtxt->opCount = 0;
57	if (xsltParseStylesheetUser(sheet, xsltDoc) != 0) {
58	xsltFreeStylesheet(sheet);
59	@@ -361,7 +354,7 @@ xsltFuzzXslt(const char *data, size_t size) {
60	xsltSetCtxtSecurityPrefs(sec, ctxt);
61	ctxt->maxTemplateDepth = 100;
62	ctxt->opLimit = 20000;
63	- xsltSetXPathResourceLimits(ctxt->xpathCtxt);
64	+ ctxt->xpathCtxt->opLimit = 100000;
65	ctxt->xpathCtxt->opCount = sheet->xpathCtxt->opCount;
66
67	result = xsltApplyStylesheetUser(sheet, doc, NULL, NULL, NULL, ctxt);
68	--
69	GitLab
70

Removed Link Here

(-)a/textproc/libxslt/files/patch-man-xsltproc (-921 lines)
1	--- doc/xsltproc.1.orig 2020-01-14 06:28:43 UTC
2	+++ doc/xsltproc.1
3	@@ -1,736 +1,358 @@
4	-'\" t
5	.\" Title: xsltproc
6	.\" Author: John Fleck <jfleck@inkstain.net>
7	-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
8	-.\" Date: $Date$
9	+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
10	+.\" Date: $Date: 2008-04-21 16:28:56 +0200 (Mon, 21 Apr 2008) $
11	.\" Manual: xsltproc Manual
12	.\" Source: libxslt
13	-.\" Language: English
14	.\"
15	-.TH "XSLTPROC" "1" "$Date$" "libxslt" "xsltproc Manual"
16	-.\" -----------------------------------------------------------------
17	-.\" * Define some portability stuff
18	-.\" -----------------------------------------------------------------
19	-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20	-.\" http://bugs.debian.org/507673
21	-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
22	-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
23	-.ie \n(.g .ds Aq \(aq
24	-.el .ds Aq '
25	-.\" -----------------------------------------------------------------
26	-.\" * set default formatting
27	-.\" -----------------------------------------------------------------
28	+.TH "XSLTPROC" "1" "$Date: 2008\-04\-21 16:28:56 +0200 (Mon, 21 Apr 2008) $" "libxslt" "xsltproc Manual"
29	.\" disable hyphenation
30	.nh
31	.\" disable justification (adjust text to left margin only)
32	.ad l
33	-.\" -----------------------------------------------------------------
34	-.\" * MAIN CONTENT STARTS HERE *
35	-.\" -----------------------------------------------------------------
36	-
37	-
38	-
39	-
40	-
41	.SH "NAME"
42	-xsltproc \- command line XSLT processor
43	-
44	+xsltproc - command line XSLT processor
45	.SH "SYNOPSIS"
46	-
47	- .HP \w'\fBxsltproc\fR\ 'u
48	-
49	- \fBxsltproc\fR
50	- [
51	- [
52	- \| \fB\-V\fR
53	- \| \fB\-\-version\fR
54	- ]
55	- [
56	- \| \fB\-v\fR
57	- \| \fB\-\-verbose\fR
58	- ]
59	- [
60	- {
61	- \| \fB\-o\fR
62	- \| \fB\-\-output\fR
63	- }
64	- {
65	- \| \fIFILE\fR
66	- \| \fIDIRECTORY\fR
67	- }
68	- ]
69	- \| \fB\-\-timing\fR
70	- \| \fB\-\-repeat\fR
71	- \| \fB\-\-debug\fR
72	- \| \fB\-\-novalid\fR
73	- \| \fB\-\-noout\fR
74	- \| \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR
75	- \| \fB\-\-html\fR
76	- \| \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR
77	- \| \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR
78	- \| \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR
79	- \| \fB\-\-nonet\fR
80	- \| \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
81	- \| \fB\-\-load\-trace\fR
82	- \| \fB\-\-catalogs\fR
83	- \| \fB\-\-xinclude\fR
84	- \| [\ \|\ \fB\-\-profile\fR\ \|\ \fB\-\-norman\fR\ ]
85	- \| \fB\-\-dumpextensions\fR
86	- \| \fB\-\-nowrite\fR
87	- \| \fB\-\-nomkdir\fR
88	- \| \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR
89	- \| \fB\-\-nodtdattr\fR
90	- ]
91	- [\fISTYLESHEET\fR]
92	- {
93	- \| \fIXML\-FILE\fR...
94	- \| \-
95	- }
96	-
97	-
98	-
99	+.HP 9
100	+\fBxsltproc\fR [[\fB\-V\fR \| \fB\-\-version\fR] [\fB\-v\fR \| \fB\-\-verbose\fR] [{\fB\-o\fR \| \fB\-\-output\fR} {\fIFILE\fR \| \fIDIRECTORY\fR}] \| \fB\-\-timing\fR \| \fB\-\-repeat\fR \| \fB\-\-debug\fR \| \fB\-\-novalid\fR \| \fB\-\-noout\fR \| \fB\-\-maxdepth\ \fR\fB\fIVALUE\fR\fR \| \fB\-\-html\fR \| \fB\-\-encoding\ \fR\fB\fIENCODING\fR\fR\fB\ \fR \| \fB\-\-param\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR \| \fB\-\-stringparam\ \fR\fB\fIPARAMNAME\fR\fR\fB\ \fR\fB\fIPARAMVALUE\fR\fR\fB\ \fR \| \fB\-\-nonet\fR \| \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR \| \fB\-\-load\-trace\fR \| \fB\-\-catalogs\fR \| \fB\-\-xinclude\fR \| [\fB\-\-profile\fR\ \|\ \fB\-\-norman\fR] \| \fB\-\-dumpextensions\fR \| \fB\-\-nowrite\fR \| \fB\-\-nomkdir\fR \| \fB\-\-writesubtree\ \fR\fB\fIPATH\fR\fR \| \fB\-\-nodtdattr\fR] [\fISTYLESHEET\fR] {\fIXML\-FILE\fR \| \-}
101	.SH "DESCRIPTION"
102	+.PP
103
104	-
105	- .PP
106	\fBxsltproc\fR
107	is a command line tool for applying
108	XSLT
109	stylesheets to
110	XML
111	-documents\&. It is part of
112	-\fBlibxslt\fR(3), the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&.
113	+documents\. It is part of
114	+\fBlibxslt\fR(3), the XSLT C library for GNOME\. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\.
115	+.PP
116
117	- .PP
118	\fBxsltproc\fR
119	-is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is
120	-\fB\-\fR
121	-\&.
122	-
123	- .PP
124	+is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\. It will use the standard input if a filename provided is
125	+\fB\-\fR\.
126	+.PP
127	If a stylesheet is included in an
128	XML
129	-document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\&.
130	-\fBxsltproc\fR
131	-will automatically detect the included stylesheet and use it\&.
132	-
133	- .PP
134	+document with a Stylesheet Processing Instruction, no stylesheet need to be named at the command line\. \fBxsltproc\fR will automatically detect the included stylesheet and use it\.
135	+.PP
136	By default, output is to
137	-stdout\&. You can specify a file for output using the
138	+\fIstdout\fR\. You can specify a file for output using the
139	\fB\-o\fR
140	or
141	\fB\-\-output\fR
142	-option\&.
143	-
144	-
145	+option\.
146	.SH "OPTIONS"
147	+.PP
148
149	-
150	- .PP
151	\fBxsltproc\fR
152	accepts the following options (in alphabetical order):
153	-
154	-
155	-
156	-
157	- .PP
158	+.PP
159	\fB\-\-catalogs\fR
160	.RS 4
161	-
162	-
163	-
164	- Use the
165	+Use the
166	SGML
167	catalog specified in
168	\fBSGML_CATALOG_FILES\fR
169	-to resolve the location of external entities\&. By default,
170	+to resolve the location of external entities\. By default,
171	\fBxsltproc\fR
172	looks for the catalog specified in
173	-\fBXML_CATALOG_FILES\fR\&. If that is not specified, it uses
174	-/etc/xml/catalog\&.
175	-
176	-
177	- .RE
178	-
179	- .PP
180	+\fBXML_CATALOG_FILES\fR\. If that is not specified, it uses
181	+\fI/etc/xml/catalog\fR\.
182	+.RE
183	+.PP
184	\fB\-\-debug\fR
185	.RS 4
186	-
187	-
188	-
189	- Output an
190	+Output an
191	XML
192	-tree of the transformed document for debugging purposes\&.
193	-
194	-
195	- .RE
196	-
197	- .PP
198	+tree of the transformed document for debugging purposes\.
199	+.RE
200	+.PP
201	\fB\-\-dumpextensions\fR
202	.RS 4
203	-
204	-
205	-
206	- Dumps the list of all registered extensions on
207	-stdout\&.
208	-
209	-
210	- .RE
211	-
212	- .PP
213	+Dumps the list of all registered extensions on
214	+\fIstdout\fR\.
215	+.RE
216	+.PP
217	\fB\-\-html\fR
218	.RS 4
219	-
220	-
221	-
222	- The input document is an
223	+The input document is an
224	HTML
225	-file\&.
226	-
227	-
228	- .RE
229	-
230	- .PP
231	+file\.
232	+.RE
233	+.PP
234	\fB\-\-load\-trace\fR
235	.RS 4
236	-
237	-
238	-
239	- Display all the documents loaded during the processing to
240	-stderr\&.
241	-
242	-
243	- .RE
244	-
245	- .PP
246	+Display all the documents loaded during the processing to
247	+\fIstderr\fR\.
248	+.RE
249	+.PP
250	\fB\-\-maxdepth \fR\fB\fIVALUE\fR\fR
251	.RS 4
252	-
253	-
254	-
255	- Adjust the maximum depth of the template stack before
256	+Adjust the maximum depth of the template stack before
257	\fBlibxslt\fR(3)
258	-concludes it is in an infinite loop\&. The default is 3000\&.
259	-
260	-
261	- .RE
262	-
263	- .PP
264	+concludes it is in an infinite loop\. The default is 3000\.
265	+.RE
266	+.PP
267	\fB\-\-nodtdattr\fR
268	.RS 4
269	-
270	-
271	-
272	- Do not apply default attributes from the document\*(Aqs
273	-DTD\&.
274	-
275	-
276	- .RE
277	-
278	- .PP
279	+Do not apply default attributes from the document\'s
280	+DTD\.
281	+.RE
282	+.PP
283	\fB\-\-nomkdir\fR
284	.RS 4
285	-
286	-
287	-
288	- Refuses to create directories\&.
289	-
290	-
291	- .RE
292	-
293	- .PP
294	+Refuses to create directories\.
295	+.RE
296	+.PP
297	\fB\-\-nonet\fR
298	.RS 4
299	-
300	-
301	-
302	- Do not use the Internet to fetch
303	-DTDs, entities or documents\&.
304	-
305	-
306	- .RE
307	-
308	- .PP
309	+Do not use the Internet to fetch
310	+DTDs, entities or documents\.
311	+.RE
312	+.PP
313	\fB\-\-noout\fR
314	.RS 4
315	-
316	-
317	-
318	- Do not output the result\&.
319	-
320	-
321	- .RE
322	-
323	- .PP
324	+Do not output the result\.
325	+.RE
326	+.PP
327	\fB\-\-novalid\fR
328	.RS 4
329	-
330	-
331	-
332	- Skip loading the document\*(Aqs
333	-DTD\&.
334	-
335	-
336	- .RE
337	-
338	- .PP
339	+Skip loading the document\'s
340	+DTD\.
341	+.RE
342	+.PP
343	\fB\-\-nowrite\fR
344	.RS 4
345	-
346	-
347	-
348	- Refuses to write to any file or resource\&.
349	-
350	-
351	- .RE
352	-
353	- .PP
354	+Refuses to write to any file or resource\.
355	+.RE
356	+.PP
357	\fB\-o\fR or \fB\-\-output\fR \fIFILE\fR \| \fIDIRECTORY\fR
358	.RS 4
359	-
360	-
361	-
362	- Direct output to the given
363	-\fIFILE\fR\&. Using the option with a
364	+Direct output to the given
365	+\fIFILE\fR\. Using the option with a
366	\fIDIRECTORY\fR
367	-directs the output files to the specified directory\&. This can be useful for multiple outputs (also known as "chunking") or manpage processing\&.
368	-
369	- .if n \{\
370	+directs the output files to the specified directory\. This can be useful for multiple outputs (also known as "chunking") or manpage processing\.
371	.sp
372	-.\}
373	-.RS 4
374	.it 1 an-trap
375	.nr an-no-space-flag 1
376	.nr an-break-flag 1
377	.br
378	-.ps +1
379	-\fBImportant\fR
380	-.ps -1
381	-.br
382	-
383	- The given directory
384	+Important
385	+The given directory
386	\fBmust\fR
387	-already exist\&.
388	-
389	- .sp .5v
390	-.RE
391	- .if n \{\
392	+already exist\.
393	.sp
394	-.\}
395	-.RS 4
396	.it 1 an-trap
397	.nr an-no-space-flag 1
398	.nr an-break-flag 1
399	.br
400	-.ps +1
401	-\fBNote\fR
402	-.ps -1
403	-.br
404	-
405	- Make sure that
406	+Note
407	+Make sure that
408	\fIFILE\fR
409	and
410	\fIDIRECTORY\fR
411	follow the
412	\(lqURI reference computation\(rq
413	-as described in RFC 2396 and laters\&. This means, that e\&.g\&.
414	+as described in RFC 2396 and laters\. This means, that e\.g\.
415	\fB\-o directory\fR
416	will maybe not work, but
417	\fB\-o directory/\fR
418	-will\&.
419	-
420	- .sp .5v
421	+will\.
422	.RE
423	-
424	- .RE
425	-
426	- .PP
427	+.PP
428	\fB\-\-encoding \fR\fB\fIENCODING\fR\fR
429	.RS 4
430	-
431	-
432	-
433	- Allow to specify the encoding for the input\&.
434	-
435	-
436	- .RE
437	- .PP
438	+Allow to specify the encoding for the input\.
439	+.RE
440	+.PP
441	\fB\-\-param \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
442	.RS 4
443	-
444	-
445	-
446	- Pass a parameter of name
447	+Pass a parameter of name
448	\fIPARAMNAME\fR
449	and value
450	\fIPARAMVALUE\fR
451	-to the stylesheet\&. You may pass multiple name/value pairs up to a maximum of 32\&. If the value being passed is a string, you can use
452	+to the stylesheet\. You may pass multiple name/value pairs up to a maximum of 32\. If the value being passed is a string, you can use
453	\fB\-\-stringparam\fR
454	-instead, to avoid additional quote characters that appear in string expressions\&. Note: the XPath expression must be UTF\-8 encoded\&.
455	-
456	-
457	- .RE
458	-
459	- .PP
460	+instead, to avoid additional quote characters that appear in string expressions\. Note: the XPath expression must be UTF\-8 encoded\.
461	+.RE
462	+.PP
463	\fB\-\-path "\fR\fB\fIPATH(S)\fR\fR\fB"\fR
464	.RS 4
465	-
466	-
467	-
468	- Use the (space\- or colon\-separated) list of filesystem paths specified by
469	+Use the (space\- or colon\-separated) list of filesystem paths specified by
470	\fIPATHS\fR
471	to load
472	-DTDs, entities or documents\&. Enclose space\-separated lists by quotation marks\&.
473	-
474	-
475	- .RE
476	-
477	- .PP
478	+DTDs, entities or documents\. Enclose space\-separated lists by quotation marks\.
479	+.RE
480	+.PP
481	\fB\-\-profile\fR or \fB\-\-norman\fR
482	.RS 4
483	-
484	-
485	-
486	- Output profiling information detailing the amount of time spent in each part of the stylesheet\&. This is useful in optimizing stylesheet performance\&.
487	-
488	-
489	- .RE
490	-
491	- .PP
492	+Output profiling information detailing the amount of time spent in each part of the stylesheet\. This is useful in optimizing stylesheet performance\.
493	+.RE
494	+.PP
495	\fB\-\-repeat\fR
496	.RS 4
497	-
498	-
499	-
500	- Run the transformation 20 times\&. Used for timing tests\&.
501	-
502	-
503	- .RE
504	-
505	- .PP
506	+Run the transformation 20 times\. Used for timing tests\.
507	+.RE
508	+.PP
509	\fB\-\-stringparam \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
510	.RS 4
511	-
512	-
513	-
514	- Pass a parameter of name
515	+Pass a parameter of name
516	\fIPARAMNAME\fR
517	and value
518	\fIPARAMVALUE\fR
519	where
520	\fIPARAMVALUE\fR
521	-is a string rather than a node identifier\&.
522	+is a string rather than a node identifier\.
523	\fBNote:\fR
524	-The string must be UTF\-8 encoded\&.
525	-
526	-
527	- .RE
528	-
529	- .PP
530	+The string must be UTF\-8 encoded\.
531	+.RE
532	+.PP
533	\fB\-\-timing\fR
534	.RS 4
535	-
536	-
537	-
538	- Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\&. Displayed in milliseconds\&.
539	-
540	-
541	- .RE
542	-
543	- .PP
544	+Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result\. Displayed in milliseconds\.
545	+.RE
546	+.PP
547	\fB\-v\fR or \fB\-\-verbose\fR
548	.RS 4
549	-
550	-
551	-
552	- Output each step taken by
553	+Output each step taken by
554	\fBxsltproc\fR
555	-in processing the stylesheet and the document\&.
556	-
557	-
558	- .RE
559	-
560	- .PP
561	+in processing the stylesheet and the document\.
562	+.RE
563	+.PP
564	\fB\-V\fR or \fB\-\-version\fR
565	.RS 4
566	-
567	-
568	-
569	- Show the version of
570	+Show the version of
571	\fBlibxml\fR(3)
572	and
573	\fBlibxslt\fR(3)
574	-used\&.
575	-
576	-
577	- .RE
578	-
579	- .PP
580	+used\.
581	+.RE
582	+.PP
583	\fB\-\-writesubtree \fR\fB\fIPATH\fR\fR
584	.RS 4
585	-
586	-
587	-
588	- Allow file write only within the
589	+Allow file write only within the
590	\fIPATH\fR
591	-subtree\&.
592	-
593	-
594	- .RE
595	-
596	- .PP
597	+subtree\.
598	+.RE
599	+.PP
600	\fB\-\-xinclude\fR
601	.RS 4
602	-
603	-
604	-
605	- Process the input document using the XInclude specification\&. More details on this can be found in the XInclude specification:
606	-\m[blue]\fB\%http://www.w3.org/TR/xinclude/\fR\m[]
607	-
608	-
609	- .RE
610	-
611	-
612	-
613	+Process the input document using the XInclude specification\. More details on this can be found in the XInclude specification:
614	+\fI\%http://www.w3.org/TR/xinclude/\fR
615	+.RE
616	.SH "ENVIRONMENT"
617	-
618	-
619	-
620	-
621	-
622	- .PP
623	+.PP
624	\fBSGML_CATALOG_FILES\fR
625	.RS 4
626	-
627	-
628	-
629	- SGML
630	-catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
631	+SGML
632	+catalog behavior can be changed by redirecting queries to the user\'s own set of catalogs\. This can be done by setting the
633	\fBSGML_CATALOG_FILES\fR
634	-environment variable to a list of catalogs\&. An empty one should deactivate loading the default
635	-/etc/sgml/catalog
636	-catalog\&.
637	-
638	-
639	- .RE
640	-
641	- .PP
642	+environment variable to a list of catalogs\. An empty one should deactivate loading the default
643	+\fI/etc/sgml/catalog\fR
644	+catalog\.
645	+.RE
646	+.PP
647	\fBXML_CATALOG_FILES\fR
648	.RS 4
649	-
650	-
651	-
652	- XML
653	-catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the
654	+XML
655	+catalog behavior can be changed by redirecting queries to the user\'s own set of catalogs\. This can be done by setting the
656	\fBXML_CATALOG_FILES\fR
657	-environment variable to a list of catalogs\&. An empty one should deactivate loading the default
658	-/etc/xml/catalog
659	-catalog\&.
660	-
661	-
662	- .RE
663	-
664	-
665	-
666	+environment variable to a list of catalogs\. An empty one should deactivate loading the default
667	+\fI/etc/xml/catalog\fR
668	+catalog\.
669	+.RE
670	.SH "DIAGNOSTICS"
671	+.PP
672
673	-
674	- .PP
675	\fBxsltproc\fR
676	-return codes provide information that can be used when calling it from scripts\&.
677	-
678	-
679	-
680	-
681	- .PP
682	+return codes provide information that can be used when calling it from scripts\.
683	+.PP
684	\fB0\fR
685	.RS 4
686	-
687	-
688	-
689	- No error (normal operation)
690	-
691	-
692	- .RE
693	-
694	- .PP
695	+No error (normal operation)
696	+.RE
697	+.PP
698	\fB1\fR
699	.RS 4
700	-
701	-
702	-
703	- No argument
704	-
705	-
706	- .RE
707	-
708	- .PP
709	+No argument
710	+.RE
711	+.PP
712	\fB2\fR
713	.RS 4
714	-
715	-
716	-
717	- Too many parameters
718	-
719	-
720	- .RE
721	-
722	- .PP
723	+Too many parameters
724	+.RE
725	+.PP
726	\fB3\fR
727	.RS 4
728	-
729	-
730	-
731	- Unknown option
732	-
733	-
734	- .RE
735	-
736	- .PP
737	+Unknown option
738	+.RE
739	+.PP
740	\fB4\fR
741	.RS 4
742	-
743	-
744	-
745	- Failed to parse the stylesheet
746	-
747	-
748	- .RE
749	-
750	- .PP
751	+Failed to parse the stylesheet
752	+.RE
753	+.PP
754	\fB5\fR
755	.RS 4
756	-
757	-
758	-
759	- Error in the stylesheet
760	-
761	-
762	- .RE
763	-
764	- .PP
765	+Error in the stylesheet
766	+.RE
767	+.PP
768	\fB6\fR
769	.RS 4
770	-
771	-
772	-
773	- Error in one of the documents
774	-
775	-
776	- .RE
777	-
778	- .PP
779	+Error in one of the documents
780	+.RE
781	+.PP
782	\fB7\fR
783	.RS 4
784	-
785	-
786	-
787	- Unsupported xsl:output method
788	-
789	-
790	- .RE
791	-
792	- .PP
793	+Unsupported xsl:output method
794	+.RE
795	+.PP
796	\fB8\fR
797	.RS 4
798	-
799	-
800	-
801	- String parameter contains both quote and double\-quotes
802	-
803	-
804	- .RE
805	-
806	- .PP
807	+String parameter contains both quote and double\-quotes
808	+.RE
809	+.PP
810	\fB9\fR
811	.RS 4
812	-
813	-
814	-
815	- Internal processing error
816	-
817	-
818	- .RE
819	-
820	- .PP
821	+Internal processing error
822	+.RE
823	+.PP
824	\fB10\fR
825	.RS 4
826	-
827	-
828	-
829	- Processing was stopped by a terminating message
830	-
831	-
832	- .RE
833	-
834	- .PP
835	+Processing was stopped by a terminating message
836	+.RE
837	+.PP
838	\fB11\fR
839	.RS 4
840	-
841	-
842	-
843	- Could not write the result to the output file
844	-
845	-
846	- .RE
847	-
848	-
849	-
850	+Could not write the result to the output file
851	+.RE
852	.SH "SEE ALSO"
853	-
854	-
855	- .PP
856	+.PP
857	\fBlibxml\fR(3),
858	\fBlibxslt\fR(3)
859	-
860	- .PP
861	+.PP
862	More information can be found at
863	.sp
864	.RS 4
865	-.ie n \{\
866	-\h'-04'\(bu\h'+03'\c
867	-.\}
868	-.el \{\
869	-.sp -1
870	-.IP \(bu 2.3
871	-.\}
872	-
873	- \fBlibxml\fR(3)
874	+\h'-04'\(bu\h'+03'\fBlibxml\fR(3)
875	web page
876	-\m[blue]\fB\%http://www.xmlsoft.org/\fR\m[]
877	-
878	- .RE
879	+\fI\%http://www.xmlsoft.org/\fR
880	+.RE
881	.sp
882	.RS 4
883	-.ie n \{\
884	-\h'-04'\(bu\h'+03'\c
885	-.\}
886	-.el \{\
887	-.sp -1
888	-.IP \(bu 2.3
889	-.\}
890	-
891	- W3C
892	+\h'-04'\(bu\h'+03'W3C
893	XSLT
894	page
895	-\m[blue]\fB\%http://www.w3.org/TR/xslt\fR\m[]
896	-
897	- .RE
898	+\fI\%http://www.w3.org/TR/xslt\fR
899	+.RE
900	.sp
901	-
902	-
903	-
904	+.RE
905	.SH "AUTHOR"
906	.PP
907	-\fBJohn Fleck\fR <\&jfleck@inkstain\&.net\&>
908	-.br
909	-
910	-
911	-
912	-.RS 4
913	+\fBJohn Fleck\fR <\&jfleck@inkstain\.net\&>
914	+.sp -1n
915	+.IP "" 4
916	Author.
917	-.RE
918	.SH "COPYRIGHT"
919	-.br
920	Copyright \(co 2001, 2002
921	.br

Removed Link Here

(-)a/textproc/libxslt/files/patch-python__Makefile.in (-22 lines)
1	--- python/Makefile.in.orig 2012-10-22 16:16:50.000000000 +0000
2	+++ python/Makefile.in 2012-10-22 16:17:40.000000000 +0000
3	@@ -344,7 +344,7 @@
4	-I../libexslt
5
6	AM_CFLAGS = $(LIBXML_CFLAGS)
7	-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
8	+DOCS_DIR = $(datadir)/doc/py-libxslt
9	# libxsltclass.txt is generated
10	DOCS = TODO
11	EXTRA_DIST = \
12	@@ -359,8 +359,8 @@
13
14	libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
15	@WITH_PYTHON_TRUE@mylibs = \
16	-@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \
17	-@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la
18	+@WITH_PYTHON_TRUE@ -lxslt \
19	+@WITH_PYTHON_TRUE@ -lexslt
20
21	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la
22	@WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c

Lines 24-42 include/libxslt/xsltconfig.h Link Here

(-)b/textproc/libxslt/pkg-plist (-5 / +177 lines)
24	include/libxslt/xsltexports.h	24	include/libxslt/xsltexports.h
25	include/libxslt/xsltlocale.h	25	include/libxslt/xsltlocale.h
26	include/libxslt/xsltutils.h	26	include/libxslt/xsltutils.h
27	lib/libexslt.a	27	lib/cmake/libxslt-1.1.35/FindGcrypt.cmake
		28	lib/cmake/libxslt-1.1.35/libxslt-config-version.cmake
		29	lib/cmake/libxslt-1.1.35/libxslt-config.cmake
		30	lib/cmake/libxslt-1.1.35/libxslt-export-%%CMAKE_BUILD_TYPE%%.cmake
		31	lib/cmake/libxslt-1.1.35/libxslt-export.cmake
28	lib/libexslt.so	32	lib/libexslt.so
29	lib/libexslt.so.0	33	lib/libexslt.so.0
30	lib/libexslt.so.0.8.20	34	lib/libexslt.so.0.8.20
31	lib/libxslt.a
32	lib/libxslt.so	35	lib/libxslt.so
33	lib/libxslt.so.1	36	lib/libxslt.so.1
34	lib/libxslt.so.1.1.34	37	lib/libxslt.so.1.1.35
35	lib/xsltConf.sh	38	lib/xsltConf.sh
36	libdata/pkgconfig/libexslt.pc	39	libdata/pkgconfig/libexslt.pc
37	libdata/pkgconfig/libxslt.pc	40	libdata/pkgconfig/libxslt.pc
38	share/aclocal/libxslt.m4
39	man/man1/xsltproc.1.gz	41	man/man1/xsltproc.1.gz
40	man/man3/libexslt.3.gz	42	man/man3/libexslt.3.gz
41	man/man3/libxslt.3.gz	43	man/man3/libxslt.3.gz
42	@dir lib/libxslt-plugins	44	%%PORTDOCS%%%%DOCSDIR%%/API.html
		45	%%PORTDOCS%%%%DOCSDIR%%/APIchunk0.html
		46	%%PORTDOCS%%%%DOCSDIR%%/APIchunk1.html
		47	%%PORTDOCS%%%%DOCSDIR%%/APIchunk10.html
		48	%%PORTDOCS%%%%DOCSDIR%%/APIchunk11.html
		49	%%PORTDOCS%%%%DOCSDIR%%/APIchunk12.html
		50	%%PORTDOCS%%%%DOCSDIR%%/APIchunk2.html
		51	%%PORTDOCS%%%%DOCSDIR%%/APIchunk3.html
		52	%%PORTDOCS%%%%DOCSDIR%%/APIchunk4.html
		53	%%PORTDOCS%%%%DOCSDIR%%/APIchunk5.html
		54	%%PORTDOCS%%%%DOCSDIR%%/APIchunk6.html
		55	%%PORTDOCS%%%%DOCSDIR%%/APIchunk7.html
		56	%%PORTDOCS%%%%DOCSDIR%%/APIchunk8.html
		57	%%PORTDOCS%%%%DOCSDIR%%/APIchunk9.html
		58	%%PORTDOCS%%%%DOCSDIR%%/APIconstructors.html
		59	%%PORTDOCS%%%%DOCSDIR%%/APIfiles.html
		60	%%PORTDOCS%%%%DOCSDIR%%/APIfunctions.html
		61	%%PORTDOCS%%%%DOCSDIR%%/APIsymbols.html
		62	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIchunk0.html
		63	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIconstructors.html
		64	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIfiles.html
		65	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIfunctions.html
		66	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/APIsymbols.html
		67	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/bugs.html
		68	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/devhelp2.xsl
		69	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/general.html
		70	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/home.png
		71	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/html.xsl
		72	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/index.html
		73	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/left.png
		74	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/libexslt-exslt.html
		75	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/libexslt-exsltexports.html
		76	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/libexslt.devhelp2
		77	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/right.png
		78	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/style.css
		79	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/devhelp/up.png
		80	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/docs.html
		81	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/downloads.html
		82	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/exslt.html
		83	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/help.html
		84	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/book1.html
		85	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/home.png
		86	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/index.html
		87	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/left.png
		88	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/libexslt-exslt.html
		89	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/libexslt-exsltexports.html
		90	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/libexslt-lib.html
		91	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/right.png
		92	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/html/up.png
		93	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/index.html
		94	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/intro.html
		95	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/libexslt-api.xml
		96	%%PORTDOCS%%%%DOCSDIR%%/EXSLT/libexslt-refs.xml
		97	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
		98	%%PORTDOCS%%%%DOCSDIR%%/Libxslt-Logo-180x168.gif
		99	%%PORTDOCS%%%%DOCSDIR%%/Libxslt-Logo-90x34.gif
		100	%%PORTDOCS%%%%DOCSDIR%%/api.xsl
		101	%%PORTDOCS%%%%DOCSDIR%%/apibuild.py
		102	%%PORTDOCS%%%%DOCSDIR%%/bugs.html
		103	%%PORTDOCS%%%%DOCSDIR%%/checkapisym.xsl
		104	%%PORTDOCS%%%%DOCSDIR%%/contexts.gif
		105	%%PORTDOCS%%%%DOCSDIR%%/contribs.html
		106	%%PORTDOCS%%%%DOCSDIR%%/devhelp/devhelp2.xsl
		107	%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
		108	%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
109	%%PORTDOCS%%%%DOCSDIR%%/devhelp/html.xsl
110	%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
111	%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png
112	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-attributes.html
113	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-documents.html
114	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-extensions.html
115	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-extra.html
116	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-functions.html
117	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-imports.html
118	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-keys.html
119	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-namespaces.html
120	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-numbersInternals.html
121	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-pattern.html
122	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-preproc.html
123	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-security.html
124	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-templates.html
125	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-transform.html
126	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-variables.html
127	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xslt.html
128	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltInternals.html
129	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltexports.html
130	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltlocale.html
131	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt-xsltutils.html
132	%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxslt.devhelp2
133	%%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
134	%%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
135	%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
136	%%PORTDOCS%%%%DOCSDIR%%/docbook.html
137	%%PORTDOCS%%%%DOCSDIR%%/docs.html
138	%%PORTDOCS%%%%DOCSDIR%%/downloads.html
139	%%PORTDOCS%%%%DOCSDIR%%/duck.png
140	%%PORTDOCS%%%%DOCSDIR%%/epatents.png
141	%%PORTDOCS%%%%DOCSDIR%%/extensions.html
142	%%PORTDOCS%%%%DOCSDIR%%/gnome2.png
143	%%PORTDOCS%%%%DOCSDIR%%/help.html
144	%%PORTDOCS%%%%DOCSDIR%%/html/book1.html
145	%%PORTDOCS%%%%DOCSDIR%%/html/home.png
146	%%PORTDOCS%%%%DOCSDIR%%/html/index.html
147	%%PORTDOCS%%%%DOCSDIR%%/html/left.png
148	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-attributes.html
149	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-documents.html
150	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-extensions.html
151	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-extra.html
152	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-functions.html
153	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-imports.html
154	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-keys.html
155	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-lib.html
156	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-namespaces.html
157	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-numbersInternals.html
158	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-pattern.html
159	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-preproc.html
160	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-security.html
161	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-templates.html
162	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-transform.html
163	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-variables.html
164	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xslt.html
165	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltInternals.html
166	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltexports.html
167	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltlocale.html
168	%%PORTDOCS%%%%DOCSDIR%%/html/libxslt-xsltutils.html
169	%%PORTDOCS%%%%DOCSDIR%%/html/right.png
170	%%PORTDOCS%%%%DOCSDIR%%/html/up.png
171	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/1.png
172	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/10.png
173	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/2.png
174	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/3.png
175	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/4.png
176	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/5.png
177	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/6.png
178	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/7.png
179	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/8.png
180	%%PORTDOCS%%%%DOCSDIR%%/images/callouts/9.png
181	%%PORTDOCS%%%%DOCSDIR%%/index.html
182	%%PORTDOCS%%%%DOCSDIR%%/internals.html
183	%%PORTDOCS%%%%DOCSDIR%%/intro.html
184	%%PORTDOCS%%%%DOCSDIR%%/libxslt-api.xml
185	%%PORTDOCS%%%%DOCSDIR%%/libxslt-refs.xml
186	%%PORTDOCS%%%%DOCSDIR%%/libxslt.xsa
187	%%PORTDOCS%%%%DOCSDIR%%/newapi.xsl
188	%%PORTDOCS%%%%DOCSDIR%%/news.html
189	%%PORTDOCS%%%%DOCSDIR%%/news.xsl
190	%%PORTDOCS%%%%DOCSDIR%%/node.gif
191	%%PORTDOCS%%%%DOCSDIR%%/object.gif
192	%%PORTDOCS%%%%DOCSDIR%%/processing.gif
193	%%PORTDOCS%%%%DOCSDIR%%/python.html
194	%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
195	%%PORTDOCS%%%%DOCSDIR%%/search.xml
196	%%PORTDOCS%%%%DOCSDIR%%/site.xsl
197	%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
198	%%PORTDOCS%%%%DOCSDIR%%/stylesheet.gif
199	%%PORTDOCS%%%%DOCSDIR%%/symbols.xml
200	%%PORTDOCS%%%%DOCSDIR%%/syms.xsl
201	%%PORTDOCS%%%%DOCSDIR%%/templates.gif
202	%%PORTDOCS%%%%DOCSDIR%%/tutorial/libxslt_tutorial.c
203	%%PORTDOCS%%%%DOCSDIR%%/tutorial/libxslttutorial.html
204	%%PORTDOCS%%%%DOCSDIR%%/tutorial/libxslttutorial.xml
205	%%PORTDOCS%%%%DOCSDIR%%/tutorial2/libxslt_pipes.c
206	%%PORTDOCS%%%%DOCSDIR%%/tutorial2/libxslt_pipes.html
207	%%PORTDOCS%%%%DOCSDIR%%/tutorial2/libxslt_pipes.xml
208	%%PORTDOCS%%%%DOCSDIR%%/w3c.png
209	%%PORTDOCS%%%%DOCSDIR%%/xsa.xsl
210	%%PORTDOCS%%%%DOCSDIR%%/xslt.html
211	%%PORTDOCS%%%%DOCSDIR%%/xsltproc.1
212	%%PORTDOCS%%%%DOCSDIR%%/xsltproc.html
213	%%PORTDOCS%%%%DOCSDIR%%/xsltproc.xml
214	%%PORTDOCS%%%%DOCSDIR%%/xsltproc2.html

Lines 3-32 Link Here

(-)b/textproc/py-libxml2/Makefile (-18 / +24 lines)
3	CATEGORIES= textproc gnome python	3	CATEGORIES= textproc gnome python
4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
5		5
6	MAINTAINER= desktop@FreeBSD.org
7	COMMENT= Python interface for XML parser library for GNOME	6	COMMENT= Python interface for XML parser library for GNOME
8
9	MASTERDIR= ${.CURDIR}/../libxml2	7	MASTERDIR= ${.CURDIR}/../libxml2
10	BUILD_WRKSRC= ${WRKSRC}/python
11	INSTALL_WRKSRC= ${BUILD_WRKSRC}
12	DESCR= ${.CURDIR}/pkg-descr
13	PLIST= ${.CURDIR}/pkg-plist
14		8
		9	USES+= gnome python shebangfix
15	USE_GNOME= libxml2	10	USE_GNOME= libxml2
16	USES= gettext-runtime gnome python:3.6+	11	USE_PYTHON= flavors
17	USE_PYTHON= autoplist distutils	12	SHEBANG_FILES= .py doc/.py python/.py python/tests/.py
18		13
19	CPPFLAGS+= `${PYTHON_CMD}-config --cflags`	14	# Help CMake determine the correct version of Python if
20	LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs`	15	# multiple versions are installed
21	CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \	16	CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD}
22	--with-html-dir=${PREFIX}/share/doc \
23	--with-html-subdir=${PORTNAME} \
24	--with-python=${PYTHON_CMD}
25		17
26	DOCSDIR= ${PREFIX}/share/doc/py-libxml2	18	OPTIONS_SLAVE= ${OPTIONS_DEFINE:NTEST}
27	EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2
28		19
29	post-install:	20	# Tell master port we're a slave port
30	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod*.so	21	LIBXML2_SLAVE= python
		22	# Grab pkg-descr from slave port
		23	DESCR= ${.CURDIR}/pkg-descr
		24	# Don't append pkg-plist from master port
		25	PLIST=
		26	PLIST_FILES= ${PYTHON_SITELIBDIR}/drv_libxml2.py \
		27	${PYTHON_SITELIBDIR}/libxml2.py \
		28	${PYTHON_SITELIBDIR}/libxml2mod.so \
		29	${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
		30
		31	do-install:
		32	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
		33	${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
		34	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
		35	${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}
		36	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
31		37
32	.include "${MASTERDIR}/Makefile"	38	.include "${MASTERDIR}/Makefile"