Sat Aug 12 03:20:58 2023 UTC ()
emacs29: sync with wip/emacs-git

Add options for libgccjit libotf libwebp tree-sitter, default on.
Remove motif option, support was removed upstream.

Fix PLIST for me (amd64/10.99.5).

Bump PKGREVISION.


(wiz)
diff -r1.1 -r1.2 pkgsrc/editors/emacs29/Makefile
diff -r1.1 -r1.2 pkgsrc/editors/emacs29/Makefile.common
diff -r1.1 -r1.2 pkgsrc/editors/emacs29/PLIST
diff -r1.1 -r1.2 pkgsrc/editors/emacs29/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs29/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs29/Makefile 2023/07/31 15:03:33 1.1
+++ pkgsrc/editors/emacs29/Makefile 2023/08/12 03:20:58 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: Makefile,v 1.1 2023/07/31 15:03:33 ryoon Exp $ 1# $NetBSD: Makefile,v 1.2 2023/08/12 03:20:58 wiz Exp $
2 2
3CONFLICTS+= emacs29-nox11-[0-9]* 3CONFLICTS+= emacs29-nox11-[0-9]*
4 4
 5PKGREVISION= 1
 6
5.include "../../editors/emacs29/Makefile.common" 7.include "../../editors/emacs29/Makefile.common"
6 8
7.include "options.mk" 9.include "options.mk"
8 10
9.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 11.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
10.include "../../sysutils/desktop-file-utils/desktopdb.mk" 12.include "../../sysutils/desktop-file-utils/desktopdb.mk"
11.include "../../fonts/harfbuzz/buildlink3.mk" 13.include "../../fonts/harfbuzz/buildlink3.mk"
12.include "../../graphics/cairo/buildlink3.mk" 14.include "../../graphics/cairo/buildlink3.mk"
13.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs29/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs29/Makefile.common 2023/07/31 15:03:33 1.1
+++ pkgsrc/editors/emacs29/Makefile.common 2023/08/12 03:20:58 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile.common,v 1.1 2023/07/31 15:03:33 ryoon Exp $ 1# $NetBSD: Makefile.common,v 1.2 2023/08/12 03:20:58 wiz Exp $
2# 2#
3# used by editors/emacs29/Makefile 3# used by editors/emacs29/Makefile
4# used by editors/emacs29-nox11/Makefile 4# used by editors/emacs29-nox11/Makefile
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7 7
8DISTNAME= emacs-${EMACS_VERSION} 8DISTNAME= emacs-${EMACS_VERSION}
9PKGNAME?= ${DISTNAME:S/emacs/emacs29/} 9PKGNAME?= ${DISTNAME:S/emacs/emacs29/}
10CATEGORIES= editors 10CATEGORIES= editors
11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
12EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= https://www.gnu.org/software/emacs/ 15HOMEPAGE= https://www.gnu.org/software/emacs/
16COMMENT= GNU editing macros (editor) 16COMMENT= GNU editing macros (editor)
17LICENSE= gnu-gpl-v3 17LICENSE= gnu-gpl-v3
18 18
19WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 19WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
20 20
21# use makeinfo from pkgsrc/deve/gtexinfo 21# use makeinfo from pkgsrc/deve/gtexinfo
22TEXINFO_REQD= 4.13 22TEXINFO_REQD+= 4.13
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25INFO_FILES= yes 25INFO_FILES= yes
26USE_TOOLS+= autoconf gmake gzip makeinfo gm4 gsed 26USE_TOOLS+= autoconf gmake gzip makeinfo gm4 gsed
27 27
28REPLACE_SH+= autogen.sh 28REPLACE_SH+= autogen.sh
29 29
30CONFIGURE_ARGS+= --srcdir=${WRKSRC} 30CONFIGURE_ARGS+= --srcdir=${WRKSRC}
31CONFIGURE_ARGS+= --localstatedir=${VARBASE} 31CONFIGURE_ARGS+= --localstatedir=${VARBASE}
32CONFIGURE_ARGS+= --disable-autodepend 32CONFIGURE_ARGS+= --disable-autodepend
33CONFIGURE_ENV+= GAMEOWN=${GAMES_USER} 33CONFIGURE_ENV+= GAMEOWN=${GAMES_USER}
34 34
35USE_GAMESGROUP= yes 35USE_GAMESGROUP= yes
@@ -74,14 +74,13 @@ CPPFLAGS+= -DTERMINFO @@ -74,14 +74,13 @@ CPPFLAGS+= -DTERMINFO
74.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD" 74.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
75.include "../../mk/curses.buildlink3.mk" 75.include "../../mk/curses.buildlink3.mk"
76.else 76.else
77.include "../../mk/termcap.buildlink3.mk" 77.include "../../mk/termcap.buildlink3.mk"
78.endif 78.endif
79 79
80.include "../../mk/oss.buildlink3.mk" 80.include "../../mk/oss.buildlink3.mk"
81 81
82post-extract: 82post-extract:
83 cp ${.CURDIR}/../../editors/emacs29/files/site-init.el ${WRKSRC}/lisp 83 cp ${.CURDIR}/../../editors/emacs29/files/site-init.el ${WRKSRC}/lisp
84 ${CHMOD} -R go-w ${WRKSRC} 84 ${CHMOD} -R go-w ${WRKSRC}
85 85
86.include "../../devel/libgetopt/buildlink3.mk" 86.include "../../devel/libgetopt/buildlink3.mk"
87.include "../../textproc/tree-sitter/buildlink3.mk" 
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs29/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/emacs29/PLIST 2023/07/31 15:03:33 1.1
+++ pkgsrc/editors/emacs29/PLIST 2023/08/12 03:20:58 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2023/07/31 15:03:33 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2023/08/12 03:20:58 wiz Exp $
2bin/ctags 2bin/ctags
3bin/ebrowse 3bin/ebrowse
4bin/emacs 4bin/emacs
5bin/emacs-${PKGVERSION} 5bin/emacs-${PKGVERSION}
6bin/emacsclient 6bin/emacsclient
7bin/etags 7bin/etags
8include/emacs-module.h 8include/emacs-module.h
9info/auth.info.gz 9info/auth.info.gz
10info/autotype.info.gz 10info/autotype.info.gz
11info/bovine.info.gz 11info/bovine.info.gz
12info/calc.info.gz 12info/calc.info.gz
13info/ccmode.info.gz 13info/ccmode.info.gz
14info/cl.info.gz 14info/cl.info.gz
@@ -1618,28 +1618,30 @@ share/emacs/${PKGVERSION}/lisp/emacs-lis @@ -1618,28 +1618,30 @@ share/emacs/${PKGVERSION}/lisp/emacs-lis
1618share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-indent.elc 1618share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-indent.elc
1619share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-lib.el.gz 1619share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-lib.el.gz
1620share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-lib.elc 1620share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-lib.elc
1621share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-loaddefs.el.gz 1621share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-loaddefs.el.gz
1622share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-loaddefs.elc 1622share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-loaddefs.elc
1623share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-macs.el.gz 1623share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-macs.el.gz
1624share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-macs.elc 1624share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-macs.elc
1625share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-preloaded.el.gz 1625share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-preloaded.el.gz
1626share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-preloaded.elc 1626share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-preloaded.elc
1627share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-print.el.gz 1627share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-print.el.gz
1628share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-print.elc 1628share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-print.elc
1629share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.el.gz 1629share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.el.gz
1630share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.elc 1630share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.elc
1631share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el 1631share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el.gz
1632share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el 1632share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.elc
 1633share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el.gz
 1634share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.elc
