Index: head/devel/dbus-glib/Makefile
===================================================================
--- head/devel/dbus-glib/Makefile	(revision 398775)
+++ head/devel/dbus-glib/Makefile	(revision 398776)
@@ -1,29 +1,31 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dbus-glib
 PORTVERSION=	0.104
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-glib/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib bindings for the D-BUS messaging system
 
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes
 USES=		cpe gettext gmake libtool pathfix pkgconfig
 CPE_VENDOR=	freedesktop
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-test-socket-dir=${WRKDIR} \
 		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="1.0"
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
Index: head/devel/dbus-glib/pkg-plist
===================================================================
--- head/devel/dbus-glib/pkg-plist	(revision 398775)
+++ head/devel/dbus-glib/pkg-plist	(revision 398776)
@@ -1,38 +1,38 @@
 bin/dbus-binding-tool
 etc/bash_completion.d/dbus-bash-completion.sh
 include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h
 include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h
 include/dbus-%%VERSION%%/dbus/dbus-glib.h
 include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h
 include/dbus-%%VERSION%%/dbus/dbus-gvalue-parse-variant.h
 lib/libdbus-glib-1.a
 lib/libdbus-glib-1.so
 lib/libdbus-glib-1.so.2
 lib/libdbus-glib-1.so.2.3.2
 libdata/pkgconfig/dbus-glib-1.pc
 libexec/dbus-bash-completion-helper
 man/man1/dbus-binding-tool.1.gz
-%%DOCSDIR%%/api-index-full.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/dbus-binding-tool.html
-%%DOCSDIR%%/dbus-glib-DBus-GLib-low-level.html
-%%DOCSDIR%%/dbus-glib-DBus-GObject-related-functions.html
-%%DOCSDIR%%/dbus-glib-DBusGConnection.html
-%%DOCSDIR%%/dbus-glib-DBusGError.html
-%%DOCSDIR%%/dbus-glib-DBusGMessage.html
-%%DOCSDIR%%/dbus-glib-DBusGMethod.html
-%%DOCSDIR%%/dbus-glib-DBusGProxy.html
-%%DOCSDIR%%/dbus-glib-Specializable-GType-System.html
-%%DOCSDIR%%/dbus-glib.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left-insensitive.png
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right-insensitive.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up-insensitive.png
-%%DOCSDIR%%/up.png
+%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-binding-tool.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBus-GLib-low-level.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBus-GObject-related-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBusGConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBusGError.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBusGMessage.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBusGMethod.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-DBusGProxy.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib-Specializable-GType-System.html
+%%PORTDOCS%%%%DOCSDIR%%/dbus-glib.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
+%%PORTDOCS%%%%DOCSDIR%%/up.png