Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171414125411040"
MIME-Version: 1.0
Date: Fri, 26 Apr 2024 14:20:54 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240426142054.8F31CFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171414125411040
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Apr 26 14:20:54 UTC 2024

Modified Files:
	pkgsrc/editors/emacs: modules.mk
	pkgsrc/mk/defaults: mk.conf

Log Message:
mk: switch default emacs version to emacs29


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/editors/emacs/modules.mk
cvs rdiff -u -r1.345 -r1.346 pkgsrc/mk/defaults/mk.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171414125411040
Content-Disposition: inline
Content-Length: 2077
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.35 pkgsrc/editors/emacs/modules.mk:1.36
--- pkgsrc/editors/emacs/modules.mk:1.35	Wed Aug 30 20:15:19 2023
+++ pkgsrc/editors/emacs/modules.mk	Fri Apr 26 14:20:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.35 2023/08/30 20:15:19 gdt Exp $
+# $NetBSD: modules.mk,v 1.36 2024/04/26 14:20:54 wiz Exp $
 #
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
 #
@@ -48,7 +48,7 @@
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
 #		Default value:
-#			emacs28
+#			emacs29
 #
 # Variables ELPs can provide:
 #
@@ -71,7 +71,7 @@
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
 #		Default value:
-#			emacs28, emacs28nox,
+#			emacs29, emacs29nox, emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
 #			emacs21, emacs21nox,
 #			emacs20, xemacs215, xemacs215nox,

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.345 pkgsrc/mk/defaults/mk.conf:1.346
--- pkgsrc/mk/defaults/mk.conf:1.345	Fri Apr 12 19:55:16 2024
+++ pkgsrc/mk/defaults/mk.conf	Fri Apr 26 14:20:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.345 2024/04/12 19:55:16 riastradh Exp $
+# $NetBSD: mk.conf,v 1.346 2024/04/26 14:20:54 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -989,13 +989,13 @@ ELK_GUI?=	none
 # Possible: none, or some combination of xaw and/or motif
 # Default: none
 
-EMACS_TYPE?=	emacs28
+EMACS_TYPE?=	emacs29
 # Used by emacs/modules.mk to determine which emacs version should be installed
 # and emacs lisp packages should be built for.
-# Possible: emacs28, emacs28nox, emacs27, emacs27nox, emacs26, emacs26nox,
-#       emacs25, emacs25nox, emacs21, emacs21nox, emacs20,
+# Possible: emacs29, emacs29nox, emacs28, emacs28nox, emacs27, emacs27nox,
+#       emacs26, emacs26nox, emacs21, emacs21nox, emacs20,
 #	xemacs214, xemacs215
-# Default: emacs28
+# Default: emacs29
 
 EXIM_GROUP?=	mail
 # Used in the exim package to specify the server group.


--_----------=_171414125411040--