diff options
author | riastradh <riastradh@pkgsrc.org> | 2013-05-11 20:47:15 +0000 |
---|---|---|
committer | riastradh <riastradh@pkgsrc.org> | 2013-05-11 20:47:15 +0000 |
commit | 4855490c077439a7fe24c484c3ede2730989598b (patch) | |
tree | 632fb597b3ca6850720a065047b0db76185b0039 /print/evince3 | |
parent | 1796d432a026ca3edff4f1862e20bd209d1d0119 (diff) | |
download | pkgsrc-4855490c077439a7fe24c484c3ede2730989598b.tar.gz |
Make dbus and gnome-keyring options (default enabled) in print/evince3.
Diffstat (limited to 'print/evince3')
-rw-r--r-- | print/evince3/Makefile | 7 | ||||
-rw-r--r-- | print/evince3/PLIST | 6 | ||||
-rw-r--r-- | print/evince3/options.mk | 19 |
3 files changed, 22 insertions, 10 deletions
diff --git a/print/evince3/Makefile b/print/evince3/Makefile index 76b5f2b0cfa..3063153570c 100644 --- a/print/evince3/Makefile +++ b/print/evince3/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2013/05/04 07:19:07 obache Exp $ +# $NetBSD: Makefile,v 1.16 2013/05/11 20:47:15 riastradh Exp $ # .include "../../print/evince3/Makefile.common" +PKGREVISION= 1 COMMENT= Document viewer PKGREVISION= 4 @@ -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" diff --git a/print/evince3/PLIST b/print/evince3/PLIST index 7decf7ef426..3b88319a888 100644 --- a/print/evince3/PLIST +++ b/print/evince3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2012/10/19 18:39:05 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/05/11 20:47:15 riastradh Exp $ bin/evince bin/evince-previewer bin/evince-thumbnailer @@ -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 diff --git a/print/evince3/options.mk b/print/evince3/options.mk index b5252370ae0..a4c1b3d212c 100644 --- a/print/evince3/options.mk +++ b/print/evince3/options.mk @@ -1,12 +1,27 @@ -# $NetBSD: options.mk,v 1.1.1.1 2012/03/21 17:40:20 drochner Exp $ +# $NetBSD: options.mk,v 1.2 2013/05/11 20:47:15 riastradh Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.evince -PKG_SUPPORTED_OPTIONS= dvi djvu xps +PKG_SUPPORTED_OPTIONS= dbus djvu dvi gnome-keyring xps +PKG_SUGGESTED_OPTIONS= dbus gnome-keyring .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" |