diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index f8ef8fc3e93e..7ddc915ee053 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,57 +1,44 @@
 PORTNAME=	libxml2
 DISTVERSION=	2.10.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT?=	XML parser library for GNOME
-WWW=		http://xmlsoft.org/
+WWW=		https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
 
 LICENSE=	MIT
 
-# Upstream offers CMake in addition to autotools, but we use the latter.
-# CMake is a heavy build system, heavier than autotools, and this
-# port has many consumers of its core functionality. Some such
-# consumers, especially when optioned appropriately (and users have
-# a right to do so), may become dependencies of dependencies of CMake.
-# Additionally, some consumers rely on symbol versioning that CMake
-# does not support (as of Q2 2022) without a hack. Please consider the
-# effects of the ecosystem and technical merits before considering
-# switching build systems again. Any changes to this end not dogfooded
-# thoroughly may be reverted.
-USES+=		cpe iconv libtool localbase pathfix pkgconfig tar:xz
+USES+=		cmake cpe iconv localbase:ldflags pathfix pkgconfig tar:xz
+
 CPE_VENDOR=	xmlsoft
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
-
 PLIST_SUB+=	LIBVERSION=${DISTVERSION}
 
+CMAKE_ARGS=	-DCMAKE_INSTALL_SYSCONFDIR:PATH=share
+
 # Don't build with Python support unless requested
-CONFIGURE_ARGS=		--sysconfdir=${PREFIX}/share/ \
-			--with-lzma=/usr \
-			--${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U}
+CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON
 
-OPTIONS_DEFINE=	DOCS ICU MEM_DEBUG READLINE STATIC THREAD_ALLOC
-OPTIONS_DEFAULT=	READLINE STATIC
+OPTIONS_DEFINE=		DOCS ICU MEM_DEBUG READLINE TEST THREAD_ALLOC
+OPTIONS_DEFAULT=	READLINE
 OPTIONS_SUB=		yes
 
 MEM_DEBUG_DESC=		Memory debugging (DEVELOPERS ONLY!)
-READLINE_DESC=		History for xmllint
 THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
+READLINE_DESC=		History for xmllint
 
-ICU_LIB_DEPENDS=		libicudata.so:devel/icu
-ICU_CONFIGURE_WITH=		icu
-MEM_DEBUG_CONFIGURE_WITH=	mem-debug
-READLINE_LIB_DEPENDS=		libreadline.so:devel/readline
-READLINE_CONFIGURE_WITH=	history \
-				readline
-STATIC_CONFIGURE_ENABLE=	static
-THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
+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
 
 post-patch:
 .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
@@ -63,12 +50,7 @@ post-patch:
 
 .if !defined(LIBXML2_SLAVE)
 post-install:
-# 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}
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libxml2.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libxml2.so.2
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 8708a2128f23..b31ae6fa7694 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661883646
-SHA256 (gnome/libxml2-2.10.2.tar.xz) = d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265
-SIZE (gnome/libxml2-2.10.2.tar.xz) = 2636304
+TIMESTAMP = 1662672380
+SHA256 (gnome2/libxml2-2.10.2.tar.xz) = d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265
+SIZE (gnome2/libxml2-2.10.2.tar.xz) = 2636304
diff --git a/textproc/libxml2/files/patch-Makefile.in b/textproc/libxml2/files/patch-Makefile.in
deleted file mode 100644
index 5142015394f5..000000000000
--- a/textproc/libxml2/files/patch-Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.in.orig	2022-08-25 18:24:09 UTC
-+++ Makefile.in
-@@ -708,7 +708,7 @@ runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
- m4data_DATA = libxml.m4
- runtest_SOURCES = runtest.c
- runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
--runtest_LDFLAGS = 
-+runtest_LDFLAGS = -pthread
- runtest_DEPENDENCIES = $(DEPS)
- runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
- testrecurse_SOURCES = testrecurse.c
-@@ -741,7 +741,7 @@ testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
- xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
- testThreads_SOURCES = testThreads.c
- testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS)
--testThreads_LDFLAGS = 
-+testThreads_LDFLAGS = -pthread
- testThreads_DEPENDENCIES = $(DEPS)
- testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS)
- testAutomata_SOURCES = testAutomata.c
-@@ -1146,7 +1146,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@
-@@ -1898,7 +1898,7 @@ check: check-recursive
- 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
- 	$(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-recursive
--all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
- 		config.h
- install-binPROGRAMS: install-libLTLIBRARIES
- 
diff --git a/textproc/libxml2/files/patch-config.h.in b/textproc/libxml2/files/patch-config.h.in
deleted file mode 100644
index 0ac56e4df62f..000000000000
--- a/textproc/libxml2/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig	2022-08-25 11:16:02 UTC
-+++ config.h.in
-@@ -3,6 +3,9 @@
- /* A form that will not confuse apibuild.py */
- #undef ATTRIBUTE_DESTRUCTOR
- 
-+/* XXX */
-+#define HAVE_VFSCANF
-+
- /* Type cast for the gethostbyname() argument */
- #undef GETHOSTBYNAME_ARG_CAST
- 
diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure
deleted file mode 100644
index 72722092990b..000000000000
--- a/textproc/libxml2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2022-08-25 11:16:02 UTC
-+++ configure
-@@ -15204,6 +15204,8 @@ fi
- 	       fi
- 	   fi
-        ;;
-+       *freebsd*) THREAD_LIBS=""
-+       ;;
-     esac
-     if test "$WITH_THREADS" = "1" ; then
- 	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 382f8b64fe39..e1f82d95ac9e 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -47,20 +47,69 @@ include/libxml2/libxml/xmlwriter.h
 include/libxml2/libxml/xpath.h
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
-lib/cmake/libxml2/libxml2-config.cmake
-%%STATIC%%lib/libxml2.a
+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%%
 libdata/pkgconfig/libxml-2.0.pc
