Make dbus and gnome-keyring optional in print/evince3.

Index: print/evince3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince3/Makefile,v
retrieving revision 1.14
diff -p -u -r1.14 Makefile
--- print/evince3/Makefile	31 Mar 2013 08:13:31 -0000	1.14
+++ print/evince3/Makefile	23 Apr 2013 13:29:20 -0000
@@ -3,6 +3,7 @@
 
 .include "../../print/evince3/Makefile.common"
 
+PKGREVISION=		1
 COMMENT=		Document viewer
 PKGREVISION=		3
 
@@ -15,10 +16,6 @@ USE_TOOLS+=	gsed
 
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../security/libgnome-keyring/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.70
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
Index: print/evince3/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince3/PLIST,v
retrieving revision 1.3
diff -p -u -r1.3 PLIST
--- print/evince3/PLIST	19 Oct 2012 18:39:05 -0000	1.3
+++ print/evince3/PLIST	23 Apr 2013 13:29:20 -0000
@@ -67,11 +67,11 @@ lib/libevdocument3.la
 lib/libevview3.la
 lib/pkgconfig/evince-document-3.0.pc
 lib/pkgconfig/evince-view-3.0.pc
-libexec/evinced
+${PLIST.dbus}libexec/evinced
 man/man1/evince.1
 share/GConf/gsettings/evince.convert
 share/applications/evince.desktop
-share/dbus-1/services/org.gnome.evince.Daemon.service
+${PLIST.dbus}share/dbus-1/services/org.gnome.evince.Daemon.service
 share/evince/hand-open.png
 share/evince/icons/hicolor/16x16/actions/object-rotate-left.png
 share/evince/icons/hicolor/16x16/actions/object-rotate-right.png
Index: print/evince3/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/evince3/options.mk,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 options.mk
--- print/evince3/options.mk	21 Mar 2012 17:40:20 -0000	1.1.1.1
+++ print/evince3/options.mk	23 Apr 2013 13:29:20 -0000
@@ -1,12 +1,26 @@
 # $NetBSD: options.mk,v 1.1.1.1 2012/03/21 17:40:20 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS=	dvi djvu xps
+PKG_SUPPORTED_OPTIONS=	dbus djvu dvi gnome-keyring xps
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
 
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+BUILDLINK_API_DEPENDS.dbus-glib+=       dbus-glib>=0.70
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnome-keyring)
+.include "../../security/libgnome-keyring/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-keyring
+.endif
+
 .if !empty(PKG_OPTIONS:Mdvi)
 PLIST.dvi=		yes
 .include "../../print/kpathsea/buildlink3.mk"