pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/geeqie graphics/geeqie: Organize clutter/map ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c2730026802
branches:  trunk
changeset: 444714:0c2730026802
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Jan 11 18:15:13 2021 +0000

description:
graphics/geeqie: Organize clutter/map more clearly

(This commit only reorders lines and does not intend to change any
behavior.)

In geeqie, clutter is optional, but it is required in order to have
the map widget.  The map option (libchamplain) currently enables
clutter.  Separate clutter and map CONFIGURE and bl3 includes and add
comments to make this easier to understand.

diffstat:

 graphics/geeqie/options.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r b578aba9ce12 -r 0c2730026802 graphics/geeqie/options.mk
--- a/graphics/geeqie/options.mk        Mon Jan 11 18:13:36 2021 +0000
+++ b/graphics/geeqie/options.mk        Mon Jan 11 18:15:13 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2020/03/11 14:37:24 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2021/01/11 18:15:13 gdt Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.geeqie
 PKG_OPTIONS_OPTIONAL_GROUPS=   gtk
@@ -9,10 +9,12 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlibchamplain)
-CONFIGURE_ARGS+=       --enable-map
+# While clutter is optional, the map requires it.
 CONFIGURE_ARGS+=       --enable-clutter
+.include "../../graphics/clutter/buildlink3.mk"
+
+CONFIGURE_ARGS+=       --enable-map
 .include "../../geography/libchamplain012/buildlink3.mk"
-.include "../../graphics/clutter/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-map
 .endif



Home | Main Index | Thread Index | Old Index