[pkgsrc/trunk]: pkgsrc/editors/emacs26 editors/emacs26: Fix building with GTK...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47ba8c67b1b8
branches:  trunk
changeset: 391323:47ba8c67b1b8
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Feb 04 10:38:53 2019 +0000

description:
editors/emacs26: Fix building with GTK+ 2 toolkit

Previously the "gtk" and "gtk2" options weren't checked properly and the
package was built using the GTK+ 3 toolkit instead.

diffstat:

 editors/emacs26/options.mk |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r e20d68ae1b28 -r 47ba8c67b1b8 editors/emacs26/options.mk
--- a/editors/emacs26/options.mk        Mon Feb 04 09:38:19 2019 +0000
+++ b/editors/emacs26/options.mk        Mon Feb 04 10:38:53 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef Exp $
+# $NetBSD: options.mk,v 1.4 2019/02/04 10:38:53 tron Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -17,8 +17,8 @@
 # gtk in next line implies gtk2, xaw = athena = lucid
 PKG_OPTIONS_GROUP.toolkit=             gtk gtk2 gtk3 motif xaw lucid
 # gtk2 and gtk has the same effect
-# gtk is default in the logic below (even not included in SUGGESTED_=
-# gconf, gtk and xft2 will be ignored for nextstep even shown as selected.
+# gtk3 is default in the logic below (even not included in SUGGESTED_=
+# gconf, gtk* and xft2 will be ignored for nextstep even shown as selected.
 
 PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11
 
@@ -113,7 +113,9 @@
 ###
 ### Toolkit selection
 ###
-.  if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) &&  empty(PKG_OPTIONS:Mmotif))
+.  if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && \
+       empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mgtk2) && \
+       empty(PKG_OPTIONS:Mmotif))
 # defaults to gtk3
 USE_TOOLS+=            pkg-config
 .include "../../x11/gtk3/buildlink3.mk"