CVS commit: pkgsrc/editors/emacs29

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 12 03:20:58 UTC 2023

Modified Files:
        pkgsrc/editors/emacs29: Makefile Makefile.common PLIST options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs29/Makefile \
    pkgsrc/editors/emacs29/Makefile.common pkgsrc/editors/emacs29/PLIST \
    pkgsrc/editors/emacs29/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/editors/emacs29/Makefile
diff -u pkgsrc/editors/emacs29/Makefile:1.1 pkgsrc/editors/emacs29/Makefile:1.2
--- pkgsrc/editors/emacs29/Makefile:1.1 Mon Jul 31 15:03:33 2023
+++ pkgsrc/editors/emacs29/Makefile     Sat Aug 12 03:20:58 2023
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2023/07/31 15:03:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2023/08/12 03:20:58 wiz Exp $
 
 CONFLICTS+=    emacs29-nox11-[0-9]*
 
+PKGREVISION=   1
+
 .include "../../editors/emacs29/Makefile.common"
 
 .include "options.mk"
Index: pkgsrc/editors/emacs29/Makefile.common
diff -u pkgsrc/editors/emacs29/Makefile.common:1.1 pkgsrc/editors/emacs29/Makefile.common:1.2
--- pkgsrc/editors/emacs29/Makefile.common:1.1  Mon Jul 31 15:03:33 2023
+++ pkgsrc/editors/emacs29/Makefile.common      Sat Aug 12 03:20:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2023/07/31 15:03:33 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.2 2023/08/12 03:20:58 wiz Exp $
 #
 # used by editors/emacs29/Makefile
 # used by editors/emacs29-nox11/Makefile
@@ -19,7 +19,7 @@ LICENSE=      gnu-gpl-v3
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/b$//}
 
 # use makeinfo from pkgsrc/deve/gtexinfo
-TEXINFO_REQD=  4.13
+TEXINFO_REQD+= 4.13
 
 GNU_CONFIGURE= yes
 INFO_FILES=    yes
@@ -84,4 +84,3 @@ post-extract:
        ${CHMOD} -R go-w ${WRKSRC}
 
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../textproc/tree-sitter/buildlink3.mk"
Index: pkgsrc/editors/emacs29/PLIST
diff -u pkgsrc/editors/emacs29/PLIST:1.1 pkgsrc/editors/emacs29/PLIST:1.2
--- pkgsrc/editors/emacs29/PLIST:1.1    Mon Jul 31 15:03:33 2023
+++ pkgsrc/editors/emacs29/PLIST        Sat Aug 12 03:20:58 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/07/31 15:03:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/08/12 03:20:58 wiz Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -1628,8 +1628,10 @@ share/emacs/${PKGVERSION}/lisp/emacs-lis
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-print.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.elc
-share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el
-share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.el.gz
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp-cstr.elc
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.el.gz
+share/emacs/${PKGVERSION}/lisp/emacs-lisp/comp.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.el.gz
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/copyright.elc
 share/emacs/${PKGVERSION}/lisp/emacs-lisp/crm.el.gz
Index: pkgsrc/editors/emacs29/options.mk
diff -u pkgsrc/editors/emacs29/options.mk:1.1 pkgsrc/editors/emacs29/options.mk:1.2
--- pkgsrc/editors/emacs29/options.mk:1.1       Mon Jul 31 15:03:33 2023
+++ pkgsrc/editors/emacs29/options.mk   Sat Aug 12 03:20:58 2023
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2023/07/31 15:03:33 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2023/08/12 03:20:58 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS=                 dbus gnutls imagemagick jansson svg xaw3d xml
+PKG_SUPPORTED_OPTIONS=                 dbus gnutls imagemagick jansson libgccjit libotf libwebp svg tree-sitter xaw3d xml
 # xaw3d is only valid with tookit = xaw
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=          window-system
@@ -11,9 +11,9 @@ PKG_OPTIONS_GROUP.window-system=      x11 nex
 PKG_OPTIONS_OPTIONAL_GROUPS+=          toolkit
 PKG_SUGGESTED_OPTIONS.Darwin=          nextstep
 #  --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk2,
-#                          gtk3, xaw or lucid or athena, motif, no)
-# gtk in next line implies gtk2, xaw = athena = lucid
-PKG_OPTIONS_GROUP.toolkit=             gtk gtk2 gtk3 motif xaw
+#                          gtk3, xaw, no)
+# gtk in next line implies gtk2, xaw
+PKG_OPTIONS_GROUP.toolkit=             gtk gtk2 gtk3 xaw
 # gtk2 and gtk has the same effect
 # gtk3 is default in the logic below (even not included in SUGGESTED_=)
 # gtk* will be ignored for nextstep even shown as selected.
@@ -21,7 +21,7 @@ PKG_OPTIONS_GROUP.toolkit=            gtk gtk2 gtk
 # imagemagick is disabled because of stability/security
 # svg is omitted because it is rarely needed and heavyweight due to the rust dependency
 # xaw3d is omitted because it is only valid with xaw
-PKG_SUGGESTED_OPTIONS= dbus gnutls gtk3 jansson xml x11
+PKG_SUGGESTED_OPTIONS= dbus libgccjit gnutls gtk3 jansson libotf libwebp tree-sitter xml x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -45,6 +45,35 @@ CONFIGURE_ARGS+=     --without-json
 .endif
 
 ###
