summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile2
-rw-r--r--textproc/comrak/Makefile3
-rw-r--r--textproc/comrak/distinfo6
-rw-r--r--textproc/html-pretty/Makefile5
-rw-r--r--textproc/html-pretty/distinfo5
-rw-r--r--textproc/html-pretty/pkg-plist2
-rw-r--r--textproc/itstool/Makefile6
-rw-r--r--textproc/libxml2-python/Makefile32
-rw-r--r--textproc/libxml2-python/pkg-descr (renamed from textproc/py-libxml2/pkg-descr)0
-rw-r--r--textproc/libxml2/Makefile77
-rw-r--r--textproc/libxml2/distinfo16
-rw-r--r--textproc/libxml2/files/patch-CMakeLists.txt33
-rw-r--r--textproc/libxml2/files/patch-uri.c25
-rw-r--r--textproc/libxml2/pkg-plist82
-rw-r--r--textproc/py-libxml2/Makefile32
-rw-r--r--textproc/py-libxml2/pkg-plist7
16 files changed, 99 insertions, 234 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index f1f4b3ce0604..21abfbea3743 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -423,6 +423,7 @@
SUBDIR += libxml++26
SUBDIR += libxml++30
SUBDIR += libxml2
+ SUBDIR += libxml2-python
SUBDIR += libxmlb
SUBDIR += libxmlbird
SUBDIR += libxode
@@ -1427,7 +1428,6 @@
SUBDIR += py-language-data
SUBDIR += py-laserhammer
SUBDIR += py-latexcodec
- SUBDIR += py-libxml2
SUBDIR += py-license-expression
SUBDIR += py-line-protocol-parser
SUBDIR += py-linkify-it-py
diff --git a/textproc/comrak/Makefile b/textproc/comrak/Makefile
index bac5e4bcb5de..d8b18c8bdf25 100644
--- a/textproc/comrak/Makefile
+++ b/textproc/comrak/Makefile
@@ -1,7 +1,6 @@
PORTNAME= comrak
DISTVERSIONPREFIX= v
-DISTVERSION= 0.39.0
-PORTREVISION= 1
+DISTVERSION= 0.39.1
CATEGORIES= textproc
MAINTAINER= yuri@FreeBSD.org
diff --git a/textproc/comrak/distinfo b/textproc/comrak/distinfo
index 2225ca10bb6a..86796b41e2f7 100644
--- a/textproc/comrak/distinfo
+++ b/textproc/comrak/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1748373616
+TIMESTAMP = 1751100862
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
SIZE (rust/crates/adler-1.0.2.crate) = 12778
SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
@@ -279,5 +279,5 @@ SHA256 (rust/crates/xml-rs-0.8.14.crate) = 52839dc911083a8ef63efa4d039d1f58b5e40
SIZE (rust/crates/xml-rs-0.8.14.crate) = 51905
SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
-SHA256 (kivikakk-comrak-v0.39.0_GH0.tar.gz) = a8e1ca07ea266b4b5e1d568f1cb8ecabcb59fcdcd1517c0e1b49f07652d38df1
-SIZE (kivikakk-comrak-v0.39.0_GH0.tar.gz) = 358466
+SHA256 (kivikakk-comrak-v0.39.1_GH0.tar.gz) = 53514dba5c0df9dc734825d5e8a29f0ff0b4c7d0edc9d521cdd8a5fc66285dae
+SIZE (kivikakk-comrak-v0.39.1_GH0.tar.gz) = 358616
diff --git a/textproc/html-pretty/Makefile b/textproc/html-pretty/Makefile
index 96e122bc0eff..83ef1a9f6bb8 100644
--- a/textproc/html-pretty/Makefile
+++ b/textproc/html-pretty/Makefile
@@ -1,11 +1,10 @@
PORTNAME= html-pretty
-PORTVERSION= 1.01
-PORTREVISION= 2
+PORTVERSION= 1.02
CATEGORIES= textproc www
MASTER_SITES= http://ftp.math.utah.edu:80/pub/sgml/
DISTNAME= htmlpty-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= atanubiswas484@gmail.com
COMMENT= HTML and SGML prettyprinter and text-to-HTML/SGML converter
WWW= http://www.math.utah.edu/~beebe/software/html-sgml-tools.html #html-pretty
diff --git a/textproc/html-pretty/distinfo b/textproc/html-pretty/distinfo
index 8fb78a57db1b..68b699b50316 100644
--- a/textproc/html-pretty/distinfo
+++ b/textproc/html-pretty/distinfo
@@ -1,2 +1,3 @@
-SHA256 (htmlpty-1.01.tar.gz) = ccfcaa292d8d0d1d94ebd8a1525db38e07baad45615fdea7856a80e67631f92e
-SIZE (htmlpty-1.01.tar.gz) = 1439839
+TIMESTAMP = 1751064799
+SHA256 (htmlpty-1.02.tar.gz) = d00d5432f5f55127af2d81faf8290e4b471f46032f290e03d16755a39c280239
+SIZE (htmlpty-1.02.tar.gz) = 2419103
diff --git a/textproc/html-pretty/pkg-plist b/textproc/html-pretty/pkg-plist
index b8992e5b277c..2754a253deba 100644
--- a/textproc/html-pretty/pkg-plist
+++ b/textproc/html-pretty/pkg-plist
@@ -1,5 +1,4 @@
bin/html-pretty
-share/man/man1/html-pretty.1.gz
%%DATADIR%%/catalog
%%DATADIR%%/cougar.sty
%%DATADIR%%/dtd.sty
@@ -8,3 +7,4 @@ share/man/man1/html-pretty.1.gz
%%DATADIR%%/html-32.sty
%%DATADIR%%/html-40.sty
%%DATADIR%%/html-all.sty
+share/man/man1/html-pretty.1.gz
diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile
index b1b016dd03aa..ed5fbd914450 100644
--- a/textproc/itstool/Makefile
+++ b/textproc/itstool/Makefile
@@ -1,6 +1,6 @@
PORTNAME= itstool
PORTVERSION= 2.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://files.itstool.org/itstool/
@@ -10,8 +10,8 @@ WWW= https://itstool.org/
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2-python>0:textproc/libxml2-python@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2-python>0:textproc/libxml2-python@${PY_FLAVOR}
USES= python tar:bzip2
GNU_CONFIGURE= yes
diff --git a/textproc/libxml2-python/Makefile b/textproc/libxml2-python/Makefile
new file mode 100644
index 000000000000..9a6133ac7414
--- /dev/null
+++ b/textproc/libxml2-python/Makefile
@@ -0,0 +1,32 @@
+PORTNAME= libxml2-python
+PORTREVISION= 0
+CATEGORIES= textproc gnome python
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+COMMENT= Python interface for XML parser library for GNOME
+MASTERDIR= ${.CURDIR}/../libxml2
+
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+
+USES+= gettext-runtime gnome python shebangfix
+USE_GNOME= libxml2
+USE_PYTHON= autoplist distutils # generator.py not found in PEP-517 environment
+SHEBANG_GLOB= *.py*
+
+OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} ${OPTIONS_GROUP_LEGACY}
+
+# Tell master port we're a slave port
+LIBXML2_SLAVE= python
+# Grab pkg-descr from slave port
+DESCR= ${.CURDIR}/pkg-descr
+
+BUILD_WRKSRC= ${WRKSRC}/python
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+# Don't append pkg-plist from master port
+PLIST=
+
+DOCSDIR= ${PREFIX}/share/doc/libxml2-python
+EXAMPLESDIR= ${PREFIX}/share/examples/libxml2-python
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py-libxml2/pkg-descr b/textproc/libxml2-python/pkg-descr
index fabac31c6803..fabac31c6803 100644
--- a/textproc/py-libxml2/pkg-descr
+++ b/textproc/libxml2-python/pkg-descr
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 67c3243418bf..7f2922589d85 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,14 +1,14 @@
-PORTNAME= libxml2
-DISTVERSION= 2.11.9
-PORTREVISION?= 1
+PORTNAME?= libxml2
+DISTVERSION= 2.14.4
+PORTREVISION?= 0
CATEGORIES?= textproc gnome
MASTER_SITES= GNOME
+DISTNAME= libxml2-${DISTVERSION}
DIST_SUBDIR= gnome
-PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
-PATCHFILES+= 245b70d7d2768572ae1b05b3668ca858b9ec4ed4.patch:-p1 # CVE-2024-56171
-PATCHFILES+= 858ca26c0689161a6b903a6682cc8a1cc10a0ea8.patch:-p1 # CVE-2025-24928
-PATCHFILES+= d7657811964eac1cb9743bb98649278ad948f0d2.patch:-p1 # CVE-2025-32414
+PATCH_SITES= https://gitlab.gnome.org/GNOME/libxml2/-/commit/
+PATCHFILES= cf52139b4170be13b51b62da11c208dc66e6eff0.patch:-p1 \
+ 356542324fa439de544b5e419b91ae68d42c306c.patch:-p1
MAINTAINER= desktop@FreeBSD.org
COMMENT?= XML parser library for GNOME
@@ -16,40 +16,40 @@ WWW= http://xmlsoft.org/
LICENSE= MIT
-USES+= cmake:testing cpe iconv localbase:ldflags pathfix \
- pkgconfig tar:xz
+# Upstream recommends autotools on Unix-like systems
+USES+= cpe gmake iconv libtool localbase pathfix pkgconfig tar:xz
CPE_VENDOR= xmlsoft
USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
# Don't build with Python support unless requested
-CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/ \
+ --with-lzma=/usr \
+ --${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}
-# Many symbols in the linker version script libxml2.syms are only defined when
-# --with-xptr-locs is enabled at configure time. Suppress errors with lld >= 17
-# due to these undefined symbols.
-LDFLAGS+= -Wl,--undefined-version
+INSTALL_TARGET= install-strip
+TEST_TARGET= check
-CMAKE_TESTING_ON= LIBXML2_WITH_TESTS
-
-CMAKE_ARGS= -DCMAKE_INSTALL_SYSCONFDIR=share
-CMAKE_OFF+= LIBXML2_WITH_TESTS
-
-PLIST_SUB+= LIBVERSION=${DISTVERSION}
-
-OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC
-OPTIONS_DEFAULT= READLINE
+OPTIONS_DEFINE= DOCS ICU READLINE STATIC THREAD_ALLOC
+OPTIONS_GROUP= LEGACY
+OPTIONS_GROUP_LEGACY= HTTP LZMA ZLIB
+OPTIONS_DEFAULT= HTTP LZMA READLINE STATIC ZLIB
OPTIONS_SUB= yes
-MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
+HTTP_DESC= HTTP support
+LEGACY_DESC= Enable legacy API compatibility
READLINE_DESC= History for xmllint
THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
-ICU_LIB_DEPENDS= libicudata.so:devel/icu
-ICU_CMAKE_BOOL= LIBXML2_WITH_ICU
-MEM_DEBUG_CONFIGURE_WITH= LIBXML2_WITH_MEM_DEBUG
+HTTP_CONFIGURE_WITH= http
+ICU_LIB_DEPENDS= libicuuc.so:devel/icu
+ICU_CONFIGURE_WITH= icu
+LZMA_CONFIGURE_WITH= lzma
READLINE_LIB_DEPENDS= libreadline.so:devel/readline
-READLINE_CMAKE_OFF= -DHAVE_LIBHISTORY=false \
- -DHAVE_LIBREADLINE=false
-THREAD_ALLOC_CMAKE_BOOL= LIBXML2_WITH_THREAD_ALLOC
+READLINE_CONFIGURE_WITH= history \
+ readline
+STATIC_CONFIGURE_ENABLE= static
+THREAD_ALLOC_CONFIGURE_WITH= thread-alloc
+ZLIB_CONFIGURE_WITH= zlib
post-patch:
@${REINPLACE_CMD} -e \
@@ -58,14 +58,15 @@ post-patch:
${WRKSRC}/doc/xmllint.1
post-install:
-.if defined(LIBXML2_SLAVE)
- ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod.so
- ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
- -f -d ${PYTHONPREFIX_SITELIBDIR} \
- ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
- ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
- -f -d ${PYTHONPREFIX_SITELIBDIR} \
- ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+.if !defined(LIBXML2_SLAVE)
+# Documentation should be in DOCSDIR
+ @${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \
+ ${STAGEDIR}${DOCSDIR}/devhelp
+ @${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
+# Install remaining documentation that's not connected to autotools
+ ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+.else
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod${PYTHON_SOABI}.so
.endif
.include <bsd.port.mk>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index fc9a1ddad574..ef0292e239d7 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1750532030
-SHA256 (gnome/libxml2-2.11.9.tar.xz) = 780157a1efdb57188ec474dca87acaee67a3a839c2525b2214d318228451809f
-SIZE (gnome/libxml2-2.11.9.tar.xz) = 2627500
-SHA256 (gnome/245b70d7d2768572ae1b05b3668ca858b9ec4ed4.patch) = 5fb5bed3c40fee5ecb60dbf96fd6c5071f08a54487f534540c54bc9cb6d5b16e
-SIZE (gnome/245b70d7d2768572ae1b05b3668ca858b9ec4ed4.patch) = 1273
-SHA256 (gnome/858ca26c0689161a6b903a6682cc8a1cc10a0ea8.patch) = e3585a9e59f3146a53a1091fd00378e81676a824feab037cd8d71807cea73c73
-SIZE (gnome/858ca26c0689161a6b903a6682cc8a1cc10a0ea8.patch) = 1806
-SHA256 (gnome/d7657811964eac1cb9743bb98649278ad948f0d2.patch) = 3d7e10866d8be511da64bee6a998c4f68785326bf0d403af7be6745830d9bca2
-SIZE (gnome/d7657811964eac1cb9743bb98649278ad948f0d2.patch) = 2526
+TIMESTAMP = 1751123750
+SHA256 (gnome/libxml2-2.14.4.tar.xz) = 24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773
+SIZE (gnome/libxml2-2.14.4.tar.xz) = 2325848
+SHA256 (gnome/cf52139b4170be13b51b62da11c208dc66e6eff0.patch) = 2bfdc80a1adc089776a0ce687dd88e3e6e1ab711e6d3cf4182f2034d4be85a83
+SIZE (gnome/cf52139b4170be13b51b62da11c208dc66e6eff0.patch) = 1380
+SHA256 (gnome/356542324fa439de544b5e419b91ae68d42c306c.patch) = 59c182721e7c2d1cea77246115dd092ac29201b4699bd82892ed1e9cd25f2471
+SIZE (gnome/356542324fa439de544b5e419b91ae68d42c306c.patch) = 745
diff --git a/textproc/libxml2/files/patch-CMakeLists.txt b/textproc/libxml2/files/patch-CMakeLists.txt
deleted file mode 100644
index 6926e72e1e54..000000000000
--- a/textproc/libxml2/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- CMakeLists.txt.orig 2023-08-11 18:59:11 UTC
-+++ CMakeLists.txt
-@@ -395,13 +395,17 @@ if(LIBXML2_WITH_ICU)
- if(WIN32)
- set(ICU_LIBS "-licudt -licuin -licuuc")
- else()
-- set(ICU_LIBS "-licudata -licui18n -licuuc")
-+ set(ICU_LIBS_DIR "${ICU_INCLUDE_DIRS}")
-+ STRING(REGEX REPLACE "include" "lib" ICU_LIBS_DIR ${ICU_LIBS_DIR})
-+ set(ICU_LIBS "-L${ICU_LIBS_DIR} -licudata -licui18n -licuuc")
- endif()
- endif()
-
- if(LIBXML2_WITH_LZMA)
- target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)
-- set(LZMA_LIBS "-llzma")
-+ set(LZMA_LIBS_DIR "${LIBLZMA_INCLUDE_DIRS}")
-+ STRING(REGEX REPLACE "include" "lib" LZMA_LIBS_DIR ${LZMA_LIBS_DIR})
-+ set(LZMA_LIBS "-L${LZMA_LIBS_DIR} -llzma")
- endif()
-
- if(LIBXML2_WITH_THREADS)
-@@ -411,7 +415,9 @@ endif()
-
- if(LIBXML2_WITH_ZLIB)
- target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
-- set(Z_LIBS "-lz")
-+ set(Z_LIBS_DIR "${ZLIB_INCLUDE_DIRS}")
-+ STRING(REGEX REPLACE "include" "lib" Z_LIBS_DIR ${Z_LIBS_DIR})
-+ set(Z_LIBS "-L${Z_LIBS_DIR} -lz")
- endif()
-
- set_target_properties(
diff --git a/textproc/libxml2/files/patch-uri.c b/textproc/libxml2/files/patch-uri.c
deleted file mode 100644
index 82b06581c80e..000000000000
--- a/textproc/libxml2/files/patch-uri.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Revert the following commit, it makes the freebsd doc chain fail.
-
-From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001
-From: Dennis Filder <d.filder@web.de>
-Date: Fri, 13 Jun 2014 14:56:14 +0800
-Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=731063
-
-xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns
-bogus values when called with URIs that have rootless paths
-(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
-correct)
-
---- uri.c.orig 2019-10-22 18:46:01 UTC
-+++ uri.c
-@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) {
- if (temp == NULL) goto mem_error;
- ret = temp;
- }
-+ ret[len++] = '/';
-+ ret[len++] = '/';
- }
- if (uri->path != NULL) {
- p = uri->path;
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 8d53acb96cd1..bfc48e35b5ff 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -47,18 +47,12 @@ include/libxml2/libxml/xmlwriter.h
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/cmake/libxml2/libxml2-config.cmake
+%%STATIC%%lib/libxml2.a
lib/libxml2.so
-lib/libxml2.so.2
-lib/libxml2.so.%%LIBVERSION%%
+lib/libxml2.so.16
+lib/libxml2.so.16.0.4
libdata/pkgconfig/libxml-2.0.pc
-share/man/man1/xml2-config.1.gz
-share/man/man1/xmlcatalog.1.gz
-share/man/man1/xmllint.1.gz
-share/aclocal/libxml.m4
%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html
@@ -113,70 +107,8 @@ share/aclocal/libxml.m4
%%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
%%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
-%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
-%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/parse1.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/parse2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/parse3.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/parse4.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apd.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ape.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apf.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apg.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/aph.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/api.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s04.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s05.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s06.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s07.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s08.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s09.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/blank.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/1.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/10.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/2.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/3.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/4.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/5.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/6.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/7.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/8.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/9.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/caution.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/draft.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/home.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/important.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/next.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/note.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/prev.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/tip.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-blank.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-minus.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-plus.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/up.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/warning.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddattribute.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddkeyword.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeconvert.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includegetattribute.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includekeyword.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog.html
%%PORTDOCS%%%%DOCSDIR%%/xmllint.html
+share/man/man1/xml2-config.1.gz
+share/man/man1/xmlcatalog.1.gz
+share/man/man1/xmllint.1.gz
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
deleted file mode 100644
index a9ff9bf0a9c7..000000000000
--- a/textproc/py-libxml2/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-PORTREVISION= 3
-CATEGORIES= textproc gnome python
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-
-COMMENT= Python interface for XML parser library for GNOME
-
-USES+= gnome python shebangfix
-USE_GNOME= libxml2
-USE_PYTHON= flavors
-SHEBANG_FILES= *.py doc/*.py python/*.py python/tests/*.py
-
-# Help CMake determine the correct version of Python if
-# multiple versions are installed
-CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD}
-
-MASTERDIR= ${.CURDIR}/../libxml2
-
-DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
-
-OPTIONS_EXCLUDE= ${OPTIONS_DEFINE}
-
-# Tell master port we're a slave port
-LIBXML2_SLAVE= python
-
-do-install:
- ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
- ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
- ${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py-libxml2/pkg-plist b/textproc/py-libxml2/pkg-plist
deleted file mode 100644
index caafa1626a8e..000000000000
--- a/textproc/py-libxml2/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PYTHON_SITELIBDIR%%/__pycache__/drv_libxml2%%PYTHON_TAG%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/drv_libxml2%%PYTHON_TAG%%.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/libxml2%%PYTHON_TAG%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/libxml2%%PYTHON_TAG%%.pyc
-%%PYTHON_SITELIBDIR%%/drv_libxml2.py
-%%PYTHON_SITELIBDIR%%/libxml2.py
-%%PYTHON_SITELIBDIR%%/libxml2mod.so