1633share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.el.gz 1635share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.el.gz
1634share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.elc 1636share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.elc
1635share/emacs/${PKGVERSION}/lisp/emacs-lisp/crm.el.gz 1637share/emacs/${PKGVERSION}/lisp/emacs-lisp/crm.el.gz
1636share/emacs/${PKGVERSION}/lisp/emacs-lisp/crm.elc 1638share/emacs/${PKGVERSION}/lisp/emacs-lisp/crm.elc
1637share/emacs/${PKGVERSION}/lisp/emacs-lisp/cursor-sensor.el.gz 1639share/emacs/${PKGVERSION}/lisp/emacs-lisp/cursor-sensor.el.gz
1638share/emacs/${PKGVERSION}/lisp/emacs-lisp/cursor-sensor.elc 1640share/emacs/${PKGVERSION}/lisp/emacs-lisp/cursor-sensor.elc
1639share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug-early.el.gz 1641share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug-early.el.gz
1640share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug-early.elc 1642share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug-early.elc
1641share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug.el.gz 1643share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug.el.gz
1642share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug.elc 1644share/emacs/${PKGVERSION}/lisp/emacs-lisp/debug.elc
1643share/emacs/${PKGVERSION}/lisp/emacs-lisp/derived.el.gz 1645share/emacs/${PKGVERSION}/lisp/emacs-lisp/derived.el.gz
1644share/emacs/${PKGVERSION}/lisp/emacs-lisp/derived.elc 1646share/emacs/${PKGVERSION}/lisp/emacs-lisp/derived.elc
1645share/emacs/${PKGVERSION}/lisp/emacs-lisp/disass.el.gz 1647share/emacs/${PKGVERSION}/lisp/emacs-lisp/disass.el.gz
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs29/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs29/options.mk 2023/07/31 15:03:33 1.1
+++ pkgsrc/editors/emacs29/options.mk 2023/08/12 03:20:58 1.2
@@ -1,60 +1,89 @@ @@ -1,60 +1,89 @@
1# $NetBSD: options.mk,v 1.1 2023/07/31 15:03:33 ryoon Exp $ 1# $NetBSD: options.mk,v 1.2 2023/08/12 03:20:58 wiz 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 gnutls imagemagick jansson svg xaw3d xml 5PKG_SUPPORTED_OPTIONS= dbus gnutls imagemagick jansson libgccjit libotf libwebp svg tree-sitter xaw3d 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
11PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit 11PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
12PKG_SUGGESTED_OPTIONS.Darwin= nextstep 12PKG_SUGGESTED_OPTIONS.Darwin= nextstep
13# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk2, 13# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk2,
14# gtk3, xaw or lucid or athena, motif, no) 14# gtk3, xaw, no)
15# gtk in next line implies gtk2, xaw = athena = lucid 15# gtk in next line implies gtk2, xaw
16PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw 16PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 xaw
17# gtk2 and gtk has the same effect 17# gtk2 and gtk has the same effect
18# gtk3 is default in the logic below (even not included in SUGGESTED_=) 18# gtk3 is default in the logic below (even not included in SUGGESTED_=)
19# gtk* will be ignored for nextstep even shown as selected. 19# gtk* will be ignored for nextstep even shown as selected.
20 20
21# imagemagick is disabled because of stability/security 21# imagemagick is disabled because of stability/security
22# svg is omitted because it is rarely needed and heavyweight due to the rust dependency 22# svg is omitted because it is rarely needed and heavyweight due to the rust dependency
23# xaw3d is omitted because it is only valid with xaw 23# xaw3d is omitted because it is only valid with xaw
24PKG_SUGGESTED_OPTIONS= dbus gnutls gtk3 jansson xml x11 24PKG_SUGGESTED_OPTIONS= dbus libgccjit gnutls gtk3 jansson libotf libwebp tree-sitter xml x11
25 25
26.include "../../mk/bsd.options.mk" 26.include "../../mk/bsd.options.mk"
27 27
28### --- Check window-system independent options first 28### --- Check window-system independent options first
29### 29###
30### Support D-BUS 30### Support D-BUS
31### 31###
32.if !empty(PKG_OPTIONS:Mdbus) 32.if !empty(PKG_OPTIONS:Mdbus)
33. include "../../sysutils/dbus/buildlink3.mk" 33. include "../../sysutils/dbus/buildlink3.mk"
34.else 34.else
35CONFIGURE_ARGS+= --without-dbus 35CONFIGURE_ARGS+= --without-dbus
36.endif 36.endif
37 37
38### 38###
39### Support JSON 39### Support JSON
40### 40###
41.if !empty(PKG_OPTIONS:Mjansson) 41.if !empty(PKG_OPTIONS:Mjansson)
42. include "../../textproc/jansson/buildlink3.mk" 42. include "../../textproc/jansson/buildlink3.mk"
43.else 43.else
44CONFIGURE_ARGS+= --without-json 44CONFIGURE_ARGS+= --without-json
45.endif 45.endif
46 46
47### 47###
 48### Support libgccjit
 49###
 50.if !empty(PKG_OPTIONS:Mlibgccjit)
 51CONFIGURE_ARGS+= --with-native-compilation
 52LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gcc13-libjit}/gcc13/lib
 53GENERATE_PLIST+= cd ${DESTDIR}${PREFIX} && \
 54 ${FIND} lib/emacs/${PKGVERSION_NOREV}/native-lisp/ \( -type f -o -type l \) -print | ${SORT};
 55. include "../../lang/gcc13-libjit/buildlink3.mk"
 56.endif
 57
 58###
 59### Support OTF
 60###
 61.if !empty(PKG_OPTIONS:Mlibotf)
 62. include "../../graphics/libotf/buildlink3.mk"
 63.else
 64CONFIGURE_ARGS+= --without-libotf
 65.endif
 66
 67###
 68### Support WEBP
 69###
 70.if !empty(PKG_OPTIONS:Mlibwebp)
 71. include "../../graphics/libwebp/buildlink3.mk"
 72.else
 73CONFIGURE_ARGS+= --without-webp
 74.endif
 75
 76###
