Mon Feb 4 10:38:53 2019 UTC ()
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.


(tron)
diff -r1.3 -r1.4 pkgsrc/editors/emacs26/options.mk
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs26/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs26/options.mk 2018/07/15 15:21:28 1.3
+++ pkgsrc/editors/emacs26/options.mk 2019/02/04 10:38:53 1.4
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef Exp $ 1# $NetBSD: options.mk,v 1.4 2019/02/04 10:38:53 tron Exp $
2 2
3### Set options 3### Set options
4PKG_OPTIONS_VAR= PKG_OPTIONS.emacs 4PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
5PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml 5PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml
6# xaw3d is only valid with tookit = xaw 6# xaw3d is only valid with tookit = xaw
7 7
8PKG_OPTIONS_OPTIONAL_GROUPS+= window-system 8PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
9PKG_OPTIONS_GROUP.window-system= x11 nextstep 9PKG_OPTIONS_GROUP.window-system= x11 nextstep
10 10
11# tempted to have 'nox11' :-) 11# tempted to have 'nox11' :-)
12 12
13PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit 13PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
14PKG_SUGGESTED_OPTIONS.Darwin= nextstep 14PKG_SUGGESTED_OPTIONS.Darwin= nextstep
15# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk2, 15# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk2,
16# gtk3, lucid or athena, motif, no) 16# gtk3, lucid or athena, motif, no)
17# gtk in next line implies gtk2, xaw = athena = lucid 17# gtk in next line implies gtk2, xaw = athena = lucid
18PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid 18PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid
19# gtk2 and gtk has the same effect 19# gtk2 and gtk has the same effect
20# gtk is default in the logic below (even not included in SUGGESTED_= 20# gtk3 is default in the logic below (even not included in SUGGESTED_=
21# gconf, gtk and xft2 will be ignored for nextstep even shown as selected. 21# gconf, gtk* and xft2 will be ignored for nextstep even shown as selected.
22 22
23PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11 23PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11
24 24
25.include "../../mk/bsd.options.mk" 25.include "../../mk/bsd.options.mk"
26 26
27### --- Check window-system independent options first 27### --- Check window-system independent options first
28### 28###
29### Support D-BUS 29### Support D-BUS
30### 30###
31.if !empty(PKG_OPTIONS:Mdbus) 31.if !empty(PKG_OPTIONS:Mdbus)
32. include "../../sysutils/dbus/buildlink3.mk" 32. include "../../sysutils/dbus/buildlink3.mk"
33.else 33.else
34CONFIGURE_ARGS+= --without-dbus 34CONFIGURE_ARGS+= --without-dbus
@@ -103,27 +103,29 @@ CONFIGURE_ARGS+= --without-xaw3d @@ -103,27 +103,29 @@ CONFIGURE_ARGS+= --without-xaw3d
103. if !empty(PKG_OPTIONS:Mxft2) 103. if !empty(PKG_OPTIONS:Mxft2)
104.include "../../fonts/fontconfig/buildlink3.mk" 104.include "../../fonts/fontconfig/buildlink3.mk"
105.include "../../graphics/libotf/buildlink3.mk" 105.include "../../graphics/libotf/buildlink3.mk"
106.include "../../graphics/freetype2/buildlink3.mk" 106.include "../../graphics/freetype2/buildlink3.mk"
107.include "../../x11/libXft/buildlink3.mk" 107.include "../../x11/libXft/buildlink3.mk"
108.include "../../devel/m17n-lib/buildlink3.mk" 108.include "../../devel/m17n-lib/buildlink3.mk"
109. else 109. else
110CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt 110CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt
111. endif 111. endif
112 112
113### 113###
114### Toolkit selection 114### Toolkit selection
115### 115###
116. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif)) 116. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && \
 117 empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mgtk2) && \
 118 empty(PKG_OPTIONS:Mmotif))
117# defaults to gtk3 119# defaults to gtk3
118USE_TOOLS+= pkg-config 120USE_TOOLS+= pkg-config
119.include "../../x11/gtk3/buildlink3.mk" 121.include "../../x11/gtk3/buildlink3.mk"
120CONFIGURE_ARGS+= --with-x-toolkit=gtk3 122CONFIGURE_ARGS+= --with-x-toolkit=gtk3
121. elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk) 123. elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk)
122USE_TOOLS+= pkg-config 124USE_TOOLS+= pkg-config
123.include "../../x11/gtk2/buildlink3.mk" 125.include "../../x11/gtk2/buildlink3.mk"
124CONFIGURE_ARGS+= --with-x-toolkit=gtk2 126CONFIGURE_ARGS+= --with-x-toolkit=gtk2
125. elif !empty(PKG_OPTIONS:Mxaw) 127. elif !empty(PKG_OPTIONS:Mxaw)
126.include "../../mk/xaw.buildlink3.mk" 128.include "../../mk/xaw.buildlink3.mk"
127CONFIGURE_ARGS+= --with-x-toolkit=athena 129CONFIGURE_ARGS+= --with-x-toolkit=athena
128. elif !empty(PKG_OPTIONS:Mlucid) 130. elif !empty(PKG_OPTIONS:Mlucid)
129.include "../../mk/xaw.buildlink3.mk" 131.include "../../mk/xaw.buildlink3.mk"