Fri Apr 26 14:20:54 2024 UTC (17d)
mk: switch default emacs version to emacs29


(wiz)
diff -r1.35 -r1.36 pkgsrc/editors/emacs/modules.mk
diff -r1.345 -r1.346 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.35 -r1.36 pkgsrc/editors/emacs/modules.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs/modules.mk 2023/08/30 20:15:19 1.35
+++ pkgsrc/editors/emacs/modules.mk 2024/04/26 14:20:54 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: modules.mk,v 1.35 2023/08/30 20:15:19 gdt Exp $ 1# $NetBSD: modules.mk,v 1.36 2024/04/26 14:20:54 wiz Exp $
2# 2#
3# This Makefile fragment handles Emacs Lisp Packages (== ELPs). 3# This Makefile fragment handles Emacs Lisp Packages (== ELPs).
4# 4#
5# Note to users: 5# Note to users:
6# 6#
7# * Users choose one favourite Emacs version. 7# * Users choose one favourite Emacs version.
8# 8#
9# * Emacs Lisp files are installed... 9# * Emacs Lisp files are installed...
10# GNU emacs 10# GNU emacs
11# -> ${PREFIX}/share/emacs/site-lisp/foo/... 11# -> ${PREFIX}/share/emacs/site-lisp/foo/...
12# XEmacs 12# XEmacs
13# ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/... 13# ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/...
14# 14#
@@ -38,50 +38,50 @@ @@ -38,50 +38,50 @@
38# Variables for users: 38# Variables for users:
39# 39#
40# EMACS_TYPE 40# EMACS_TYPE
41# Description: 41# Description:
42# The user's favourite Emacs version. The default 42# The user's favourite Emacs version. The default
43# value is set in mk/defaults/mk.conf. 43# value is set in mk/defaults/mk.conf.
44# Possible values: 44# Possible values:
45# emacs29, emacs29nox, emacs28, emacs28nox, 45# emacs29, emacs29nox, emacs28, emacs28nox,
46# emacs27, emacs27nox, emacs26, emacs26nox, 46# emacs27, emacs27nox, emacs26, emacs26nox,
47# emacs21, emacs21nox, 47# emacs21, emacs21nox,
48# emacs20, xemacs215, xemacs215nox, 48# emacs20, xemacs215, xemacs215nox,
49# xemacs214, xemacs214nox 49# xemacs214, xemacs214nox
50# Default value: 50# Default value:
51# emacs28 51# emacs29
52# 52#
53# Variables ELPs can provide: 53# Variables ELPs can provide:
54# 54#
55# EMACS_MODULES 55# EMACS_MODULES
56# Description: 56# Description:
57# List of Emacs LISP modules that the current ELP 57# List of Emacs LISP modules that the current ELP
58# needs at run-time. 58# needs at run-time.
59# Possible values: 59# Possible values:
60# base, leim 60# base, leim
61# Default value: 61# Default value:
62# <undefined> 62# <undefined>
63# 63#
64# EMACS_VERSIONS_ACCEPTED 64# EMACS_VERSIONS_ACCEPTED
65# Description: 65# Description:
66# Versions the ELP accepts (supports). 66# Versions the ELP accepts (supports).
67# Possible values: 67# Possible values:
68# emacs29, emacs29nox, emacs28, emacs28nox, 68# emacs29, emacs29nox, emacs28, emacs28nox,
69# emacs27, emacs27nox, emacs26, emacs26nox, 69# emacs27, emacs27nox, emacs26, emacs26nox,
70# emacs21, emacs21nox, 70# emacs21, emacs21nox,
71# emacs20, xemacs215, xemacs215nox, 71# emacs20, xemacs215, xemacs215nox,
72# xemacs214, xemacs214nox 72# xemacs214, xemacs214nox
73# Default value: 73# Default value:
74# emacs28, emacs28nox, 74# emacs29, emacs29nox, emacs28, emacs28nox,
75# emacs27, emacs27nox, emacs26, emacs26nox, 75# emacs27, emacs27nox, emacs26, emacs26nox,
76# emacs21, emacs21nox, 76# emacs21, emacs21nox,
77# emacs20, xemacs215, xemacs215nox, 77# emacs20, xemacs215, xemacs215nox,
78# xemacs214, xemacs214nox 78# xemacs214, xemacs214nox
79# 79#
80# EMACS_BUILDLINK 80# EMACS_BUILDLINK
81# Description: 81# Description:
82# Whether create buildlink directory of *.el / *.elc 82# Whether create buildlink directory of *.el / *.elc
83# files. ELPs which include other ELP's buildlink3.mk 83# files. ELPs which include other ELP's buildlink3.mk
84# must define this value. 84# must define this value.
85# Possible values: 85# Possible values:
86# <defined>, <undefined> 86# <defined>, <undefined>
87# Default value: 87# Default value:
cvs diff -r1.345 -r1.346 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2024/04/12 19:55:16 1.345
+++ pkgsrc/mk/defaults/mk.conf 2024/04/26 14:20:54 1.346
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.345 2024/04/12 19:55:16 riastradh Exp $ 1# $NetBSD: mk.conf,v 1.346 2024/04/26 14:20:54 wiz Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -979,33 +979,33 @@ DQCACHE_USER?= dqcache @@ -979,33 +979,33 @@ DQCACHE_USER?= dqcache
979# Possible: any user name 979# Possible: any user name
980# Default: dqcache 980# Default: dqcache
981 981
982DQCACHE_GROUP?= dqcache 982DQCACHE_GROUP?= dqcache
983# System group for dqcache server. 983# System group for dqcache server.
984# Possible: any group name 984# Possible: any group name
985# Default: dqcache 985# Default: dqcache
986 986
987ELK_GUI?= none 987ELK_GUI?= none
988# Used by elk to determine which GUI API modules are enabled. 988# Used by elk to determine which GUI API modules are enabled.
989# Possible: none, or some combination of xaw and/or motif 989# Possible: none, or some combination of xaw and/or motif
990# Default: none 990# Default: none
991 991
992EMACS_TYPE?= emacs28 992EMACS_TYPE?= emacs29
993# Used by emacs/modules.mk to determine which emacs version should be installed 993# Used by emacs/modules.mk to determine which emacs version should be installed
994# and emacs lisp packages should be built for. 994# and emacs lisp packages should be built for.
995# Possible: emacs28, emacs28nox, emacs27, emacs27nox, emacs26, emacs26nox, 995# Possible: emacs29, emacs29nox, emacs28, emacs28nox, emacs27, emacs27nox,
996# emacs25, emacs25nox, emacs21, emacs21nox, emacs20, 996# emacs26, emacs26nox, emacs21, emacs21nox, emacs20,
997# xemacs214, xemacs215 997# xemacs214, xemacs215
998# Default: emacs28 998# Default: emacs29
999 999
1000EXIM_GROUP?= mail 1000EXIM_GROUP?= mail
1001# Used in the exim package to specify the server group. 1001# Used in the exim package to specify the server group.
1002# Possible: any group name 1002# Possible: any group name
1003# Default: mail 1003# Default: mail
1004 1004
1005EXIM_USER?= mail 1005EXIM_USER?= mail
1006# Used in the exim package to specify the server user. 1006# Used in the exim package to specify the server user.
1007# Possible: any user name 1007# Possible: any user name
1008# Default: mail 1008# Default: mail
1009 1009
1010FOX_USE_XUNICODE?= YES 1010FOX_USE_XUNICODE?= YES
1011# Used in fox to build in support for Unicode by XUnicode. See 1011# Used in fox to build in support for Unicode by XUnicode. See