 @@ -1,14 +1,14 @@
-# $NetBSD: modules.mk,v 1.34 2023/08/23 13:16:21 tsutsui Exp $
+# $NetBSD: modules.mk,v 1.35 2023/08/30 20:15:19 gdt Exp $
+#
 # This Makefile fragment handles Emacs Lisp Packages (== ELPs).
+#
 # Note to users:
+#
 #	* Users choose one favourite Emacs version.
+#
 #	* Emacs Lisp files are installed...
 #		GNU emacs
 #			-> ${PREFIX}/share/emacs/site-lisp/foo/...
 #		XEmacs
 #			->${PREFIX}/lib/xemacs/site-packages/lisp/foo/...
+#
 @@ -34,56 +34,56 @@
 #	* Assume each ELP supports all Emacs versions by default.  If the
 #	  ELP supports only certain Emacs versions, define EMACS_VERSIONS
 #	  _ACCEPTED explicitly before including emacs/modules.mk.
+#
 # Variables for users:
+#
 #	EMACS_TYPE
 #		Description:
 #			The user's favourite Emacs version.  The default
 #			value is set in mk/defaults/mk.conf.
 #		Possible values:
 #			emacs29, emacs29nox, emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
-#			emacs25, emacs25nox, emacs21, emacs21nox,
+#			emacs21, emacs21nox,
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
 #		Default value:
 #			emacs28
+#
 # Variables ELPs can provide:
+#
 #	EMACS_MODULES
 #		Description:
 #			List of Emacs LISP modules that the current ELP
 #			needs at run-time.
 #		Possible values:
 #			base, leim
 #		Default value:
 #			<undefined>
+#
 #	EMACS_VERSIONS_ACCEPTED
 #		Description:
 #			Versions the ELP accepts (supports).
 #		Possible values:
 #			emacs29, emacs29nox, emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
-#			emacs25, emacs25nox, emacs21, emacs21nox,
+#			emacs21, emacs21nox,
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
 #		Default value:
 #			emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
-#			emacs25, emacs25nox, emacs21, emacs21nox,
+#			emacs21, emacs21nox,
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
+#
 #	EMACS_BUILDLINK
 #		Description:
 #			Whether create buildlink directory of *.el / *.elc
 #			files.  ELPs which include other ELP's buildlink3.mk
 #			must define this value.
 #		Possible values:
 #			<defined>, <undefined>
 #		Default value:
 #			<undefined>
+#
 @@ -128,27 +128,27 @@
 #			${PREFIX}/lib/xemacs/site-packages/lisp
+#
 #	EMACS_PKGNAME_PREFIX
 #		Description:
 #			The prefix of PKGNAME and DEPENDS lines.  All ELPs
 #			must honour this!
 #		Possible values:
 #			"", "xemacs-"
+#
 #	EMACS_VERSION_MAJOR
 #		Description:
 #			Emacs major version.
 #		Possible values:
-#			20, 21, 25, 26, 27, <integers more than that in the future>
+#			20, 21, 26, 27, 28, 29, <integers more than that in the future>
+#
 #	EMACS_VERSION_MINOR
 #		Description:
 #			Emacs minor version.
 #		Possible values:
 #			<integer>
+#
 #	EMACS_VERSION_MICRO
 #		Description:
 #			Emacs micro version.
 #		Possible values:
 #			<integer>
+#
 @@ -174,30 +174,30 @@
 #		Description:
 #			Same as the one in Makefile, except that
 #			${PREFIX} is omitted in PLIST.
 #		Possible values:
 #			share/emacs/site-lisp
 #			lib/xemacs/site-packages/lisp
+#
 #	EMACS_VERSION
 #		Description:
 #			XXX
 #		Possible values:
 #			XXX
+#
-#	FOR_{emacs29,emacs29nox,emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,emacs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	FOR_{emacs29,emacs29nox,emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #	FOR_{emacs,xemacs}
 #	FOR_{emacs_x,emacs_nox}
-#	NOTFOR_{emacs29,emacs29nox,emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,macs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	NOTFOR_{emacs29,emacs29nox,emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #	NOTFOR_{emacs,xemacs}
 #	NOTFOR_{emacs_x,emacs_nox}
 #		Description:
 #			These macros will become either an empty string or
 #			"@comment" depending on the Emacs version; when
 #			"emacs21" is used, ${FOR_emacs} and ${FOR_emacs21}
 #			become "" (empty), and other macros become
 #			"@comment"; this means that only the PLIST lines
 #			prefixed by ${FOR_emacs} and ${FOR_emacs21} are
 #			valid.
+#
 #			NOTFOR_* is the opposite of FOR_*.
 #		Possible values:
 @@ -224,36 +224,34 @@ _DEF_VARS.emacs=	_EMACS_TYPE _EMACS_PKGB
 _SORTED_VARS.emacs=	*_MODULES
 _LISTED_VARS.emacs=	*VERSIONS*
 BUILD_DEFS+=		${_USER_VARS.emacs}
 BUILD_DEFS_EFFECTS+=	${_SYS_VARS.emacs}
 .include "../../mk/bsd.prefs.mk"
+#
 # Constants
+#
 _EMACS_VERSIONS_ALL= \
-	emacs20 emacs21 emacs21nox emacs25 emacs25nox emacs26 emacs26nox \
+	emacs20 emacs21 emacs21nox emacs26 emacs26nox \
 	emacs27 emacs27nox emacs28 emacs28nox emacs29 emacs29nox  \
 	xemacs214 xemacs214nox xemacs215 xemacs215nox
 _EMACS_PKGDIR_MAP= \
 	emacs20@../../editors/emacs20 \
 	emacs21@../../editors/emacs21 \
 	emacs21nox@../../editors/emacs21-nox11 \
 	emacs25@../../editors/emacs25 \
 	emacs25nox@../../editors/emacs25-nox11 \
 	emacs26@../../editors/emacs26 \
 	emacs26nox@../../editors/emacs26-nox11 \
 	emacs27@../../editors/emacs27 \
 	emacs27nox@../../editors/emacs27-nox11 \
 	emacs28@../../editors/emacs28 \
 	emacs28nox@../../editors/emacs28-nox11 \
 	emacs29@../../editors/emacs29 \
 	emacs29nox@../../editors/emacs29-nox11 \
 	xemacs214@../../editors/xemacs \
 	xemacs214nox@../../editors/xemacs-nox11 \
 	xemacs215@../../editors/xemacs-current \
 	xemacs215nox@../../editors/xemacs-current-nox11