Sun Jul 15 15:21:29 2018 UTC ()
(Editors/emacs26) Default options adjustment, drop ImageMagick and set gtk3.

1. ImageMagick is listed as buildlink3, but configure stage says no.
   Drop from the default options for now. (need py-wand and ImageMagick 6 ?)
2. gtk/gtk3 logic was not the same as emacs-25.x. Default was gtk2.
   Now default is gtk3 (the same as emacs-25). Option gtk and gtk2
   have the same effect now.

Thanks tsutsui@ for information


(mef)
diff -r1.1 -r1.2 pkgsrc/editors/emacs26/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs26/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs26/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs26/Makefile 2018/06/20 11:04:19 1.1
+++ pkgsrc/editors/emacs26/Makefile 2018/07/15 15:21:28 1.2
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1# $NetBSD: Makefile,v 1.1 2018/06/20 11:04:19 mef Exp $ 1# $NetBSD: Makefile,v 1.2 2018/07/15 15:21:28 mef Exp $
2 2
3CONFLICTS+= emacs26-nox11-[0-9]* 3CONFLICTS+= emacs26-nox11-[0-9]*
 4PKGREVISION= 1
4 5
5.include "../../editors/emacs26/Makefile.common" 6.include "../../editors/emacs26/Makefile.common"
6 7
7.include "options.mk" 8.include "options.mk"
8 9
9.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 10.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
10.include "../../sysutils/desktop-file-utils/desktopdb.mk" 11.include "../../sysutils/desktop-file-utils/desktopdb.mk"
11.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs26/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs26/options.mk 2018/07/03 11:24:08 1.2
+++ pkgsrc/editors/emacs26/options.mk 2018/07/15 15:21:28 1.3
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: options.mk,v 1.2 2018/07/03 11:24:08 mef Exp $ 1# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef 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 gtk, 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 motif xaw lucid 18PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid
 19# gtk2 and gtk has the same effect
19# gtk is default in the logic below (even not included in SUGGESTED_= 20# gtk is default in the logic below (even not included in SUGGESTED_=
20# 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.
21 22
22PKG_SUGGESTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml x11 23PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11
23 24
24.include "../../mk/bsd.options.mk" 25.include "../../mk/bsd.options.mk"
25 26
26### --- Check window-system independent options first 27### --- Check window-system independent options first
27### 28###
28### Support D-BUS 29### Support D-BUS
29### 30###
30.if !empty(PKG_OPTIONS:Mdbus) 31.if !empty(PKG_OPTIONS:Mdbus)
31. include "../../sysutils/dbus/buildlink3.mk" 32. include "../../sysutils/dbus/buildlink3.mk"
32.else 33.else
33CONFIGURE_ARGS+= --without-dbus 34CONFIGURE_ARGS+= --without-dbus
34.endif 35.endif
35 36
@@ -70,30 +71,31 @@ CONFIGURE_ARGS+= --without-gnutls @@ -70,30 +71,31 @@ CONFIGURE_ARGS+= --without-gnutls
70CONFIGURE_ARGS+= --without-rsvg 71CONFIGURE_ARGS+= --without-rsvg
71. endif 72. endif
72 73
73### 74###
74### Support gconf 75### Support gconf
75### 76###
76. if !empty(PKG_OPTIONS:Mgconf) 77. if !empty(PKG_OPTIONS:Mgconf)
77.include "../../devel/gconfmm/buildlink3.mk" 78.include "../../devel/gconfmm/buildlink3.mk"
78. else 79. else
79CONFIGURE_ARGS+= --without-gconf 80CONFIGURE_ARGS+= --without-gconf
80. endif 81. endif
81 82
82### 83###
83### Support ImageMagick 84### Support ImageMagick (not recognized for now, sorry)
84### 85###
85. if !empty(PKG_OPTIONS:Mimagemagick) 86. if !empty(PKG_OPTIONS:Mimagemagick)
86.include "../../graphics/ImageMagick/buildlink3.mk" 87.include "../../graphics/ImageMagick/buildlink3.mk"
 88# DEPENDS+= py[0-9]*-wand-[0-9]*:../../graphics/py-wand