-man/man1/xml2-config.1.gz
-man/man1/xmlcatalog.1.gz
-man/man1/xmllint.1.gz
 share/aclocal/libxml.m4
+share/man/man1/xml2-config.1.gz
+share/man/man1/xmlcatalog.1.gz
+share/man/man1/xmllint.1.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%%/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/catalog.gif
+%%PORTDOCS%%%%DOCSDIR%%/catalog.html
+%%PORTDOCS%%%%DOCSDIR%%/contribs.html
 %%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html
 %%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png
 %%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
@@ -111,6 +160,11 @@ share/aclocal/libxml.m4
 %%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%%/encoding.html
+%%PORTDOCS%%%%DOCSDIR%%/entities.html
+%%PORTDOCS%%%%DOCSDIR%%/example.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/index.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
@@ -125,9 +179,79 @@ share/aclocal/libxml.m4
 %%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c
-%%PORTDOCS%%%%DOCSDIR%%/examples/xmllint.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c
+%%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%%/interface.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/library.html
+%%PORTDOCS%%%%DOCSDIR%%/libxml.gif
+%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/news.html
+%%PORTDOCS%%%%DOCSDIR%%/python.html
+%%PORTDOCS%%%%DOCSDIR%%/redhat.gif
+%%PORTDOCS%%%%DOCSDIR%%/search.php
+%%PORTDOCS%%%%DOCSDIR%%/searches.html
+%%PORTDOCS%%%%DOCSDIR%%/smallfootonly.gif
+%%PORTDOCS%%%%DOCSDIR%%/structure.gif
+%%PORTDOCS%%%%DOCSDIR%%/threads.html
+%%PORTDOCS%%%%DOCSDIR%%/tree.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html
@@ -177,5 +301,12 @@ share/aclocal/libxml.m4
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/w3c.png
+%%PORTDOCS%%%%DOCSDIR%%/xml.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog_man.html
+%%PORTDOCS%%%%DOCSDIR%%/xmldtd.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlio.html
 %%PORTDOCS%%%%DOCSDIR%%/xmllint.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlmem.html
+%%PORTDOCS%%%%DOCSDIR%%/xmlreader.html
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index e2bacff19239..5ab3f21ebf90 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,32 +1,43 @@
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python interface for XML parser library for GNOME
-WWW=		http://xmlsoft.org/
 MASTERDIR=	${.CURDIR}/../libxml2
 
-USES+=		gettext-runtime gnome python shebangfix
+USES+=		gnome python shebangfix
 USE_GNOME=	libxml2
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	flavors
 SHEBANG_FILES=	*.py doc/*.py python/*.py python/tests/*.py
 
-OPTIONS_EXCLUDE=	${OPTIONS_DEFINE}
+# Help CMake determine the correct version of Python if
+# multiple versions are installed
+CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
+
+OPTIONS_SLAVE=	${OPTIONS_DEFINE:NTEST}
 
 # 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/py-libxml2
-EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2
-
-#do-configure:
+PLIST_FILES=	${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
+		${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2.cpython-${PYTHON_SUFFIX}.pyc \
+		${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
+		${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.pyc \
+		${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}
+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${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"