summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-07-26 09:10:41 +0000
committernia <nia@pkgsrc.org>2019-07-26 09:10:41 +0000
commit915fc2ef2b2d0f3a6bd98b439bc7fcad462d5a5f (patch)
tree3b6dbb1a773d4e9ef4c3f39edad54ecce5440c3e
parent2f7b2ddd64c4a8d964eb2208a81dca52a4a3eb28 (diff)
downloadpkgsrc-915fc2ef2b2d0f3a6bd98b439bc7fcad462d5a5f.tar.gz
geeqie: Allow building with gtk3.
-rw-r--r--graphics/geeqie/Makefile3
-rw-r--r--graphics/geeqie/options.mk17
2 files changed, 15 insertions, 5 deletions
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index ec3661b0304..9c4b9f96cc9 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -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"
diff --git a/graphics/geeqie/options.mk b/graphics/geeqie/options.mk
index 35b52b0ac75..679d8d00245 100644
--- a/graphics/geeqie/options.mk
+++ b/graphics/geeqie/options.mk
@@ -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