87. else 89. else
88CONFIGURE_ARGS+= --without-imagemagick 90CONFIGURE_ARGS+= --without-imagemagick
89. endif 91. endif
90 92
91### 93###
92### Support Xaw3d (This is only valid with Lucid Toolkit) 94### Support Xaw3d (This is only valid with Lucid Toolkit)
93### 95###
94. if !empty(PKG_OPTIONS:Mxaw3d) 96. if !empty(PKG_OPTIONS:Mxaw3d)
95.include "../../x11/libXaw3d/buildlink3.mk" 97.include "../../x11/libXaw3d/buildlink3.mk"
96. else 98. else
97CONFIGURE_ARGS+= --without-xaw3d 99CONFIGURE_ARGS+= --without-xaw3d
98. endif 100. endif
99### Enable font backend 101### Enable font backend
@@ -102,34 +104,34 @@ CONFIGURE_ARGS+= --without-xaw3d @@ -102,34 +104,34 @@ CONFIGURE_ARGS+= --without-xaw3d
102.include "../../fonts/fontconfig/buildlink3.mk" 104.include "../../fonts/fontconfig/buildlink3.mk"
103.include "../../graphics/libotf/buildlink3.mk" 105.include "../../graphics/libotf/buildlink3.mk"
104.include "../../graphics/freetype2/buildlink3.mk" 106.include "../../graphics/freetype2/buildlink3.mk"
105.include "../../x11/libXft/buildlink3.mk" 107.include "../../x11/libXft/buildlink3.mk"
106.include "../../devel/m17n-lib/buildlink3.mk" 108.include "../../devel/m17n-lib/buildlink3.mk"
107. else 109. else
108CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt 110CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt
109. endif 111. endif
110 112
111### 113###
112### Toolkit selection 114### Toolkit selection
113### 115###
114. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif)) 116. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif))
115# defaults to gtk 117# defaults to gtk3
116USE_TOOLS+= pkg-config 118USE_TOOLS+= pkg-config
117.include "../../x11/gtk2/buildlink3.mk" 119.include "../../x11/gtk3/buildlink3.mk"
118CONFIGURE_ARGS+= --with-x-toolkit=gtk 120CONFIGURE_ARGS+= --with-x-toolkit=gtk3
119. elif !empty(PKG_OPTIONS:Mgtk) 121. elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk)
120USE_TOOLS+= pkg-config 122USE_TOOLS+= pkg-config
121.include "../../x11/gtk2/buildlink3.mk" 123.include "../../x11/gtk2/buildlink3.mk"
122CONFIGURE_ARGS+= --with-x-toolkit=gtk 124CONFIGURE_ARGS+= --with-x-toolkit=gtk2
123. elif !empty(PKG_OPTIONS:Mxaw) 125. elif !empty(PKG_OPTIONS:Mxaw)
124.include "../../mk/xaw.buildlink3.mk" 126.include "../../mk/xaw.buildlink3.mk"
125CONFIGURE_ARGS+= --with-x-toolkit=athena 127CONFIGURE_ARGS+= --with-x-toolkit=athena
126. elif !empty(PKG_OPTIONS:Mlucid) 128. elif !empty(PKG_OPTIONS:Mlucid)
127.include "../../mk/xaw.buildlink3.mk" 129.include "../../mk/xaw.buildlink3.mk"
128CONFIGURE_ARGS+= --with-x-toolkit=athena 130CONFIGURE_ARGS+= --with-x-toolkit=athena
129. elif !empty(PKG_OPTIONS:Mmotif) 131. elif !empty(PKG_OPTIONS:Mmotif)
130.include "../../mk/motif.buildlink3.mk" 132.include "../../mk/motif.buildlink3.mk"
131CONFIGURE_ARGS+= --with-x-toolkit=motif 133CONFIGURE_ARGS+= --with-x-toolkit=motif
132. endif 134. endif
133 135
134### 136###
135### End of Check non nextstep (implies x11) options --------------------- 137### End of Check non nextstep (implies x11) options ---------------------