6 files changed, 57 insertions, 28 deletions
diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile
index 008b63dffe83..cf69e8ec9d40 100644
--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	librsvg
 DISTVERSION=	2.60.0
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2-rust
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libdav1d.so:multimedia/dav1d \
 TEST_DEPENDS=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
 
 USES=		cargo compiler:c11 cpe gettext gnome meson pkgconfig \
-		python:build shebangfix tar:xz vala:build
+		python:build shebangfix tar:xz
 CPE_VENDOR=	gnome
 SHEBANG_FILES=	meson/*.py \
 		benchmarks/*.py \
@@ -43,12 +43,17 @@ MAKE_ENV=       ${CARGO_ENV}
 
 MESON_ARGS=	-Dtests=true
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=		DOCS VAPI
+OPTIONS_DEFAULT=	VAPI
+OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	gi-docgen:textproc/py-gi-docgen
 DOCS_MESON_ENABLED=	docs
 
+VAPI_MESON_ENABLED=	vala
+VAPI_USES=		vala:build
+
 post-install-DOCS-off:
-	${LOCALBASE}/bin/rst2man --no-datestamp ${WRKSRC}/rsvg-convert.rst --output=${STAGEDIR}${PREFIX}/share/man/man1/rsvg-convert.1
+	${LOCALBASE}/bin/rst2man --no-datestamp ${WRKSRC}/rsvg-convert.rst > ${STAGEDIR}${PREFIX}/share/man/man1/rsvg-convert.1
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg2-rust/pkg-plist b/graphics/librsvg2-rust/pkg-plist
index 56de103c9104..559abe64d1d5 100644
--- a/graphics/librsvg2-rust/pkg-plist
+++ b/graphics/librsvg2-rust/pkg-plist
@@ -140,5 +140,5 @@ share/man/man1/rsvg-convert.1.gz
 %%PORTDOCS%%share/doc/Rsvg-2.0/urlmap.js
 share/gir-1.0/Rsvg-2.0.gir
 share/thumbnailers/librsvg.thumbnailer
-share/vala/vapi/librsvg-2.0.deps
-share/vala/vapi/librsvg-2.0.vapi
+%%VAPI%%share/vala/vapi/librsvg-2.0.deps
+%%VAPI%%share/vala/vapi/librsvg-2.0.vapi
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 58e5ec83bdbf..9bc0e9c458be 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	librsvg
 PORTVERSION=	2.40.21
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files
@@ -13,8 +13,6 @@ WWW=		https://live.gnome.org/LibRsvg
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-BROKEN=		Fails to build with libxml2 2.13+, error: unknown type name 'xmlParserCtxtPtr'
-
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
@@ -22,21 +20,6 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 
 USES=		cpe gmake gnome libtool localbase pathfix pkgconfig tar:xz
 
-CONFLICTS_INSTALL=	librsvg2-rust
-# librsvg2 2.42+ needs rust to build, which is not available on all
-# FreeBSD archs. So limit pure C version 2.40.x.
-PORTSCOUT=	limit:^2\.40\.
-
-OPTIONS_DEFINE=		DOCS VAPI
-OPTIONS_DEFAULT=	DOCS VAPI
-OPTIONS_SUB=		yes
-
-DOCS_CONFIGURE_ENABLE=	grk-doc-html
-
-VAPI_USES=		vala:build
-VAPI_CONFIGURE_ON=	--enable-vala=yes
-VAPI_CONFIGURE_OFF=	--enable-vala=no
-
 USE_GNOME=	cairo gnomeprefix gdkpixbuf introspection:build \
 		libxml2 pango
 CPE_VENDOR=	gnome
@@ -44,6 +27,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 CONFIGURE_ARGS=	--disable-Bsymbolic
 
 DOCSDIR?=	${PREFIX}/share/doc
@@ -51,6 +35,22 @@ GNOME_HTML_DIR=	${DOCSDIR}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
+CONFLICTS_INSTALL=	librsvg2-rust
+# librsvg2 2.42+ needs rust to build, which is not available on all
+# FreeBSD archs. So limit pure C version 2.40.x.
+PORTSCOUT=	limit:^2\.40\.
+
+OPTIONS_DEFINE=		DOCS VAPI
+OPTIONS_DEFAULT=	DOCS VAPI
+OPTIONS_SUB=		yes
+
+DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
+DOCS_CONFIGURE_ENABLE=	gtk-doc gtk-doc-html
+
+VAPI_USES=		vala:build
+VAPI_CONFIGURE_ON=	--enable-vala=yes
+VAPI_CONFIGURE_OFF=	--enable-vala=no
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.[0-9][0-9].[0-9]|GTK3_REQUIRED=9.90.0|g' \
 		${WRKSRC}/configure
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index f9e4bc6ed69f..6022f5fd9fcf 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583164702
-SHA256 (gnome2/librsvg-2.40.21.tar.xz) = f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba
-SIZE (gnome2/librsvg-2.40.21.tar.xz) = 1655860
+TIMESTAMP = 1750895954
+SHA256 (gnome/librsvg-2.40.21.tar.xz) = f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba
+SIZE (gnome/librsvg-2.40.21.tar.xz) = 1655860
diff --git a/graphics/librsvg2/files/patch-rsvg-css.c b/graphics/librsvg2/files/patch-rsvg-css.c
new file mode 100644
index 000000000000..396724399710
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-css.c
@@ -0,0 +1,14 @@
+--- rsvg-css.c.orig	2018-10-01 22:50:22 UTC
++++ rsvg-css.c
+@@ -839,7 +839,11 @@ static void
+ }
+ 
+ static void
++#if LIBXML_VERSION < 21200
+ rsvg_xml_noerror (void *data, xmlErrorPtr error)
++#else
++rsvg_xml_noerror (void *data, const xmlError *error)
++#endif
+ {
+ }
+ 
diff --git a/graphics/librsvg2/files/patch-rsvg-private.h b/graphics/librsvg2/files/patch-rsvg-private.h
new file mode 100644
index 000000000000..9088e892fe56
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-private.h
@@ -0,0 +1,10 @@
+--- rsvg-private.h.orig	2020-02-26 17:40:25 UTC
++++ rsvg-private.h
+@@ -32,6 +32,7 @@
+ #include "rsvg.h"
+ 
+ #include <libxml/SAX.h>
++#include <libxml/tree.h>
+ #include <libxml/xmlmemory.h>
+ #include <pango/pango.h>
+ #include <glib.h>