48### Support XML2 77### Support XML2
49### 78###
50.if !empty(PKG_OPTIONS:Mxml) 79.if !empty(PKG_OPTIONS:Mxml)
51USE_TOOLS+= pkg-config 80USE_TOOLS+= pkg-config
52BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17 81BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
53.include "../../textproc/libxml2/buildlink3.mk" 82.include "../../textproc/libxml2/buildlink3.mk"
54.else 83.else
55CONFIGURE_ARGS+= --without-xml2 84CONFIGURE_ARGS+= --without-xml2
56.endif 85.endif
57 86
58### 87###
59### Support gnutls 88### Support gnutls
60### 89###
@@ -67,27 +96,26 @@ CONFIGURE_ARGS+= --without-gnutls @@ -67,27 +96,26 @@ CONFIGURE_ARGS+= --without-gnutls
67 96
68### 97###
69### Check non nextstep (implies x11) options 98### Check non nextstep (implies x11) options
70### 99###
71### x11 is selected (as SUGGESTED above) 100### x11 is selected (as SUGGESTED above)
72### 101###
73.if !empty(PKG_OPTIONS:Mx11) 102.if !empty(PKG_OPTIONS:Mx11)
74### 103###
75### on OSX the configure script will select the "nextstep" window system 104### on OSX the configure script will select the "nextstep" window system
76### unless you explicitly tell it not to. this should not impact other 105### unless you explicitly tell it not to. this should not impact other
77### platforms. 106### platforms.
78### 107###
79CONFIGURE_ARGS+= --without-ns 108CONFIGURE_ARGS+= --without-ns
80 
81### 109###
82### Support SVG 110### Support SVG
83### 111###
84. if !empty(PKG_OPTIONS:Msvg) 112. if !empty(PKG_OPTIONS:Msvg)
85.include "../../graphics/librsvg/buildlink3.mk" 113.include "../../graphics/librsvg/buildlink3.mk"
86. else 114. else
87CONFIGURE_ARGS+= --without-rsvg 115CONFIGURE_ARGS+= --without-rsvg
88. endif 116. endif
89 117
90### 118###
91### Support ImageMagick (not recognized for now, sorry) 119### Support ImageMagick (not recognized for now, sorry)
92### 120###
93. if !empty(PKG_OPTIONS:Mimagemagick) 121. if !empty(PKG_OPTIONS:Mimagemagick)
@@ -101,57 +129,52 @@ CONFIGURE_ARGS+= --without-imagemagick @@ -101,57 +129,52 @@ CONFIGURE_ARGS+= --without-imagemagick
101### Support Xaw3d (This is only valid with Lucid Toolkit) 129### Support Xaw3d (This is only valid with Lucid Toolkit)
102### 130###
103. if !empty(PKG_OPTIONS:Mxaw3d) 131. if !empty(PKG_OPTIONS:Mxaw3d)
104.include "../../x11/libXaw3d/buildlink3.mk" 132.include "../../x11/libXaw3d/buildlink3.mk"
105. else 133. else
106CONFIGURE_ARGS+= --without-xaw3d 134CONFIGURE_ARGS+= --without-xaw3d
107. endif 135. endif
108 136
109### 137###
110### Toolkit selection 138### Toolkit selection
111### 139###
112. if (empty(PKG_OPTIONS:Mxaw) && \ 140. if (empty(PKG_OPTIONS:Mxaw) && \
113 empty(PKG_OPTIONS:Mgtk) && \ 141 empty(PKG_OPTIONS:Mgtk) && \
114 empty(PKG_OPTIONS:Mgtk2) && \ 142 empty(PKG_OPTIONS:Mgtk2))
115 empty(PKG_OPTIONS:Mmotif)) 
116# defaults to gtk3 143# defaults to gtk3
117USE_TOOLS+= pkg-config 144USE_TOOLS+= pkg-config
118.include "../../x11/gtk3/buildlink3.mk" 145.include "../../x11/gtk3/buildlink3.mk"
119CONFIGURE_ARGS+= --with-x-toolkit=gtk3 146CONFIGURE_ARGS+= --with-x-toolkit=gtk3
120. elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk) 147. elif !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk)
121USE_TOOLS+= pkg-config 148USE_TOOLS+= pkg-config
122.include "../../x11/gtk2/buildlink3.mk" 149.include "../../x11/gtk2/buildlink3.mk"
123CONFIGURE_ARGS+= --with-x-toolkit=gtk2 150CONFIGURE_ARGS+= --with-x-toolkit=gtk2
124. elif !empty(PKG_OPTIONS:Mxaw) 151. elif !empty(PKG_OPTIONS:Mxaw)
125.include "../../mk/xaw.buildlink3.mk" 152.include "../../mk/xaw.buildlink3.mk"
126CONFIGURE_ARGS+= --with-x-toolkit=athena 153CONFIGURE_ARGS+= --with-x-toolkit=athena
127. elif !empty(PKG_OPTIONS:Mmotif) 
128.include "../../mk/motif.buildlink3.mk" 
129CONFIGURE_ARGS+= --with-x-toolkit=motif 
130. endif 154. endif
131 155
132### 156###
133### End of Check non nextstep (implies x11) options 157### End of Check non nextstep (implies x11) options
134 158
135.include "../../mk/jpeg.buildlink3.mk" 159.include "../../mk/jpeg.buildlink3.mk"
136.include "../../graphics/tiff/buildlink3.mk" 160.include "../../graphics/tiff/buildlink3.mk"
137.include "../../graphics/giflib/buildlink3.mk" 161.include "../../graphics/giflib/buildlink3.mk"
138.include "../../graphics/png/buildlink3.mk" 162.include "../../graphics/png/buildlink3.mk"
139.include "../../x11/libSM/buildlink3.mk" 163.include "../../x11/libSM/buildlink3.mk"
140.include "../../x11/libXaw/buildlink3.mk" 164.include "../../x11/libXaw/buildlink3.mk"
141.include "../../x11/libXpm/buildlink3.mk" 165.include "../../x11/libXpm/buildlink3.mk"
142.include "../../x11/libXrender/buildlink3.mk" 166.include "../../x11/libXrender/buildlink3.mk"
143 167
144 
145### 168###
146### Support using NextStep (Cocoa or GNUstep) windowing system 169### Support using NextStep (Cocoa or GNUstep) windowing system
147### 170###
148# If you check the variable system-configuration-options after Emacs is 171# If you check the variable system-configuration-options after Emacs is
149# built, you may see many x11 related configurations. But if you have 172# built, you may see many x11 related configurations. But if you have
150# --without-x there, all other x11 related configurations were ignored. 173# --without-x there, all other x11 related configurations were ignored.
151# 174#
152.elif !empty(PKG_OPTIONS:Mnextstep) 175.elif !empty(PKG_OPTIONS:Mnextstep)
153. if exists(/System/Library/Frameworks/Cocoa.framework) 176. if exists(/System/Library/Frameworks/Cocoa.framework)
154APPLICATIONS_DIR= Applications 177APPLICATIONS_DIR= Applications
155PLIST_SRC+= PLIST.cocoa 178PLIST_SRC+= PLIST.cocoa
156CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/Emacs 179CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/Emacs
157CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/libexec/Emacs.pdmp 180CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/libexec/Emacs.pdmp
@@ -173,17 +196,42 @@ USE_TOOLS+= pax @@ -173,17 +196,42 @@ USE_TOOLS+= pax
173post-install: 196post-install:
174 cd ${WRKSRC}/nextstep && \ 197 cd ${WRKSRC}/nextstep && \
175 pax -rw -pp -pm Emacs.app ${DESTDIR}${PREFIX}/${APPLICATIONS_DIR} 198 pax -rw -pp -pm Emacs.app ${DESTDIR}${PREFIX}/${APPLICATIONS_DIR}
176 199
177.else # no window system 200.else # no window system
178CONFIGURE_ARGS+= --without-x 201CONFIGURE_ARGS+= --without-x
179CONFIGURE_ARGS+= --without-xpm 202CONFIGURE_ARGS+= --without-xpm
180CONFIGURE_ARGS+= --without-jpeg 203CONFIGURE_ARGS+= --without-jpeg
181CONFIGURE_ARGS+= --without-tiff 204CONFIGURE_ARGS+= --without-tiff
182CONFIGURE_ARGS+= --without-gif 205CONFIGURE_ARGS+= --without-gif
183CONFIGURE_ARGS+= --without-png 206CONFIGURE_ARGS+= --without-png
184.endif 207.endif
185 208
 209.if !empty(PKG_OPTIONS:Mtree-sitter)
 210DEPENDS+= tree-sitter-bash-[0-9]*:../../textproc/tree-sitter-bash
 211DEPENDS+= tree-sitter-c-[0-9]*:../../textproc/tree-sitter-c
 212DEPENDS+= tree-sitter-c-sharp-[0-9]*:../../textproc/tree-sitter-c-sharp
 213DEPENDS+= tree-sitter-cmake-[0-9]*:../../textproc/tree-sitter-cmake
 214DEPENDS+= tree-sitter-cpp-[0-9]*:../../textproc/tree-sitter-cpp
 215DEPENDS+= tree-sitter-css-[0-9]*:../../textproc/tree-sitter-css
 216DEPENDS+= tree-sitter-dockerfile-[0-9]*:../../textproc/tree-sitter-dockerfile
 217DEPENDS+= tree-sitter-elixir-[0-9]*:../../textproc/tree-sitter-elixir
 218DEPENDS+= tree-sitter-go-[0-9]*:../../textproc/tree-sitter-go
 219DEPENDS+= tree-sitter-go-mod-[0-9]*:../../textproc/tree-sitter-go-mod
 220DEPENDS+= tree-sitter-heex-[0-9]*:../../textproc/tree-sitter-heex
 221DEPENDS+= tree-sitter-html-[0-9]*:../../textproc/tree-sitter-html
 222DEPENDS+= tree-sitter-java-[0-9]*:../../textproc/tree-sitter-java
 223DEPENDS+= tree-sitter-json-[0-9]*:../../textproc/tree-sitter-json
 224DEPENDS+= tree-sitter-python-[0-9]*:../../textproc/tree-sitter-python
 225DEPENDS+= tree-sitter-ruby-[0-9]*:../../textproc/tree-sitter-ruby
 226DEPENDS+= tree-sitter-rust-[0-9]*:../../textproc/tree-sitter-rust
 227DEPENDS+= tree-sitter-toml-[0-9]*:../../textproc/tree-sitter-toml
 228DEPENDS+= tree-sitter-tsx-[0-9]*:../../textproc/tree-sitter-tsx
 229DEPENDS+= tree-sitter-typescript-[0-9]*:../../textproc/tree-sitter-typescript
 230DEPENDS+= tree-sitter-yaml-[0-9]*:../../textproc/tree-sitter-yaml
 231.include "../../textproc/tree-sitter/buildlink3.mk"
 232.endif
 233
186# Local Variables: 234# Local Variables:
187# mode: outline-minor 235# mode: outline-minor
188# outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local" 236# outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local"
189# End: 237# End: