CVS commit: pkgsrc/graphics/geeqie

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jul 26 09:10:41 UTC 2019

Modified Files:
        pkgsrc/graphics/geeqie: Makefile options.mk

Log Message:
geeqie: Allow building with gtk3.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/geeqie/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/geeqie/Makefile
diff -u pkgsrc/graphics/geeqie/Makefile:1.77 pkgsrc/graphics/geeqie/Makefile:1.78
--- pkgsrc/graphics/geeqie/Makefile:1.77        Sun Jul 21 22:24:57 2019
+++ pkgsrc/graphics/geeqie/Makefile     Fri Jul 26 09:10:41 2019
@@ -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 @@ post-build:
 .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"

Index: pkgsrc/graphics/geeqie/options.mk
diff -u pkgsrc/graphics/geeqie/options.mk:1.2 pkgsrc/graphics/geeqie/options.mk:1.3
--- pkgsrc/graphics/geeqie/options.mk:1.2       Sat Sep 12 12:54:10 2015
+++ pkgsrc/graphics/geeqie/options.mk   Fri Jul 26 09:10:41 2019
@@ -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 @@ CONFIGURE_ARGS+=     --enable-clutter
 .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