[pkgsrc/trunk]: pkgsrc/graphics/geeqie geeqie: Allow building with gtk3.

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d48b98443ae
branches:  trunk
changeset: 336852:8d48b98443ae
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Jul 26 09:10:41 2019 +0000

description:
geeqie: Allow building with gtk3.

diffstat:

 graphics/geeqie/Makefile   |   3 +--
 graphics/geeqie/options.mk |  17 ++++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 742e92c42bdc -r 8d48b98443ae graphics/geeqie/Makefile
--- a/graphics/geeqie/Makefile  Thu Jul 25 21:32:15 2019 +0000
+++ b/graphics/geeqie/Makefile  Fri Jul 26 09:10:41 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2019/07/21 22:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2019/07/26 09:10:41 nia Exp $
 
 DISTNAME=      geeqie-1.4
 PKGREVISION=   11
@@ -36,5 +36,4 @@
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 742e92c42bdc -r 8d48b98443ae graphics/geeqie/options.mk
--- a/graphics/geeqie/options.mk        Thu Jul 25 21:32:15 2019 +0000
+++ b/graphics/geeqie/options.mk        Fri Jul 26 09:10:41 2019 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.2 2015/09/12 12:54:10 gdt Exp $
+# $NetBSD: options.mk,v 1.3 2019/07/26 09:10:41 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.geeqie
-PKG_SUPPORTED_OPTIONS= libchamplain
+PKG_OPTIONS_OPTIONAL_GROUPS=   gtk
+PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3 
+PKG_SUPPORTED_OPTIONS=         libchamplain
 # The libchamplain option doesn't actually work, so leave it off
 # to avoid the pain of dependencies with no benefit, until debugged.
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=         gtk2
 
 .include "../../mk/bsd.options.mk"
 
@@ -16,3 +18,12 @@
 .else
 CONFIGURE_ARGS+=       --disable-gps
 .endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=       --enable-gtk3
+.include "../../x11/gtk3/buildlink3.mk"
+.endif