CVS commit: pkgsrc/graphics/geeqie

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jan 11 18:15:13 UTC 2021

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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/options.mk
diff -u pkgsrc/graphics/geeqie/options.mk:1.7 pkgsrc/graphics/geeqie/options.mk:1.8
--- pkgsrc/graphics/geeqie/options.mk:1.7       Wed Mar 11 14:37:24 2020
+++ pkgsrc/graphics/geeqie/options.mk   Mon Jan 11 18:15:13 2021
@@ -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 @@ PKG_SUGGESTED_OPTIONS=                gtk3
 .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 "../../geography/libchamplain012/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
+
+CONFIGURE_ARGS+=       --enable-map
+.include "../../geography/libchamplain012/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-map
 .endif