pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compat32_libxml2: Rename libxml2-32 to compat32_libxml2
Module Name: pkgsrc-wip
Committed By: Naveen Narayanan <zerous@nocebo.space>
Pushed By: zerous
Date: Tue Jul 23 18:03:39 2019 +0200
Changeset: 7ae7123a0975b3a9310418fe80772d09b4e951a5
Added Files:
compat32_libxml2/DESCR
compat32_libxml2/Makefile
compat32_libxml2/Makefile.common
compat32_libxml2/PLIST
compat32_libxml2/TODO
compat32_libxml2/buildlink3.mk
compat32_libxml2/distinfo
compat32_libxml2/options.mk
compat32_libxml2/patches/patch-Makefile.in
compat32_libxml2/patches/patch-catalog.c
compat32_libxml2/patches/patch-configure
compat32_libxml2/patches/patch-doc_examples_Makefile.in
compat32_libxml2/patches/patch-encoding.c
compat32_libxml2/patches/patch-python_libxml.c
compat32_libxml2/patches/patch-python_libxml.py
compat32_libxml2/patches/patch-python_libxml2.py
compat32_libxml2/patches/patch-python_setup.py
compat32_libxml2/patches/patch-xmlcatalog.c
Removed Files:
libxml2-32/DESCR
libxml2-32/Makefile
libxml2-32/Makefile.common
libxml2-32/PLIST
libxml2-32/TODO
libxml2-32/buildlink3.mk
libxml2-32/distinfo
libxml2-32/options.mk
libxml2-32/patches/patch-Makefile.in
libxml2-32/patches/patch-catalog.c
libxml2-32/patches/patch-configure
libxml2-32/patches/patch-doc_examples_Makefile.in
libxml2-32/patches/patch-encoding.c
libxml2-32/patches/patch-python_libxml.c
libxml2-32/patches/patch-python_libxml.py
libxml2-32/patches/patch-python_libxml2.py
libxml2-32/patches/patch-python_setup.py
libxml2-32/patches/patch-xmlcatalog.c
Log Message:
compat32_libxml2: Rename libxml2-32 to compat32_libxml2
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ae7123a0975b3a9310418fe80772d09b4e951a5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
compat32_libxml2/DESCR | 4 +
compat32_libxml2/Makefile | 50 ++++
compat32_libxml2/Makefile.common | 15 ++
compat32_libxml2/PLIST | 267 +++++++++++++++++++++
compat32_libxml2/TODO | 2 +
compat32_libxml2/buildlink3.mk | 28 +++
compat32_libxml2/distinfo | 16 ++
compat32_libxml2/options.mk | 13 +
compat32_libxml2/patches/patch-Makefile.in | 15 ++
compat32_libxml2/patches/patch-catalog.c | 19 ++
compat32_libxml2/patches/patch-configure | 92 +++++++
.../patches/patch-doc_examples_Makefile.in | 15 ++
compat32_libxml2/patches/patch-encoding.c | 65 +++++
compat32_libxml2/patches/patch-python_libxml.c | 32 +++
compat32_libxml2/patches/patch-python_libxml.py | 13 +
compat32_libxml2/patches/patch-python_libxml2.py | 16 ++
compat32_libxml2/patches/patch-python_setup.py | 34 +++
compat32_libxml2/patches/patch-xmlcatalog.c | 15 ++
libxml2-32/DESCR | 4 -
libxml2-32/Makefile | 51 ----
libxml2-32/Makefile.common | 15 --
libxml2-32/PLIST | 267 ---------------------
libxml2-32/TODO | 2 -
libxml2-32/buildlink3.mk | 28 ---
libxml2-32/distinfo | 16 --
libxml2-32/options.mk | 13 -
libxml2-32/patches/patch-Makefile.in | 15 --
libxml2-32/patches/patch-catalog.c | 19 --
libxml2-32/patches/patch-configure | 92 -------
libxml2-32/patches/patch-doc_examples_Makefile.in | 15 --
libxml2-32/patches/patch-encoding.c | 65 -----
libxml2-32/patches/patch-python_libxml.c | 32 ---
libxml2-32/patches/patch-python_libxml.py | 13 -
libxml2-32/patches/patch-python_libxml2.py | 16 --
libxml2-32/patches/patch-python_setup.py | 34 ---
libxml2-32/patches/patch-xmlcatalog.c | 15 --
36 files changed, 711 insertions(+), 712 deletions(-)
diffs:
diff --git a/compat32_libxml2/DESCR b/compat32_libxml2/DESCR
new file mode 100644
index 0000000000..ba2ec44f7a
--- /dev/null
+++ b/compat32_libxml2/DESCR
@@ -0,0 +1,4 @@
+XML parser library from the GNOME project
+
+Note: This package is intended to crosscompile libxml2 for i386.
+
diff --git a/compat32_libxml2/Makefile b/compat32_libxml2/Makefile
new file mode 100644
index 0000000000..4539852a1f
--- /dev/null
+++ b/compat32_libxml2/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.152 2019/01/09 19:09:02 adam Exp $
+
+.include "../../wip/compat32_libxml2/Makefile.common"
+
+ABI= 32
+PKGNAME?= compat${ABI}_${DISTNAME}
+COMMENT= XML parser library from the GNOME project
+LICENSE= modified-bsd
+
+USE_FEATURES= glob
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
+CONFIGURE_ARGS+= --with-html-subdir=libxml2
+CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+= --with-lzma=${BUILDLINK_PREFIX.xz}
+CONFIGURE_ARGS+= --without-python
+PKGCONFIG_OVERRIDE= libxml-2.0.pc.in
+
+USE_LANGUAGES+= c99
+
+.include "options.mk"
+
+# allow thread-awareness, but make sure the library is not
+# linked against libpthread
+#CONFIGURE_ARGS+= --without-threads
+
+MAKE_ENV+= PAX=${PAX:Q}
+
+TEST_TARGET= check
+
+SUBST_CLASSES+= cat
+SUBST_STAGE.cat= pre-configure
+SUBST_FILES.cat= catalog.c xmlcatalog.c
+SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
+SUBST_SED.cat+= -e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
+
+BUILDLINK_TRANSFORM.SunOS+= rm:-Werror=format=2
+
+LDFLAGS.SCO_SV+= -lm
+
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/compat32_libxml2/Makefile.common b/compat32_libxml2/Makefile.common
new file mode 100644
index 0000000000..b719b95e99
--- /dev/null
+++ b/compat32_libxml2/Makefile.common
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile.common,v 1.12 2019/01/09 19:09:02 adam Exp $
+#
+# used by textproc/libxml2/Makefile
+# used by textproc/py-libxml2/Makefile
+
+DISTNAME= libxml2-2.9.9
+CATEGORIES= textproc
+MASTER_SITES= ftp://xmlsoft.org/libxml2/
+MASTER_SITES+= http://xmlsoft.org/sources/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://xmlsoft.org/
+
+DISTINFO_FILE= ${.CURDIR}/../../textproc/libxml2/distinfo
+PATCHDIR= ${.CURDIR}/../../textproc/libxml2/patches
diff --git a/compat32_libxml2/PLIST b/compat32_libxml2/PLIST
new file mode 100644
index 0000000000..4def1cfa6a
--- /dev/null
+++ b/compat32_libxml2/PLIST
@@ -0,0 +1,267 @@
+@comment $NetBSD$
+emul/netbsd32/bin/xml2-config
+emul/netbsd32/bin/xmlcatalog
+emul/netbsd32/bin/xmllint
+emul/netbsd32/include/libxml2/libxml/DOCBparser.h
+emul/netbsd32/include/libxml2/libxml/HTMLparser.h
+emul/netbsd32/include/libxml2/libxml/HTMLtree.h
+emul/netbsd32/include/libxml2/libxml/SAX.h
+emul/netbsd32/include/libxml2/libxml/SAX2.h
+emul/netbsd32/include/libxml2/libxml/c14n.h
+emul/netbsd32/include/libxml2/libxml/catalog.h
+emul/netbsd32/include/libxml2/libxml/chvalid.h
+emul/netbsd32/include/libxml2/libxml/debugXML.h
+emul/netbsd32/include/libxml2/libxml/dict.h
+emul/netbsd32/include/libxml2/libxml/encoding.h
+emul/netbsd32/include/libxml2/libxml/entities.h
+emul/netbsd32/include/libxml2/libxml/globals.h
+emul/netbsd32/include/libxml2/libxml/hash.h
+emul/netbsd32/include/libxml2/libxml/list.h
+emul/netbsd32/include/libxml2/libxml/nanoftp.h
+emul/netbsd32/include/libxml2/libxml/nanohttp.h
+emul/netbsd32/include/libxml2/libxml/parser.h
+emul/netbsd32/include/libxml2/libxml/parserInternals.h
+emul/netbsd32/include/libxml2/libxml/pattern.h
+emul/netbsd32/include/libxml2/libxml/relaxng.h
+emul/netbsd32/include/libxml2/libxml/schemasInternals.h
+emul/netbsd32/include/libxml2/libxml/schematron.h
+emul/netbsd32/include/libxml2/libxml/threads.h
+emul/netbsd32/include/libxml2/libxml/tree.h
+emul/netbsd32/include/libxml2/libxml/uri.h
+emul/netbsd32/include/libxml2/libxml/valid.h
+emul/netbsd32/include/libxml2/libxml/xinclude.h
+emul/netbsd32/include/libxml2/libxml/xlink.h
+emul/netbsd32/include/libxml2/libxml/xmlIO.h
+emul/netbsd32/include/libxml2/libxml/xmlautomata.h
+emul/netbsd32/include/libxml2/libxml/xmlerror.h
+emul/netbsd32/include/libxml2/libxml/xmlexports.h
+emul/netbsd32/include/libxml2/libxml/xmlmemory.h
+emul/netbsd32/include/libxml2/libxml/xmlmodule.h
+emul/netbsd32/include/libxml2/libxml/xmlreader.h
+emul/netbsd32/include/libxml2/libxml/xmlregexp.h
+emul/netbsd32/include/libxml2/libxml/xmlsave.h
+emul/netbsd32/include/libxml2/libxml/xmlschemas.h
+emul/netbsd32/include/libxml2/libxml/xmlschemastypes.h
+emul/netbsd32/include/libxml2/libxml/xmlstring.h
+emul/netbsd32/include/libxml2/libxml/xmlunicode.h
+emul/netbsd32/include/libxml2/libxml/xmlversion.h
+emul/netbsd32/include/libxml2/libxml/xmlwriter.h
+emul/netbsd32/include/libxml2/libxml/xpath.h
+emul/netbsd32/include/libxml2/libxml/xpathInternals.h
+emul/netbsd32/include/libxml2/libxml/xpointer.h
+emul/netbsd32/lib/cmake/libxml2/libxml2-config.cmake
+emul/netbsd32/lib/libxml2.la
+emul/netbsd32/lib/pkgconfig/libxml-2.0.pc
+emul/netbsd32/lib/xml2Conf.sh
+emul/netbsd32/man/man1/xml2-config.1
+emul/netbsd32/man/man1/xmlcatalog.1
+emul/netbsd32/man/man1/xmllint.1
+emul/netbsd32/man/man3/libxml.3
+emul/netbsd32/share/aclocal/libxml.m4
+emul/netbsd32/share/doc/libxml2-${PKGVERSION}/Copyright
+emul/netbsd32/share/doc/libxml2/DOM.gif
+emul/netbsd32/share/doc/libxml2/FAQ.html
+emul/netbsd32/share/doc/libxml2/Libxml2-Logo-180x168.gif
+emul/netbsd32/share/doc/libxml2/Libxml2-Logo-90x34.gif
+emul/netbsd32/share/doc/libxml2/encoding.html
+emul/netbsd32/share/doc/libxml2/examples.xml
+emul/netbsd32/share/doc/libxml2/examples.xsl
+emul/netbsd32/share/doc/libxml2/html/book1.html
+emul/netbsd32/share/doc/libxml2/html/home.png
+emul/netbsd32/share/doc/libxml2/html/index.html
+emul/netbsd32/share/doc/libxml2/html/left.png
+emul/netbsd32/share/doc/libxml2/html/libxml-DOCBparser.html
+emul/netbsd32/share/doc/libxml2/html/libxml-HTMLparser.html
+emul/netbsd32/share/doc/libxml2/html/libxml-HTMLtree.html
+emul/netbsd32/share/doc/libxml2/html/libxml-SAX.html
+emul/netbsd32/share/doc/libxml2/html/libxml-SAX2.html
+emul/netbsd32/share/doc/libxml2/html/libxml-c14n.html
+emul/netbsd32/share/doc/libxml2/html/libxml-catalog.html
+emul/netbsd32/share/doc/libxml2/html/libxml-chvalid.html
+emul/netbsd32/share/doc/libxml2/html/libxml-debugXML.html
+emul/netbsd32/share/doc/libxml2/html/libxml-dict.html
+emul/netbsd32/share/doc/libxml2/html/libxml-encoding.html
+emul/netbsd32/share/doc/libxml2/html/libxml-entities.html
+emul/netbsd32/share/doc/libxml2/html/libxml-globals.html
+emul/netbsd32/share/doc/libxml2/html/libxml-hash.html
+emul/netbsd32/share/doc/libxml2/html/libxml-lib.html
+emul/netbsd32/share/doc/libxml2/html/libxml-list.html
+emul/netbsd32/share/doc/libxml2/html/libxml-nanoftp.html
+emul/netbsd32/share/doc/libxml2/html/libxml-nanohttp.html
+emul/netbsd32/share/doc/libxml2/html/libxml-parser.html
+emul/netbsd32/share/doc/libxml2/html/libxml-parserInternals.html
+emul/netbsd32/share/doc/libxml2/html/libxml-pattern.html
+emul/netbsd32/share/doc/libxml2/html/libxml-relaxng.html
+emul/netbsd32/share/doc/libxml2/html/libxml-schemasInternals.html
+emul/netbsd32/share/doc/libxml2/html/libxml-schematron.html
+emul/netbsd32/share/doc/libxml2/html/libxml-threads.html
+emul/netbsd32/share/doc/libxml2/html/libxml-tree.html
+emul/netbsd32/share/doc/libxml2/html/libxml-uri.html
+emul/netbsd32/share/doc/libxml2/html/libxml-valid.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xinclude.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xlink.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlIO.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlautomata.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlerror.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlexports.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlmemory.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlmodule.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlreader.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlregexp.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlsave.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlschemas.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlschemastypes.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlstring.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlunicode.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlversion.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xmlwriter.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xpath.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xpathInternals.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xpointer.html
+emul/netbsd32/share/doc/libxml2/html/libxml-xzlib.html
+emul/netbsd32/share/doc/libxml2/html/right.png
+emul/netbsd32/share/doc/libxml2/html/up.png
+emul/netbsd32/share/doc/libxml2/io1.c
+emul/netbsd32/share/doc/libxml2/io1.res
+emul/netbsd32/share/doc/libxml2/io2.c
+emul/netbsd32/share/doc/libxml2/io2.res
+emul/netbsd32/share/doc/libxml2/libxml.gif
+emul/netbsd32/share/doc/libxml2/parse1.c
+emul/netbsd32/share/doc/libxml2/parse2.c
+emul/netbsd32/share/doc/libxml2/parse3.c
+emul/netbsd32/share/doc/libxml2/parse4.c
+emul/netbsd32/share/doc/libxml2/reader1.c
+emul/netbsd32/share/doc/libxml2/reader1.res
+emul/netbsd32/share/doc/libxml2/reader2.c
+emul/netbsd32/share/doc/libxml2/reader3.c
+emul/netbsd32/share/doc/libxml2/reader3.res
+emul/netbsd32/share/doc/libxml2/reader4.c
+emul/netbsd32/share/doc/libxml2/reader4.res
+emul/netbsd32/share/doc/libxml2/redhat.gif
+emul/netbsd32/share/doc/libxml2/smallfootonly.gif
+emul/netbsd32/share/doc/libxml2/structure.gif
+emul/netbsd32/share/doc/libxml2/test1.xml
+emul/netbsd32/share/doc/libxml2/test2.xml
+emul/netbsd32/share/doc/libxml2/test3.xml
+emul/netbsd32/share/doc/libxml2/testWriter.c
+emul/netbsd32/share/doc/libxml2/tree1.c
+emul/netbsd32/share/doc/libxml2/tree1.res
+emul/netbsd32/share/doc/libxml2/tree2.c
+emul/netbsd32/share/doc/libxml2/tree2.res
+emul/netbsd32/share/doc/libxml2/tst.xml
+emul/netbsd32/share/doc/libxml2/tutorial/apa.html
+emul/netbsd32/share/doc/libxml2/tutorial/apb.html
+emul/netbsd32/share/doc/libxml2/tutorial/apc.html
+emul/netbsd32/share/doc/libxml2/tutorial/apd.html
+emul/netbsd32/share/doc/libxml2/tutorial/ape.html
+emul/netbsd32/share/doc/libxml2/tutorial/apf.html
+emul/netbsd32/share/doc/libxml2/tutorial/apg.html
+emul/netbsd32/share/doc/libxml2/tutorial/aph.html
+emul/netbsd32/share/doc/libxml2/tutorial/api.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s02.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s03.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s04.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s05.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s06.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s07.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s08.html
+emul/netbsd32/share/doc/libxml2/tutorial/ar01s09.html
+emul/netbsd32/share/doc/libxml2/tutorial/images/blank.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/1.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/10.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/2.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/3.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/4.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/5.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/6.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/7.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/8.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/9.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/caution.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/draft.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/home.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/important.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/next.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/note.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/prev.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/tip.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/toc-blank.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/toc-minus.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/toc-plus.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/up.png
+emul/netbsd32/share/doc/libxml2/tutorial/images/warning.png
+emul/netbsd32/share/doc/libxml2/tutorial/includeaddattribute.c
+emul/netbsd32/share/doc/libxml2/tutorial/includeaddkeyword.c
+emul/netbsd32/share/doc/libxml2/tutorial/includeconvert.c
+emul/netbsd32/share/doc/libxml2/tutorial/includegetattribute.c
+emul/netbsd32/share/doc/libxml2/tutorial/includekeyword.c
+emul/netbsd32/share/doc/libxml2/tutorial/includexpath.c
+emul/netbsd32/share/doc/libxml2/tutorial/index.html
+emul/netbsd32/share/doc/libxml2/tutorial/ix01.html
+emul/netbsd32/share/doc/libxml2/tutorial/xmltutorial.pdf
+emul/netbsd32/share/doc/libxml2/w3c.png
+emul/netbsd32/share/doc/libxml2/writer.xml
+emul/netbsd32/share/doc/libxml2/xml.html
+emul/netbsd32/share/doc/libxml2/xpath1.c
+emul/netbsd32/share/doc/libxml2/xpath1.res
+emul/netbsd32/share/doc/libxml2/xpath2.c
+emul/netbsd32/share/doc/libxml2/xpath2.res
+emul/netbsd32/share/examples/libxml2/testHTML.c
+emul/netbsd32/share/examples/libxml2/testSAX.c
+emul/netbsd32/share/examples/libxml2/testXPath.c
+emul/netbsd32/share/examples/libxml2/xmllint.c
+emul/netbsd32/share/gtk-doc/html/libxml2/general.html
+emul/netbsd32/share/gtk-doc/html/libxml2/home.png
+emul/netbsd32/share/gtk-doc/html/libxml2/index.html
+emul/netbsd32/share/gtk-doc/html/libxml2/left.png
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-DOCBparser.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-HTMLparser.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-HTMLtree.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-SAX.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-SAX2.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-c14n.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-catalog.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-chvalid.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-debugXML.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-dict.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-encoding.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-entities.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-globals.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-hash.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-list.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-nanoftp.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-nanohttp.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-parser.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-parserInternals.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-pattern.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-relaxng.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-schemasInternals.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-schematron.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-threads.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-tree.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-uri.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-valid.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xinclude.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xlink.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlIO.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlautomata.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlerror.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlexports.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlmemory.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlmodule.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlreader.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlregexp.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlsave.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlschemas.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlstring.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlunicode.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlversion.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlwriter.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xpath.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xpathInternals.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xpointer.html
+emul/netbsd32/share/gtk-doc/html/libxml2/libxml2.devhelp
+emul/netbsd32/share/gtk-doc/html/libxml2/right.png
+emul/netbsd32/share/gtk-doc/html/libxml2/style.css
+emul/netbsd32/share/gtk-doc/html/libxml2/up.png
diff --git a/compat32_libxml2/TODO b/compat32_libxml2/TODO
new file mode 100644
index 0000000000..2b01e5101a
--- /dev/null
+++ b/compat32_libxml2/TODO
@@ -0,0 +1,2 @@
+Please note that this package isn't functional yet.
+NetBSD make seems to be calling gmake with the wrong flags.
diff --git a/compat32_libxml2/buildlink3.mk b/compat32_libxml2/buildlink3.mk
new file mode 100644
index 0000000000..40d53a70a4
--- /dev/null
+++ b/compat32_libxml2/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.18 2012/06/14 07:39:37 sbd Exp $
+
+BUILDLINK_TREE+= compat32_libxml2
+
+.if !defined(compat32_libxml2_BUILDLINK3_MK)
+compat32_libxml2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.compat32_libxml2+= compat32_libxml2>=2.6.2
+BUILDLINK_ABI_DEPENDS.compat32_libxml2+= compat32_libxml2>=2.8.0nb2
+#BUILDLINK_PKGSRCDIR.compat32_libxml2?= ../../textproc/compat32_libxml2
+BUILDLINK_PKGSRCDIR.compat32_libxml2?= ../../wip/compat32_libxml2
+BUILDLINK_LIBDIRS.compat32_libxml2= emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_libxml2= emul/netbsd32/include
+
+BUILDLINK_FILES.compat32_libxml2+= emul/netbsd32/bin/xml2-config
+
+USE_FEATURES+= glob
+
+# We need the non-compat version for headers.
+BUILDLINK_DEPMETHOD.libxml2+= build
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.endif # COMPAT32_LIBXML2_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -compat32_libxml2
diff --git a/compat32_libxml2/distinfo b/compat32_libxml2/distinfo
new file mode 100644
index 0000000000..3ac758b439
--- /dev/null
+++ b/compat32_libxml2/distinfo
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.130 2019/01/09 19:09:02 adam Exp $
+
+SHA1 (libxml2-2.9.9.tar.gz) = 96686d1dd9fddf3b35a28b1e2e4bbacac889add3
+RMD160 (libxml2-2.9.9.tar.gz) = a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21
+SHA512 (libxml2-2.9.9.tar.gz) = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
+Size (libxml2-2.9.9.tar.gz) = 5476717 bytes
+SHA1 (patch-Makefile.in) = e687eaa9805b855b0c8a944ec5c597bd34954472
+SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
+SHA1 (patch-configure) = a0df60b1a8609c185ed7d45a015eafdbfb6d6b41
+SHA1 (patch-doc_examples_Makefile.in) = 4eede9719724f94402e850ee6d6043a74aaf62b2
+SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
+SHA1 (patch-python_libxml.c) = cfa07b4f3dfddb501c2ba210bb32b8ee14e3df9d
+SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
+SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34
+SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
+SHA1 (patch-xmlcatalog.c) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
diff --git a/compat32_libxml2/options.mk b/compat32_libxml2/options.mk
new file mode 100644
index 0000000000..15c408f639
--- /dev/null
+++ b/compat32_libxml2/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:03 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.libxml2
+PKG_SUPPORTED_OPTIONS+= inet6
+PKG_SUGGESTED_OPTIONS= inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
diff --git a/compat32_libxml2/patches/patch-Makefile.in b/compat32_libxml2/patches/patch-Makefile.in
new file mode 100644
index 0000000000..2279fb18b2
--- /dev/null
+++ b/compat32_libxml2/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
+
+Move EXAMPLES_DIR to fit pkgsrc.
+
+--- Makefile.in.orig 2014-10-16 07:35:13.000000000 +0000
++++ Makefile.in
+@@ -835,7 +835,7 @@ cmake_DATA = libxml2-config.cmake
+ #
+ BASE_DIR = $(datadir)/doc
+ DOC_MODULE = libxml2-$(VERSION)
+-EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
++EXAMPLES_DIR = $(datadir)/examples/libxml2
+
+ #
+ # Coverage support, largely borrowed from libvirt
diff --git a/compat32_libxml2/patches/patch-catalog.c b/compat32_libxml2/patches/patch-catalog.c
new file mode 100644
index 0000000000..1f1339f289
--- /dev/null
+++ b/compat32_libxml2/patches/patch-catalog.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-catalog.c,v 1.1 2019/01/09 19:09:03 adam Exp $
+
+Parametrize XML and SGML catalog directories.
+
+--- catalog.c.orig 2014-10-03 11:28:05.000000000 +0000
++++ catalog.c
+@@ -70,10 +70,10 @@
+ #define XML_URN_PUBID "urn:publicid:"
+ #define XML_CATAL_BREAK ((xmlChar *) -1)
+ #ifndef XML_XML_DEFAULT_CATALOG
+-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
++#define XML_XML_DEFAULT_CATALOG "file://@@XML_DEFAULT_CATALOG@@"
+ #endif
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "file://@@SGML_DEFAULT_CATALOG@@"
+ #endif
+
+ #if defined(_WIN32) && defined(_MSC_VER)
diff --git a/compat32_libxml2/patches/patch-configure b/compat32_libxml2/patches/patch-configure
new file mode 100644
index 0000000000..a980d819c8
--- /dev/null
+++ b/compat32_libxml2/patches/patch-configure
@@ -0,0 +1,92 @@
+$NetBSD: patch-configure,v 1.1 2019/01/09 19:09:03 adam Exp $
+
+Various configure fixes:
+ * Add run-path to XML_LIBDIR
+ * Fix handling of pthreads
+ * Add portability to OpenBSD, MirBSD, FreeBSD, NetBSD and DragonFly
+ * Fix test for SAX
+ Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859
+
+--- configure.orig 2017-11-02 20:16:48.000000000 +0000
++++ configure
+@@ -15084,7 +15084,7 @@ fi
+ fi
+
+
+-XML_LIBDIR='-L${libdir}'
++XML_LIBDIR='-Wl,-R${libdir} -L${libdir}'
+ XML_INCLUDEDIR='-I${includedir}/libxml2'
+
+ XML_CFLAGS=""
+@@ -15557,13 +15557,13 @@ else
+ if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
+ ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+ if test "x$ac_cv_header_pthread_h" = xyes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
+-$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++$as_echo_n "checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
+ if ${ac_cv_lib_pthread_pthread_join+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -15595,7 +15595,7 @@ fi
+ $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
+ if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
+
+- THREAD_LIBS="-lpthread"
++ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+
+ $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
+
+@@ -15617,12 +15617,12 @@ fi
+ *beos*) WITH_THREADS="1"
+ THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
+ ;;
+- *linux*)
++ *linux* | *openbsd* | *mirbsd*)
+ if test "${GCC}" = "yes" ; then
+ GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
+ GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
+ GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'`
+- if test "${THREAD_LIBS}" = "-lpthread" ; then
++ if test "${THREAD_LIBS}" = "${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ; then
+ if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
+ then
+ THREAD_LIBS=""
+@@ -15639,6 +15639,10 @@ fi
+ fi
+ fi
+ ;;
++ *freebsd* | *netbsd* | *dragonfly*)
++ THREAD_LIBS=""
++ BASE_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
++ ;;
+ esac
+ if test "$WITH_THREADS" = "1" ; then
+ THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
+@@ -15909,7 +15913,7 @@ else
+ TEST_SAX=SAXtests
+ fi
+
+- if test "${WITH_TRIO}" = "1"; then
++ if test "${WITH_SAX1}" = "1"; then
+ WITH_SAX1_SOURCES_TRUE=
+ WITH_SAX1_SOURCES_FALSE='#'
+ else
+@@ -16493,10 +16497,6 @@ case "$host" in
+ CPPFLAGS="$CPPFLAGS -DWIN32"
+ WIN32_EXTRA_LIBADD="-lws2_32"
+ WIN32_EXTRA_LDFLAGS="-no-undefined"
+- if test "${PYTHON}" != ""
+- then
+- WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"
+- fi
+ ;;
+ *-*-cygwin*)
+ CYGWIN_EXTRA_LDFLAGS="-no-undefined"
diff --git a/compat32_libxml2/patches/patch-doc_examples_Makefile.in b/compat32_libxml2/patches/patch-doc_examples_Makefile.in
new file mode 100644
index 0000000000..aff40822b8
--- /dev/null
+++ b/compat32_libxml2/patches/patch-doc_examples_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_examples_Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
+
+Don't install html files.
+
+--- doc/examples/Makefile.in.orig 2014-10-16 07:35:13.000000000 +0000
++++ doc/examples/Makefile.in
+@@ -916,7 +916,7 @@ uninstall-am:
+
+ install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
+- -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
++ -$(INSTALL) -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+
+ clean-local:
+ test -f Makefile.am || rm -f test?.xml
diff --git a/compat32_libxml2/patches/patch-encoding.c b/compat32_libxml2/patches/patch-encoding.c
new file mode 100644
index 0000000000..7a8e93409f
--- /dev/null
+++ b/compat32_libxml2/patches/patch-encoding.c
@@ -0,0 +1,65 @@
+$NetBSD$
+
+Avoid potential undefined behaviour by casting arg to toupper()
+to an appropriate value range.
+https://bugzilla.gnome.org/show_bug.cgi?id=766838
+
+Also, on NetBSD, add CP1141 encoding alias.
+
+--- encoding.c.orig 2016-05-23 07:25:25.000000000 +0000
++++ encoding.c
+@@ -1018,7 +1018,7 @@ xmlGetEncodingAlias(const char *alias) {
+ return(NULL);
+
+ for (i = 0;i < 99;i++) {
+- upper[i] = toupper(alias[i]);
++ upper[i] = toupper((unsigned char)alias[i]);
+ if (upper[i] == 0) break;
+ }
+ upper[i] = 0;
+@@ -1053,7 +1053,7 @@ xmlAddEncodingAlias(const char *name, co
+ return(-1);
+
+ for (i = 0;i < 99;i++) {
+- upper[i] = toupper(alias[i]);
++ upper[i] = toupper((unsigned char)alias[i]);
+ if (upper[i] == 0) break;
+ }
+ upper[i] = 0;
+@@ -1155,7 +1155,7 @@ xmlParseCharEncoding(const char* name)
+ name = alias;
+
+ for (i = 0;i < 499;i++) {
+- upper[i] = toupper(name[i]);
++ upper[i] = toupper((unsigned char)name[i]);
+ if (upper[i] == 0) break;
+ }
+ upper[i] = 0;
+@@ -1331,7 +1331,7 @@ xmlNewCharEncodingHandler(const char *na
+ return(NULL);
+ }
+ for (i = 0;i < 499;i++) {
+- upper[i] = toupper(name[i]);
++ upper[i] = toupper((unsigned char)name[i]);
+ if (upper[i] == 0) break;
+ }
+ upper[i] = 0;
+@@ -1433,6 +1433,9 @@ xmlInitCharEncodingHandlers(void) {
+ xmlRegisterCharEncodingHandlersISO8859x ();
+ #endif
+ #endif
++#ifdef __NetBSD__ /* XXX needed by selftest */
++ xmlAddEncodingAlias("CP1141", "IBM-1141");
++#endif
+
+ }
+
+@@ -1660,7 +1663,7 @@ xmlFindCharEncodingHandler(const char *n
+ * Check first for directly registered encoding names
+ */
+ for (i = 0;i < 99;i++) {
+- upper[i] = toupper(name[i]);
++ upper[i] = toupper((unsigned char)name[i]);
+ if (upper[i] == 0) break;
+ }
+ upper[i] = 0;
diff --git a/compat32_libxml2/patches/patch-python_libxml.c b/compat32_libxml2/patches/patch-python_libxml.c
new file mode 100644
index 0000000000..9fdc6f689f
--- /dev/null
+++ b/compat32_libxml2/patches/patch-python_libxml.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-python_libxml.c,v 1.1 2019/01/09 13:40:50 wiz Exp $
+
+Avoid returning invalid UTF-8 strings to python.
+Based on https://bugzilla.opensuse.org/attachment.cgi?id=746044&action=edit
+Fixes https://github.com/itstool/itstool/issues/22
+
+--- python/libxml.c.orig 2016-06-07 10:04:14.000000000 +0000
++++ python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++ unsigned char *ptr = (unsigned char *)str;
+
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,10 +1637,14 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ str[999] = 0;
+ va_end(ap);
+
++ /* Ensure the error string doesn't start at UTF8 continuation. */
++ while (*ptr && (*ptr & 0xc0) == 0x80)
++ ptr++;
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+- message = libxml_charPtrConstWrap(str);
++ message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
+ Py_XDECREF(list);
diff --git a/compat32_libxml2/patches/patch-python_libxml.py b/compat32_libxml2/patches/patch-python_libxml.py
new file mode 100644
index 0000000000..35ec35e423
--- /dev/null
+++ b/compat32_libxml2/patches/patch-python_libxml.py
@@ -0,0 +1,13 @@
+$NetBSD: patch-python_libxml.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $
+
+--- python/libxml.py.orig 2004-09-28 05:59:58.000000000 -0500
++++ python/libxml.py
+@@ -281,7 +281,7 @@ class xmlCore:
+ # defined as python2 properties
+ #
+ import sys
+- if float(sys.version[0:3]) < 2.2:
++ if float(sys.version[0:3].replace('p', '.')) < 2.2:
+ def __getattr__(self, attr):
+ if attr == "parent":
+ ret = libxml2mod.parent(self._o)
diff --git a/compat32_libxml2/patches/patch-python_libxml2.py b/compat32_libxml2/patches/patch-python_libxml2.py
new file mode 100644
index 0000000000..c53582744b
--- /dev/null
+++ b/compat32_libxml2/patches/patch-python_libxml2.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_libxml2.py,v 1.1 2017/11/08 22:51:54 prlw1 Exp $
+
+name[0:8] will fail if name is None.
+https://bugzilla.gnome.org/show_bug.cgi?id=790071
+
+--- python/libxml2.py.orig 2017-10-30 07:39:09.000000000 +0000
++++ python/libxml2.py
+@@ -573,6 +573,8 @@ class xmlCoreBreadthFirstItertor:
+ def nodeWrap(o):
+ # TODO try to cast to the most appropriate node class
+ name = libxml2mod.type(o)
++ if name is None:
++ return xmlNode(_obj=o)
+ if name == "element" or name == "text":
+ return xmlNode(_obj=o)
+ if name == "attribute":
diff --git a/compat32_libxml2/patches/patch-python_setup.py b/compat32_libxml2/patches/patch-python_setup.py
new file mode 100644
index 0000000000..1fce4eb304
--- /dev/null
+++ b/compat32_libxml2/patches/patch-python_setup.py
@@ -0,0 +1,34 @@
+$NetBSD: patch-python_setup.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $
+
+Trust pkgsrc to know which iconv to use.
+It will be either in the buildlink directory, or in the compiler's
+default search path.
+
+--- python/setup.py.orig 2014-10-16 07:35:21.000000000 +0000
++++ python/setup.py
+@@ -56,11 +56,7 @@ else:
+ # - iconv.h
+ # - libxslt/xsltconfig.h
+ includes_dir = [
+-"/usr/include",
+-"/usr/local/include",
+-"/opt/include",
+-os.path.join(ROOT,'include'),
+-HOME
++os.path.join(ROOT,'include')
+ ];
+
+ xml_includes=""
+@@ -73,11 +69,7 @@ if xml_includes == "":
+ print("failed to find headers for libxml2: update includes_dir")
+ sys.exit(1)
+
+-iconv_includes=""
+-for dir in includes_dir:
+- if not missing(dir + "/iconv.h"):
+- iconv_includes=dir
+- break;
++iconv_includes=os.path.join(ROOT,'include')
+
+ if iconv_includes == "":
+ print("failed to find headers for libiconv: update includes_dir")
diff --git a/compat32_libxml2/patches/patch-xmlcatalog.c b/compat32_libxml2/patches/patch-xmlcatalog.c
new file mode 100644
index 0000000000..ad071353a4
--- /dev/null
+++ b/compat32_libxml2/patches/patch-xmlcatalog.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-xmlcatalog.c,v 1.1 2019/01/09 19:09:03 adam Exp $
+
+Parametrize SGML catalog directory.
+
+--- xmlcatalog.c.orig 2014-10-03 11:28:06.000000000 +0000
++++ xmlcatalog.c
+@@ -43,7 +43,7 @@ static char *filename = NULL;
+
+
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "@@SGML_DEFAULT_CATALOG@@"
+ #endif
+
+ /************************************************************************
diff --git a/libxml2-32/DESCR b/libxml2-32/DESCR
deleted file mode 100644
index ba2ec44f7a..0000000000
--- a/libxml2-32/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-XML parser library from the GNOME project
-
-Note: This package is intended to crosscompile libxml2 for i386.
-
diff --git a/libxml2-32/Makefile b/libxml2-32/Makefile
deleted file mode 100644
index bc4cf52287..0000000000
--- a/libxml2-32/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.152 2019/01/09 19:09:02 adam Exp $
-
-.include "../../wip/libxml2-32/Makefile.common"
-
-ABI= 32
-PKGNAME?= compat${ABI}_${DISTNAME}
-COMMENT= XML parser library from the GNOME project
-LICENSE= modified-bsd
-
-USE_FEATURES= glob
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
-CONFIGURE_ARGS+= --with-html-subdir=libxml2
-CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+= --with-lzma=${BUILDLINK_PREFIX.xz}
-CONFIGURE_ARGS+= --without-python
-CFLAGS+= -m32
-PKGCONFIG_OVERRIDE= libxml-2.0.pc.in
-
-USE_LANGUAGES+= c99
-
-.include "options.mk"
-
-# allow thread-awareness, but make sure the library is not
-# linked against libpthread
-#CONFIGURE_ARGS+= --without-threads
-
-MAKE_ENV+= PAX=${PAX:Q}
-
-TEST_TARGET= check
-
-SUBST_CLASSES+= cat
-SUBST_STAGE.cat= pre-configure
-SUBST_FILES.cat= catalog.c xmlcatalog.c
-SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
-SUBST_SED.cat+= -e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
-
-BUILDLINK_TRANSFORM.SunOS+= rm:-Werror=format=2
-
-LDFLAGS.SCO_SV+= -lm
-
-.include "../../archivers/xz/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/xmlcatmgr/catalogs.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libxml2-32/Makefile.common b/libxml2-32/Makefile.common
deleted file mode 100644
index b719b95e99..0000000000
--- a/libxml2-32/Makefile.common
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2019/01/09 19:09:02 adam Exp $
-#
-# used by textproc/libxml2/Makefile
-# used by textproc/py-libxml2/Makefile
-
-DISTNAME= libxml2-2.9.9
-CATEGORIES= textproc
-MASTER_SITES= ftp://xmlsoft.org/libxml2/
-MASTER_SITES+= http://xmlsoft.org/sources/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://xmlsoft.org/
-
-DISTINFO_FILE= ${.CURDIR}/../../textproc/libxml2/distinfo
-PATCHDIR= ${.CURDIR}/../../textproc/libxml2/patches
diff --git a/libxml2-32/PLIST b/libxml2-32/PLIST
deleted file mode 100644
index 4def1cfa6a..0000000000
--- a/libxml2-32/PLIST
+++ /dev/null
@@ -1,267 +0,0 @@
-@comment $NetBSD$
-emul/netbsd32/bin/xml2-config
-emul/netbsd32/bin/xmlcatalog
-emul/netbsd32/bin/xmllint
-emul/netbsd32/include/libxml2/libxml/DOCBparser.h
-emul/netbsd32/include/libxml2/libxml/HTMLparser.h
-emul/netbsd32/include/libxml2/libxml/HTMLtree.h
-emul/netbsd32/include/libxml2/libxml/SAX.h
-emul/netbsd32/include/libxml2/libxml/SAX2.h
-emul/netbsd32/include/libxml2/libxml/c14n.h
-emul/netbsd32/include/libxml2/libxml/catalog.h
-emul/netbsd32/include/libxml2/libxml/chvalid.h
-emul/netbsd32/include/libxml2/libxml/debugXML.h
-emul/netbsd32/include/libxml2/libxml/dict.h
-emul/netbsd32/include/libxml2/libxml/encoding.h
-emul/netbsd32/include/libxml2/libxml/entities.h
-emul/netbsd32/include/libxml2/libxml/globals.h
-emul/netbsd32/include/libxml2/libxml/hash.h
-emul/netbsd32/include/libxml2/libxml/list.h
-emul/netbsd32/include/libxml2/libxml/nanoftp.h
-emul/netbsd32/include/libxml2/libxml/nanohttp.h
-emul/netbsd32/include/libxml2/libxml/parser.h
-emul/netbsd32/include/libxml2/libxml/parserInternals.h
-emul/netbsd32/include/libxml2/libxml/pattern.h
-emul/netbsd32/include/libxml2/libxml/relaxng.h
-emul/netbsd32/include/libxml2/libxml/schemasInternals.h
-emul/netbsd32/include/libxml2/libxml/schematron.h
-emul/netbsd32/include/libxml2/libxml/threads.h
-emul/netbsd32/include/libxml2/libxml/tree.h
-emul/netbsd32/include/libxml2/libxml/uri.h
-emul/netbsd32/include/libxml2/libxml/valid.h
-emul/netbsd32/include/libxml2/libxml/xinclude.h
-emul/netbsd32/include/libxml2/libxml/xlink.h
-emul/netbsd32/include/libxml2/libxml/xmlIO.h
-emul/netbsd32/include/libxml2/libxml/xmlautomata.h
-emul/netbsd32/include/libxml2/libxml/xmlerror.h
-emul/netbsd32/include/libxml2/libxml/xmlexports.h
-emul/netbsd32/include/libxml2/libxml/xmlmemory.h
-emul/netbsd32/include/libxml2/libxml/xmlmodule.h
-emul/netbsd32/include/libxml2/libxml/xmlreader.h
-emul/netbsd32/include/libxml2/libxml/xmlregexp.h
-emul/netbsd32/include/libxml2/libxml/xmlsave.h
-emul/netbsd32/include/libxml2/libxml/xmlschemas.h
-emul/netbsd32/include/libxml2/libxml/xmlschemastypes.h
-emul/netbsd32/include/libxml2/libxml/xmlstring.h
-emul/netbsd32/include/libxml2/libxml/xmlunicode.h
-emul/netbsd32/include/libxml2/libxml/xmlversion.h
-emul/netbsd32/include/libxml2/libxml/xmlwriter.h
-emul/netbsd32/include/libxml2/libxml/xpath.h
-emul/netbsd32/include/libxml2/libxml/xpathInternals.h
-emul/netbsd32/include/libxml2/libxml/xpointer.h
-emul/netbsd32/lib/cmake/libxml2/libxml2-config.cmake
-emul/netbsd32/lib/libxml2.la
-emul/netbsd32/lib/pkgconfig/libxml-2.0.pc
-emul/netbsd32/lib/xml2Conf.sh
-emul/netbsd32/man/man1/xml2-config.1
-emul/netbsd32/man/man1/xmlcatalog.1
-emul/netbsd32/man/man1/xmllint.1
-emul/netbsd32/man/man3/libxml.3
-emul/netbsd32/share/aclocal/libxml.m4
-emul/netbsd32/share/doc/libxml2-${PKGVERSION}/Copyright
-emul/netbsd32/share/doc/libxml2/DOM.gif
-emul/netbsd32/share/doc/libxml2/FAQ.html
-emul/netbsd32/share/doc/libxml2/Libxml2-Logo-180x168.gif
-emul/netbsd32/share/doc/libxml2/Libxml2-Logo-90x34.gif
-emul/netbsd32/share/doc/libxml2/encoding.html
-emul/netbsd32/share/doc/libxml2/examples.xml
-emul/netbsd32/share/doc/libxml2/examples.xsl
-emul/netbsd32/share/doc/libxml2/html/book1.html
-emul/netbsd32/share/doc/libxml2/html/home.png
-emul/netbsd32/share/doc/libxml2/html/index.html
-emul/netbsd32/share/doc/libxml2/html/left.png
-emul/netbsd32/share/doc/libxml2/html/libxml-DOCBparser.html
-emul/netbsd32/share/doc/libxml2/html/libxml-HTMLparser.html
-emul/netbsd32/share/doc/libxml2/html/libxml-HTMLtree.html
-emul/netbsd32/share/doc/libxml2/html/libxml-SAX.html
-emul/netbsd32/share/doc/libxml2/html/libxml-SAX2.html
-emul/netbsd32/share/doc/libxml2/html/libxml-c14n.html
-emul/netbsd32/share/doc/libxml2/html/libxml-catalog.html
-emul/netbsd32/share/doc/libxml2/html/libxml-chvalid.html
-emul/netbsd32/share/doc/libxml2/html/libxml-debugXML.html
-emul/netbsd32/share/doc/libxml2/html/libxml-dict.html
-emul/netbsd32/share/doc/libxml2/html/libxml-encoding.html
-emul/netbsd32/share/doc/libxml2/html/libxml-entities.html
-emul/netbsd32/share/doc/libxml2/html/libxml-globals.html
-emul/netbsd32/share/doc/libxml2/html/libxml-hash.html
-emul/netbsd32/share/doc/libxml2/html/libxml-lib.html
-emul/netbsd32/share/doc/libxml2/html/libxml-list.html
-emul/netbsd32/share/doc/libxml2/html/libxml-nanoftp.html
-emul/netbsd32/share/doc/libxml2/html/libxml-nanohttp.html
-emul/netbsd32/share/doc/libxml2/html/libxml-parser.html
-emul/netbsd32/share/doc/libxml2/html/libxml-parserInternals.html
-emul/netbsd32/share/doc/libxml2/html/libxml-pattern.html
-emul/netbsd32/share/doc/libxml2/html/libxml-relaxng.html
-emul/netbsd32/share/doc/libxml2/html/libxml-schemasInternals.html
-emul/netbsd32/share/doc/libxml2/html/libxml-schematron.html
-emul/netbsd32/share/doc/libxml2/html/libxml-threads.html
-emul/netbsd32/share/doc/libxml2/html/libxml-tree.html
-emul/netbsd32/share/doc/libxml2/html/libxml-uri.html
-emul/netbsd32/share/doc/libxml2/html/libxml-valid.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xinclude.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xlink.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlIO.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlautomata.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlerror.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlexports.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlmemory.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlmodule.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlreader.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlregexp.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlsave.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlschemas.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlschemastypes.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlstring.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlunicode.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlversion.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xmlwriter.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xpath.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xpathInternals.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xpointer.html
-emul/netbsd32/share/doc/libxml2/html/libxml-xzlib.html
-emul/netbsd32/share/doc/libxml2/html/right.png
-emul/netbsd32/share/doc/libxml2/html/up.png
-emul/netbsd32/share/doc/libxml2/io1.c
-emul/netbsd32/share/doc/libxml2/io1.res
-emul/netbsd32/share/doc/libxml2/io2.c
-emul/netbsd32/share/doc/libxml2/io2.res
-emul/netbsd32/share/doc/libxml2/libxml.gif
-emul/netbsd32/share/doc/libxml2/parse1.c
-emul/netbsd32/share/doc/libxml2/parse2.c
-emul/netbsd32/share/doc/libxml2/parse3.c
-emul/netbsd32/share/doc/libxml2/parse4.c
-emul/netbsd32/share/doc/libxml2/reader1.c
-emul/netbsd32/share/doc/libxml2/reader1.res
-emul/netbsd32/share/doc/libxml2/reader2.c
-emul/netbsd32/share/doc/libxml2/reader3.c
-emul/netbsd32/share/doc/libxml2/reader3.res
-emul/netbsd32/share/doc/libxml2/reader4.c
-emul/netbsd32/share/doc/libxml2/reader4.res
-emul/netbsd32/share/doc/libxml2/redhat.gif
-emul/netbsd32/share/doc/libxml2/smallfootonly.gif
-emul/netbsd32/share/doc/libxml2/structure.gif
-emul/netbsd32/share/doc/libxml2/test1.xml
-emul/netbsd32/share/doc/libxml2/test2.xml
-emul/netbsd32/share/doc/libxml2/test3.xml
-emul/netbsd32/share/doc/libxml2/testWriter.c
-emul/netbsd32/share/doc/libxml2/tree1.c
-emul/netbsd32/share/doc/libxml2/tree1.res
-emul/netbsd32/share/doc/libxml2/tree2.c
-emul/netbsd32/share/doc/libxml2/tree2.res
-emul/netbsd32/share/doc/libxml2/tst.xml
-emul/netbsd32/share/doc/libxml2/tutorial/apa.html
-emul/netbsd32/share/doc/libxml2/tutorial/apb.html
-emul/netbsd32/share/doc/libxml2/tutorial/apc.html
-emul/netbsd32/share/doc/libxml2/tutorial/apd.html
-emul/netbsd32/share/doc/libxml2/tutorial/ape.html
-emul/netbsd32/share/doc/libxml2/tutorial/apf.html
-emul/netbsd32/share/doc/libxml2/tutorial/apg.html
-emul/netbsd32/share/doc/libxml2/tutorial/aph.html
-emul/netbsd32/share/doc/libxml2/tutorial/api.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s02.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s03.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s04.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s05.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s06.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s07.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s08.html
-emul/netbsd32/share/doc/libxml2/tutorial/ar01s09.html
-emul/netbsd32/share/doc/libxml2/tutorial/images/blank.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/1.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/10.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/2.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/3.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/4.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/5.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/6.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/7.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/8.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/callouts/9.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/caution.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/draft.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/home.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/important.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/next.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/note.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/prev.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/tip.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/toc-blank.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/toc-minus.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/toc-plus.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/up.png
-emul/netbsd32/share/doc/libxml2/tutorial/images/warning.png
-emul/netbsd32/share/doc/libxml2/tutorial/includeaddattribute.c
-emul/netbsd32/share/doc/libxml2/tutorial/includeaddkeyword.c
-emul/netbsd32/share/doc/libxml2/tutorial/includeconvert.c
-emul/netbsd32/share/doc/libxml2/tutorial/includegetattribute.c
-emul/netbsd32/share/doc/libxml2/tutorial/includekeyword.c
-emul/netbsd32/share/doc/libxml2/tutorial/includexpath.c
-emul/netbsd32/share/doc/libxml2/tutorial/index.html
-emul/netbsd32/share/doc/libxml2/tutorial/ix01.html
-emul/netbsd32/share/doc/libxml2/tutorial/xmltutorial.pdf
-emul/netbsd32/share/doc/libxml2/w3c.png
-emul/netbsd32/share/doc/libxml2/writer.xml
-emul/netbsd32/share/doc/libxml2/xml.html
-emul/netbsd32/share/doc/libxml2/xpath1.c
-emul/netbsd32/share/doc/libxml2/xpath1.res
-emul/netbsd32/share/doc/libxml2/xpath2.c
-emul/netbsd32/share/doc/libxml2/xpath2.res
-emul/netbsd32/share/examples/libxml2/testHTML.c
-emul/netbsd32/share/examples/libxml2/testSAX.c
-emul/netbsd32/share/examples/libxml2/testXPath.c
-emul/netbsd32/share/examples/libxml2/xmllint.c
-emul/netbsd32/share/gtk-doc/html/libxml2/general.html
-emul/netbsd32/share/gtk-doc/html/libxml2/home.png
-emul/netbsd32/share/gtk-doc/html/libxml2/index.html
-emul/netbsd32/share/gtk-doc/html/libxml2/left.png
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-DOCBparser.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-HTMLparser.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-HTMLtree.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-SAX.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-SAX2.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-c14n.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-catalog.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-chvalid.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-debugXML.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-dict.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-encoding.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-entities.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-globals.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-hash.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-list.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-nanoftp.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-nanohttp.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-parser.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-parserInternals.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-pattern.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-relaxng.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-schemasInternals.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-schematron.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-threads.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-tree.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-uri.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-valid.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xinclude.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xlink.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlIO.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlautomata.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlerror.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlexports.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlmemory.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlmodule.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlreader.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlregexp.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlsave.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlschemas.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlschemastypes.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlstring.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlunicode.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlversion.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xmlwriter.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xpath.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xpathInternals.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2-xpointer.html
-emul/netbsd32/share/gtk-doc/html/libxml2/libxml2.devhelp
-emul/netbsd32/share/gtk-doc/html/libxml2/right.png
-emul/netbsd32/share/gtk-doc/html/libxml2/style.css
-emul/netbsd32/share/gtk-doc/html/libxml2/up.png
diff --git a/libxml2-32/TODO b/libxml2-32/TODO
deleted file mode 100644
index 2b01e5101a..0000000000
--- a/libxml2-32/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Please note that this package isn't functional yet.
-NetBSD make seems to be calling gmake with the wrong flags.
diff --git a/libxml2-32/buildlink3.mk b/libxml2-32/buildlink3.mk
deleted file mode 100644
index fd6d8b4512..0000000000
--- a/libxml2-32/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2012/06/14 07:39:37 sbd Exp $
-
-BUILDLINK_TREE+= compat32_libxml2
-
-.if !defined(compat32_libxml2_BUILDLINK3_MK)
-compat32_libxml2_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.compat32_libxml2+= compat32_libxml2>=2.6.2
-BUILDLINK_ABI_DEPENDS.compat32_libxml2+= compat32_libxml2>=2.8.0nb2
-#BUILDLINK_PKGSRCDIR.compat32_libxml2?= ../../textproc/compat32_libxml2
-BUILDLINK_PKGSRCDIR.compat32_libxml2?= ../../wip/libxml2-32/
-BUILDLINK_LIBDIRS.compat32_libxml2= emul/netbsd32/lib
-BUILDLINK_INCDIRS.compat32_libxml2= emul/netbsd32/include
-
-BUILDLINK_FILES.compat32_libxml2+= emul/netbsd32/bin/xml2-config
-
-USE_FEATURES+= glob
-
-# We need the non-compat version for headers.
-BUILDLINK_DEPMETHOD.libxml2+= build
-.include "../../textproc/libxml2/buildlink3.mk"
-
-.include "../../archivers/xz/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.endif # COMPAT32_LIBXML2_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -compat32_libxml2
diff --git a/libxml2-32/distinfo b/libxml2-32/distinfo
deleted file mode 100644
index 3ac758b439..0000000000
--- a/libxml2-32/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.130 2019/01/09 19:09:02 adam Exp $
-
-SHA1 (libxml2-2.9.9.tar.gz) = 96686d1dd9fddf3b35a28b1e2e4bbacac889add3
-RMD160 (libxml2-2.9.9.tar.gz) = a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21
-SHA512 (libxml2-2.9.9.tar.gz) = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
-Size (libxml2-2.9.9.tar.gz) = 5476717 bytes
-SHA1 (patch-Makefile.in) = e687eaa9805b855b0c8a944ec5c597bd34954472
-SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
-SHA1 (patch-configure) = a0df60b1a8609c185ed7d45a015eafdbfb6d6b41
-SHA1 (patch-doc_examples_Makefile.in) = 4eede9719724f94402e850ee6d6043a74aaf62b2
-SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
-SHA1 (patch-python_libxml.c) = cfa07b4f3dfddb501c2ba210bb32b8ee14e3df9d
-SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
-SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34
-SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
-SHA1 (patch-xmlcatalog.c) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
diff --git a/libxml2-32/options.mk b/libxml2-32/options.mk
deleted file mode 100644
index 15c408f639..0000000000
--- a/libxml2-32/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:03 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libxml2
-PKG_SUPPORTED_OPTIONS+= inet6
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
diff --git a/libxml2-32/patches/patch-Makefile.in b/libxml2-32/patches/patch-Makefile.in
deleted file mode 100644
index 2279fb18b2..0000000000
--- a/libxml2-32/patches/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
-
-Move EXAMPLES_DIR to fit pkgsrc.
-
---- Makefile.in.orig 2014-10-16 07:35:13.000000000 +0000
-+++ Makefile.in
-@@ -835,7 +835,7 @@ cmake_DATA = libxml2-config.cmake
- #
- BASE_DIR = $(datadir)/doc
- DOC_MODULE = libxml2-$(VERSION)
--EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
-+EXAMPLES_DIR = $(datadir)/examples/libxml2
-
- #
- # Coverage support, largely borrowed from libvirt
diff --git a/libxml2-32/patches/patch-catalog.c b/libxml2-32/patches/patch-catalog.c
deleted file mode 100644
index 1f1339f289..0000000000
--- a/libxml2-32/patches/patch-catalog.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-catalog.c,v 1.1 2019/01/09 19:09:03 adam Exp $
-
-Parametrize XML and SGML catalog directories.
-
---- catalog.c.orig 2014-10-03 11:28:05.000000000 +0000
-+++ catalog.c
-@@ -70,10 +70,10 @@
- #define XML_URN_PUBID "urn:publicid:"
- #define XML_CATAL_BREAK ((xmlChar *) -1)
- #ifndef XML_XML_DEFAULT_CATALOG
--#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
-+#define XML_XML_DEFAULT_CATALOG "file://@@XML_DEFAULT_CATALOG@@"
- #endif
- #ifndef XML_SGML_DEFAULT_CATALOG
--#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
-+#define XML_SGML_DEFAULT_CATALOG "file://@@SGML_DEFAULT_CATALOG@@"
- #endif
-
- #if defined(_WIN32) && defined(_MSC_VER)
diff --git a/libxml2-32/patches/patch-configure b/libxml2-32/patches/patch-configure
deleted file mode 100644
index a980d819c8..0000000000
--- a/libxml2-32/patches/patch-configure
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2019/01/09 19:09:03 adam Exp $
-
-Various configure fixes:
- * Add run-path to XML_LIBDIR
- * Fix handling of pthreads
- * Add portability to OpenBSD, MirBSD, FreeBSD, NetBSD and DragonFly
- * Fix test for SAX
- Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859
-
---- configure.orig 2017-11-02 20:16:48.000000000 +0000
-+++ configure
-@@ -15084,7 +15084,7 @@ fi
- fi
-
-
--XML_LIBDIR='-L${libdir}'
-+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}'
- XML_INCLUDEDIR='-I${includedir}/libxml2'
-
- XML_CFLAGS=""
-@@ -15557,13 +15557,13 @@ else
- if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
- ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
- if test "x$ac_cv_header_pthread_h" = xyes; then :
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
--$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+$as_echo_n "checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if ${ac_cv_lib_pthread_pthread_join+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -15595,7 +15595,7 @@ fi
- $as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
-
-- THREAD_LIBS="-lpthread"
-+ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-
- $as_echo "#define HAVE_LIBPTHREAD /**/" >>confdefs.h
-
-@@ -15617,12 +15617,12 @@ fi
- *beos*) WITH_THREADS="1"
- THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
- ;;
-- *linux*)
-+ *linux* | *openbsd* | *mirbsd*)
- if test "${GCC}" = "yes" ; then
- GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
- GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
- GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'`
-- if test "${THREAD_LIBS}" = "-lpthread" ; then
-+ if test "${THREAD_LIBS}" = "${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ; then
- if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
- then
- THREAD_LIBS=""
-@@ -15639,6 +15639,10 @@ fi
- fi
- fi
- ;;
-+ *freebsd* | *netbsd* | *dragonfly*)
-+ THREAD_LIBS=""
-+ BASE_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+ ;;
- esac
- if test "$WITH_THREADS" = "1" ; then
- THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
-@@ -15909,7 +15913,7 @@ else
- TEST_SAX=SAXtests
- fi
-
-- if test "${WITH_TRIO}" = "1"; then
-+ if test "${WITH_SAX1}" = "1"; then
- WITH_SAX1_SOURCES_TRUE=
- WITH_SAX1_SOURCES_FALSE='#'
- else
-@@ -16493,10 +16497,6 @@ case "$host" in
- CPPFLAGS="$CPPFLAGS -DWIN32"
- WIN32_EXTRA_LIBADD="-lws2_32"
- WIN32_EXTRA_LDFLAGS="-no-undefined"
-- if test "${PYTHON}" != ""
-- then
-- WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"
-- fi
- ;;
- *-*-cygwin*)
- CYGWIN_EXTRA_LDFLAGS="-no-undefined"
diff --git a/libxml2-32/patches/patch-doc_examples_Makefile.in b/libxml2-32/patches/patch-doc_examples_Makefile.in
deleted file mode 100644
index aff40822b8..0000000000
--- a/libxml2-32/patches/patch-doc_examples_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_examples_Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
-
-Don't install html files.
-
---- doc/examples/Makefile.in.orig 2014-10-16 07:35:13.000000000 +0000
-+++ doc/examples/Makefile.in
-@@ -916,7 +916,7 @@ uninstall-am:
-
- install-data-local:
- $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
-- -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
-+ -$(INSTALL) -m 0644 $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
-
- clean-local:
- test -f Makefile.am || rm -f test?.xml
diff --git a/libxml2-32/patches/patch-encoding.c b/libxml2-32/patches/patch-encoding.c
deleted file mode 100644
index 7a8e93409f..0000000000
--- a/libxml2-32/patches/patch-encoding.c
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD$
-
-Avoid potential undefined behaviour by casting arg to toupper()
-to an appropriate value range.
-https://bugzilla.gnome.org/show_bug.cgi?id=766838
-
-Also, on NetBSD, add CP1141 encoding alias.
-
---- encoding.c.orig 2016-05-23 07:25:25.000000000 +0000
-+++ encoding.c
-@@ -1018,7 +1018,7 @@ xmlGetEncodingAlias(const char *alias) {
- return(NULL);
-
- for (i = 0;i < 99;i++) {
-- upper[i] = toupper(alias[i]);
-+ upper[i] = toupper((unsigned char)alias[i]);
- if (upper[i] == 0) break;
- }
- upper[i] = 0;
-@@ -1053,7 +1053,7 @@ xmlAddEncodingAlias(const char *name, co
- return(-1);
-
- for (i = 0;i < 99;i++) {
-- upper[i] = toupper(alias[i]);
-+ upper[i] = toupper((unsigned char)alias[i]);
- if (upper[i] == 0) break;
- }
- upper[i] = 0;
-@@ -1155,7 +1155,7 @@ xmlParseCharEncoding(const char* name)
- name = alias;
-
- for (i = 0;i < 499;i++) {
-- upper[i] = toupper(name[i]);
-+ upper[i] = toupper((unsigned char)name[i]);
- if (upper[i] == 0) break;
- }
- upper[i] = 0;
-@@ -1331,7 +1331,7 @@ xmlNewCharEncodingHandler(const char *na
- return(NULL);
- }
- for (i = 0;i < 499;i++) {
-- upper[i] = toupper(name[i]);
-+ upper[i] = toupper((unsigned char)name[i]);
- if (upper[i] == 0) break;
- }
- upper[i] = 0;
-@@ -1433,6 +1433,9 @@ xmlInitCharEncodingHandlers(void) {
- xmlRegisterCharEncodingHandlersISO8859x ();
- #endif
- #endif
-+#ifdef __NetBSD__ /* XXX needed by selftest */
-+ xmlAddEncodingAlias("CP1141", "IBM-1141");
-+#endif
-
- }
-
-@@ -1660,7 +1663,7 @@ xmlFindCharEncodingHandler(const char *n
- * Check first for directly registered encoding names
- */
- for (i = 0;i < 99;i++) {
-- upper[i] = toupper(name[i]);
-+ upper[i] = toupper((unsigned char)name[i]);
- if (upper[i] == 0) break;
- }
- upper[i] = 0;
diff --git a/libxml2-32/patches/patch-python_libxml.c b/libxml2-32/patches/patch-python_libxml.c
deleted file mode 100644
index 9fdc6f689f..0000000000
--- a/libxml2-32/patches/patch-python_libxml.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-python_libxml.c,v 1.1 2019/01/09 13:40:50 wiz Exp $
-
-Avoid returning invalid UTF-8 strings to python.
-Based on https://bugzilla.opensuse.org/attachment.cgi?id=746044&action=edit
-Fixes https://github.com/itstool/itstool/issues/22
-
---- python/libxml.c.orig 2016-06-07 10:04:14.000000000 +0000
-+++ python/libxml.c
-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- PyObject *message;
- PyObject *result;
- char str[1000];
-+ unsigned char *ptr = (unsigned char *)str;
-
- #ifdef DEBUG_ERROR
- printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
-@@ -1636,10 +1637,14 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- str[999] = 0;
- va_end(ap);
-
-+ /* Ensure the error string doesn't start at UTF8 continuation. */
-+ while (*ptr && (*ptr & 0xc0) == 0x80)
-+ ptr++;
-+
- list = PyTuple_New(2);
- PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
- Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
-- message = libxml_charPtrConstWrap(str);
-+ message = libxml_charPtrConstWrap(ptr);
- PyTuple_SetItem(list, 1, message);
- result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
- Py_XDECREF(list);
diff --git a/libxml2-32/patches/patch-python_libxml.py b/libxml2-32/patches/patch-python_libxml.py
deleted file mode 100644
index 35ec35e423..0000000000
--- a/libxml2-32/patches/patch-python_libxml.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-python_libxml.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $
-
---- python/libxml.py.orig 2004-09-28 05:59:58.000000000 -0500
-+++ python/libxml.py
-@@ -281,7 +281,7 @@ class xmlCore:
- # defined as python2 properties
- #
- import sys
-- if float(sys.version[0:3]) < 2.2:
-+ if float(sys.version[0:3].replace('p', '.')) < 2.2:
- def __getattr__(self, attr):
- if attr == "parent":
- ret = libxml2mod.parent(self._o)
diff --git a/libxml2-32/patches/patch-python_libxml2.py b/libxml2-32/patches/patch-python_libxml2.py
deleted file mode 100644
index c53582744b..0000000000
--- a/libxml2-32/patches/patch-python_libxml2.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-python_libxml2.py,v 1.1 2017/11/08 22:51:54 prlw1 Exp $
-
-name[0:8] will fail if name is None.
-https://bugzilla.gnome.org/show_bug.cgi?id=790071
-
---- python/libxml2.py.orig 2017-10-30 07:39:09.000000000 +0000
-+++ python/libxml2.py
-@@ -573,6 +573,8 @@ class xmlCoreBreadthFirstItertor:
- def nodeWrap(o):
- # TODO try to cast to the most appropriate node class
- name = libxml2mod.type(o)
-+ if name is None:
-+ return xmlNode(_obj=o)
- if name == "element" or name == "text":
- return xmlNode(_obj=o)
- if name == "attribute":
diff --git a/libxml2-32/patches/patch-python_setup.py b/libxml2-32/patches/patch-python_setup.py
deleted file mode 100644
index 1fce4eb304..0000000000
--- a/libxml2-32/patches/patch-python_setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-python_setup.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $
-
-Trust pkgsrc to know which iconv to use.
-It will be either in the buildlink directory, or in the compiler's
-default search path.
-
---- python/setup.py.orig 2014-10-16 07:35:21.000000000 +0000
-+++ python/setup.py
-@@ -56,11 +56,7 @@ else:
- # - iconv.h
- # - libxslt/xsltconfig.h
- includes_dir = [
--"/usr/include",
--"/usr/local/include",
--"/opt/include",
--os.path.join(ROOT,'include'),
--HOME
-+os.path.join(ROOT,'include')
- ];
-
- xml_includes=""
-@@ -73,11 +69,7 @@ if xml_includes == "":
- print("failed to find headers for libxml2: update includes_dir")
- sys.exit(1)
-
--iconv_includes=""
--for dir in includes_dir:
-- if not missing(dir + "/iconv.h"):
-- iconv_includes=dir
-- break;
-+iconv_includes=os.path.join(ROOT,'include')
-
- if iconv_includes == "":
- print("failed to find headers for libiconv: update includes_dir")
diff --git a/libxml2-32/patches/patch-xmlcatalog.c b/libxml2-32/patches/patch-xmlcatalog.c
deleted file mode 100644
index ad071353a4..0000000000
--- a/libxml2-32/patches/patch-xmlcatalog.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-xmlcatalog.c,v 1.1 2019/01/09 19:09:03 adam Exp $
-
-Parametrize SGML catalog directory.
-
---- xmlcatalog.c.orig 2014-10-03 11:28:06.000000000 +0000
-+++ xmlcatalog.c
-@@ -43,7 +43,7 @@ static char *filename = NULL;
-
-
- #ifndef XML_SGML_DEFAULT_CATALOG
--#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
-+#define XML_SGML_DEFAULT_CATALOG "@@SGML_DEFAULT_CATALOG@@"
- #endif
-
- /************************************************************************
Home |
Main Index |
Thread Index |
Old Index