Index: Mk/Uses/gnome.mk
===================================================================
--- Mk/Uses/gnome.mk	(revision 506982)
+++ Mk/Uses/gnome.mk	(working copy)
@@ -272,7 +272,7 @@
 vte3_USE_GNOME_IMPL=	gtk30
 
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
-librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango
+librsvg2_USE_GNOME_IMPL=gdkpixbuf2 pango
 
 nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
 nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2
Index: graphics/librsvg2/Makefile
===================================================================
--- graphics/librsvg2/Makefile	(revision 506982)
+++ graphics/librsvg2/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	librsvg
 PORTVERSION=	2.40.20
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
@@ -11,11 +12,6 @@
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
-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\.
-
 BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -22,9 +18,16 @@
 		libpng.so:graphics/png \
 		libcroco-0.6.so:textproc/libcroco
 
-USES=		gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
-USE_GNOME=	cairo gnomeprefix libgsf gdkpixbuf2 introspection:build \
-		libxml2 pango
+USES=		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
+
+USE_GNOME=	cairo gnomeprefix gdkpixbuf2 introspection:build libxml2 pango
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -31,6 +34,9 @@
 CONFIGURE_ARGS=	--enable-vala \
 		--disable-Bsymbolic
 
+DOCSDIR?=	${PREFIX}/share/doc
+GNOME_HTML_DIR=	${DOCSDIR}
+
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 post-patch:
Index: graphics/librsvg2/pkg-plist
===================================================================
--- graphics/librsvg2/pkg-plist	(revision 506982)
+++ graphics/librsvg2/pkg-plist	(working copy)
@@ -12,34 +12,34 @@
 lib/librsvg-2.so.%%PORTVERSION%%
 libdata/pkgconfig/librsvg-2.0.pc
 man/man1/rsvg-convert.1.gz
-share/doc/rsvg-2.0/RsvgHandle.html
-share/doc/rsvg-2.0/annotation-glossary.html
-share/doc/rsvg-2.0/api-index-2-14.html
-share/doc/rsvg-2.0/api-index-2-22.html
-share/doc/rsvg-2.0/api-index-2-32.html
-share/doc/rsvg-2.0/api-index-2-36.html
-share/doc/rsvg-2.0/api-index-2-4.html
-share/doc/rsvg-2.0/api-index-2-8.html
-share/doc/rsvg-2.0/api-index-2-9.html
-share/doc/rsvg-2.0/api-index-deprecated.html
-share/doc/rsvg-2.0/api-index-full.html
-share/doc/rsvg-2.0/home.png
-share/doc/rsvg-2.0/index.html
-share/doc/rsvg-2.0/left-insensitive.png
-share/doc/rsvg-2.0/left.png
-share/doc/rsvg-2.0/licence.html
-share/doc/rsvg-2.0/object-tree.html
-share/doc/rsvg-2.0/right-insensitive.png
-share/doc/rsvg-2.0/right.png
-share/doc/rsvg-2.0/rsvg-2.0.devhelp2
-share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
-share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html
-share/doc/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
-share/doc/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
-share/doc/rsvg-2.0/rsvg.html
-share/doc/rsvg-2.0/style.css
-share/doc/rsvg-2.0/up-insensitive.png
-share/doc/rsvg-2.0/up.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/RsvgHandle.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/annotation-glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-14.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-22.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-32.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-36.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-4.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-8.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-2-9.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/home.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/index.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/left.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/licence.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/right.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/rsvg-2.0.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/rsvg.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/style.css
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0/up.png
 share/gir-1.0/Rsvg-2.0.gir
 share/thumbnailers/librsvg.thumbnailer
 share/vala/vapi/librsvg-2.0.vapi