+### Support libgccjit
+###
+.if !empty(PKG_OPTIONS:Mlibgccjit)
+CONFIGURE_ARGS+=       --with-native-compilation
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gcc13-libjit}/gcc13/lib
+GENERATE_PLIST+=       cd ${DESTDIR}${PREFIX} && \
+        ${FIND} lib/emacs/${PKGVERSION_NOREV}/native-lisp/ \( -type f -o -type l \) -print | ${SORT};
+.  include "../../lang/gcc13-libjit/buildlink3.mk"
+.endif
+
+###
+### Support OTF
+###
+.if !empty(PKG_OPTIONS:Mlibotf)
+.  include "../../graphics/libotf/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-libotf
+.endif
+
+###
+### Support WEBP
+###
+.if !empty(PKG_OPTIONS:Mlibwebp)
+.  include "../../graphics/libwebp/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-webp
+.endif
+
+###
 ### Support XML2
 ###
 .if !empty(PKG_OPTIONS:Mxml)
@@ -77,7 +106,6 @@ CONFIGURE_ARGS+=     --without-gnutls
 ### platforms.
 ###
 CONFIGURE_ARGS+=       --without-ns
-
 ###
 ### Support SVG
 ###
@@ -111,8 +139,7 @@ CONFIGURE_ARGS+=    --without-xaw3d
 ###
 .  if (empty(PKG_OPTIONS:Mxaw) && \
        empty(PKG_OPTIONS:Mgtk) && \
-       empty(PKG_OPTIONS:Mgtk2) && \
-       empty(PKG_OPTIONS:Mmotif))
+       empty(PKG_OPTIONS:Mgtk2))
 # defaults to gtk3
 USE_TOOLS+=            pkg-config
 .include "../../x11/gtk3/buildlink3.mk"
@@ -124,9 +151,6 @@ CONFIGURE_ARGS+=    --with-x-toolkit=gtk2
 .  elif !empty(PKG_OPTIONS:Mxaw)
 .include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-x-toolkit=athena
-.  elif !empty(PKG_OPTIONS:Mmotif)
-.include "../../mk/motif.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-x-toolkit=motif
 .  endif
 
 ###
@@ -141,7 +165,6 @@ CONFIGURE_ARGS+=    --with-x-toolkit=motif
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 
-
 ###
 ### Support using NextStep (Cocoa or GNUstep) windowing system
 ###
@@ -183,6 +206,31 @@ CONFIGURE_ARGS+=   --without-gif
 CONFIGURE_ARGS+=       --without-png
 .endif
 
+.if !empty(PKG_OPTIONS:Mtree-sitter)
+DEPENDS+=      tree-sitter-bash-[0-9]*:../../textproc/tree-sitter-bash
+DEPENDS+=      tree-sitter-c-[0-9]*:../../textproc/tree-sitter-c
+DEPENDS+=      tree-sitter-c-sharp-[0-9]*:../../textproc/tree-sitter-c-sharp
+DEPENDS+=      tree-sitter-cmake-[0-9]*:../../textproc/tree-sitter-cmake
+DEPENDS+=      tree-sitter-cpp-[0-9]*:../../textproc/tree-sitter-cpp
+DEPENDS+=      tree-sitter-css-[0-9]*:../../textproc/tree-sitter-css
+DEPENDS+=      tree-sitter-dockerfile-[0-9]*:../../textproc/tree-sitter-dockerfile
+DEPENDS+=      tree-sitter-elixir-[0-9]*:../../textproc/tree-sitter-elixir
+DEPENDS+=      tree-sitter-go-[0-9]*:../../textproc/tree-sitter-go
+DEPENDS+=      tree-sitter-go-mod-[0-9]*:../../textproc/tree-sitter-go-mod
+DEPENDS+=      tree-sitter-heex-[0-9]*:../../textproc/tree-sitter-heex
+DEPENDS+=      tree-sitter-html-[0-9]*:../../textproc/tree-sitter-html
+DEPENDS+=      tree-sitter-java-[0-9]*:../../textproc/tree-sitter-java
+DEPENDS+=      tree-sitter-json-[0-9]*:../../textproc/tree-sitter-json
+DEPENDS+=      tree-sitter-python-[0-9]*:../../textproc/tree-sitter-python
+DEPENDS+=      tree-sitter-ruby-[0-9]*:../../textproc/tree-sitter-ruby
+DEPENDS+=      tree-sitter-rust-[0-9]*:../../textproc/tree-sitter-rust
+DEPENDS+=      tree-sitter-toml-[0-9]*:../../textproc/tree-sitter-toml
+DEPENDS+=      tree-sitter-tsx-[0-9]*:../../textproc/tree-sitter-tsx
+DEPENDS+=      tree-sitter-typescript-[0-9]*:../../textproc/tree-sitter-typescript
+DEPENDS+=      tree-sitter-yaml-[0-9]*:../../textproc/tree-sitter-yaml
+.include "../../textproc/tree-sitter/buildlink3.mk"
+.endif
+
 # Local Variables:
 # mode: outline-minor
 # outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local"