--- graphics/librsvg2/Makefile	(revision 521949)
+++ 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
@@ -16,7 +17,6 @@ 
 # 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 \
 		libpng.so:graphics/png \
@@ -28,9 +28,22 @@ 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--enable-vala \
-		--disable-Bsymbolic
+CONFIGURE_ARGS=	--disable-Bsymbolic
 
+DOCSDIR=	${PREFIX}/share/doc/rsvg-2.0
+
+OPTIONS_DEFINE=		DOCS VAPI
+OPTIONS_DEFAULT=	DOCS VAPI
+OPTIONS_SUB=		yes
+
+DOCS_CONFIGURE_ENABLE=	gtk-doc-html
+
+VAPI_BUILD_DEPENDS=	valac:lang/vala
+VAPI_CONFIGURE_ON=	--enable-vala=yes
+VAPI_CONFIGURE_OFF=	--enable-vala=no
+
+.include <bsd.port.options.mk>
+
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 post-patch:
--- graphics/librsvg2/pkg-plist	(revision 521949)
+++ graphics/librsvg2/pkg-plist	(working copy)
@@ -12,36 +12,36 @@ 
 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
 share/gir-1.0/Rsvg-2.0.gir
 share/thumbnailers/librsvg.thumbnailer
-share/vala/vapi/librsvg-2.0.vapi
+%%PORTDOCS%%%%DOCSDIR%%/RsvgHandle.html
+%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-14.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-22.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-32.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-36.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-4.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-8.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-2-9.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/licence.html
+%%PORTDOCS%%%%DOCSDIR%%/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-2.0.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-Using-RSVG-with-GIO.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-Using-RSVG-with-GdkPixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-Using-RSVG-with-cairo.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg-Version-check-and-feature-tests.html
+%%PORTDOCS%%%%DOCSDIR%%/rsvg.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%VAPI%%share/vala/vapi/librsvg-2.0.vapi
 @postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
 @postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true