Add some options to print/evince.

Been sitting on this patch for ages.  No objection in PR pkg/44541.

4 files changed, 60 insertions, 23 deletions

diff --git a/print/evince/Makefile b/print/evince/Makefile
index fbc373fbc55..9813bf2df84 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,29 +1,20 @@
-# $NetBSD: Makefile,v 1.87 2012/10/08 23:00:48 adam Exp $
+# $NetBSD: Makefile,v 1.88 2013/01/20 00:52:18 riastradh Exp $
 #
 
 .include "../../print/evince/Makefile.common"
-PKGREVISION=	18
+PKGREVISION=	19
 
 COMMENT=		Document viewer
 
-GCONF_SCHEMAS+=	evince-thumbnailer.schemas
-GCONF_SCHEMAS+=	evince-thumbnailer-ps.schemas
-
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--enable-comics
 CONFIGURE_ARGS+=	--disable-nautilus
-GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
 
 USE_TOOLS+=	gsed
 
-.include "../../devel/GConf/schemas.mk"
 .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"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 700ef5d7008..c5481141d94 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2011/01/11 12:47:55 drochner Exp $
+# $NetBSD: Makefile.common,v 1.36 2013/01/20 00:52:18 riastradh Exp $
 #
 # used by print/evince/Makefile
 # used by print/evince-nautilus/Makefile
@@ -39,6 +39,6 @@ BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.12.0
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index 0af89e68c6e..40022314ce5 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2011/01/18 10:08:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.32 2013/01/20 00:52:18 riastradh Exp $
 bin/evince
 bin/evince-previewer
 bin/evince-thumbnailer
@@ -56,9 +56,11 @@ lib/evince/3/backends/libcomicsdocument.la
 ${PLIST.djvu}lib/evince/3/backends/libdjvudocument.la
 ${PLIST.dvi}lib/evince/3/backends/libdvidocument.la
 lib/evince/3/backends/libpdfdocument.la
+${PLIST.gdk-pixbuf}lib/evince/3/backends/libpixbufdocument.la
 lib/evince/3/backends/libpsdocument.la
 lib/evince/3/backends/libtiffdocument.la
 lib/evince/3/backends/pdfdocument.evince-backend
+${PLIST.gdk-pixbuf}lib/evince/3/backends/pixbufdocument.evince-backend
 lib/evince/3/backends/psdocument.evince-backend
 lib/evince/3/backends/tiffdocument.evince-backend
 lib/libevdocument.la
@@ -66,11 +68,11 @@ lib/libevview.la
 lib/pkgconfig/evince-document-2.32.pc
 lib/pkgconfig/evince-view-2.32.pc
 libexec/evince-convert-metadata
-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/evince-previewer-ui.xml
 share/evince/evince-toolbar.xml
 share/evince/evince-ui.xml
@@ -114,11 +116,11 @@ share/evince/icons/hicolor/48x48/actions/view-page-facing.png
 share/evince/icons/hicolor/scalable/actions/object-rotate-left.svg
 share/evince/icons/hicolor/scalable/actions/object-rotate-right.svg
 share/evince/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
-share/gconf/schemas/evince-thumbnailer-comics.schemas
-${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas
-${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas
-share/gconf/schemas/evince-thumbnailer-ps.schemas
-share/gconf/schemas/evince-thumbnailer.schemas
+${PLIST.gconf}share/gconf/schemas/evince-thumbnailer-comics.schemas
+${PLIST.gconf}${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas
+${PLIST.gconf}${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas
+${PLIST.gconf}share/gconf/schemas/evince-thumbnailer-ps.schemas
+${PLIST.gconf}share/gconf/schemas/evince-thumbnailer.schemas
 share/glib-2.0/schemas/org.gnome.Evince.gschema.xml
 share/gnome/help/evince/C/evince.xml
 share/gnome/help/evince/C/figures/evince_start_window.png
diff --git a/print/evince/options.mk b/print/evince/options.mk
index 1da5e49c225..2acc1d2985e 100644
--- a/print/evince/options.mk
+++ b/print/evince/options.mk
@@ -1,12 +1,25 @@
-# $NetBSD: options.mk,v 1.5 2009/10/21 17:28:02 drochner Exp $
+# $NetBSD: options.mk,v 1.6 2013/01/20 00:52:18 riastradh Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS=	dvi djvu
+PKG_SUPPORTED_OPTIONS=	dbus dvi djvu gconf gdk-pixbuf gnome-keyring
+PKG_SUPPORTED_OPTIONS+=	scrollkeeper
+
+PKG_SUGGESTED_OPTIONS+=	dbus gconf gnome-keyring scrollkeeper
 
 .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"
+CONFIGURE_ARGS+=	--enable-dbus
+PLIST.dbus=		yes
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
 .if !empty(PKG_OPTIONS:Mdvi)
 CONFIGURE_ARGS+=	--enable-dvi
 PLIST.dvi=		yes
@@ -20,3 +33,34 @@ PLIST.djvu=		yes
 GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mgconf)
+.include "../../devel/GConf/schemas.mk"
+CONFIGURE_ARGS+=	--with-gconf
+GCONF_SCHEMAS+=		evince-thumbnailer.schemas
+GCONF_SCHEMAS+=		evince-thumbnailer-ps.schemas
+GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
+PLIST.gconf=		yes
+.else
+CONFIGURE_ARGS+=	--without-gconf
+CONFIGURE_ARGS+=	--disable-schemas-install
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdk-pixbuf)
+CONFIGURE_ARGS+=	--enable-pixbuf
+PLIST.gdk-pixbuf=	yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnome-keyring)
+.include "../../security/libgnome-keyring/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-keyring
+.else
+CONFIGURE_ARGS+=	--without-keyring
+.endif
+
+.if !empty(PKG_OPTIONS:Mscrollkeeper)
+.include "../../mk/omf-scrollkeeper.mk"
+CONFIGURE_ARGS+=	--enable-scrollkeeper
+.else
+CONFIGURE_ARGS+=	--disable-scrollkeeper
+.endif