 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.45 2020/09/06 01:54:14 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.46 2022/04/07 10:35:28 ryoon Exp $
+#
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
 CATEGORIES=	editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	dholland@NetBSD.org
 COMMENT=	Meta-package for installing the preferred Emacs version
 META_PACKAGE=	yes
 @@ -29,27 +29,27 @@ EMACS_BASE_TYPE=	${MY_EMACS_TYPE:S/nox//
 EMACS_MAJOR=		${EMACS_BASE_TYPE:S/emacs//}
 # Sigh.
 .if ${MY_EMACS_TYPE} == "emacs20nox"
 MY_EMACS_TYPE:=		emacs20
 .endif
 .if !empty(MY_EMACS_TYPE:Mxemacs*)
 PKG_FAIL_REASON+=	"EMACS_TYPE is xemacs."
 # (Set these to avoid crashing out below.)
 EMACS_PKGDIR=		../../editors/xemacs
 EMACS_PACKAGE=		xemacs
 .elif ${MY_EMACS_TYPE} == "emacs28"
-EMACS_PKGDIR=		../../editors/emacs-snapshot
+EMACS_PKGDIR=		../../editors/emacs28
 EMACS_PACKAGE=		${EMACS_BASE_TYPE}
 .elif !empty(MY_EMACS_TYPE:M*nox)
 EMACS_PKGDIR=		../../editors/${EMACS_BASE_TYPE}-nox11
 EMACS_PACKAGE=		${EMACS_BASE_TYPE}-nox11
 .else
 EMACS_PKGDIR=		../../editors/${EMACS_BASE_TYPE}
 EMACS_PACKAGE=		${EMACS_BASE_TYPE}
 .endif
 DEPENDS+=	${EMACS_PACKAGE}>=${EMACS_MAJOR}:${EMACS_PKGDIR}
+#
 # 2. Now it gets gross. Before this meta-package was introduced, the

 @@ -1,14 +1,14 @@
-# $NetBSD: modules.mk,v 1.29 2020/10/08 00:15:35 gutteridge Exp $
+# $NetBSD: modules.mk,v 1.30 2022/04/07 10:35:28 ryoon 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/...
+#
 @@ -31,53 +31,56 @@
 #	  installable for GNU Emacs/XEmacs might be possible.)
+#
 #	* 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:
 #			emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
 #			emacs25, emacs25nox, emacs21, emacs21nox,
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
 #		Default value:
 #			emacs26
+#
 # 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:
 #			emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
 #			emacs25, emacs25nox, emacs21, emacs21nox,
 #			emacs20, xemacs215, xemacs215nox,
 #			xemacs214, xemacs214nox
 #		Default value:
 #			emacs28, emacs28nox,
 #			emacs27, emacs27nox, emacs26, emacs26nox,
 #			emacs25, emacs25nox, 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:
 @@ -170,30 +173,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_{emacs27,emacs27nox,emacs26,emacs26nox,emacs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	FOR_{emacs28,emacs28nox,emacs27,emacs27nox,emacs26,emacs26nox,emacs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
 #	FOR_{emacs,xemacs}
 #	FOR_{emacs_x,emacs_nox}
-#	NOTFOR_{emacs27,emacs27nox,emacs26,eemacs26nox,macs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox}
+#	NOTFOR_{emacs28,emacs28nox,emacs27,emacs27nox,emacs26,eemacs26nox,macs25,emacs25nox,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:
 @@ -222,38 +225,41 @@ _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 \
 	emacs27 emacs27nox \
 	emacs28 emacs28nox \
 	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 \
 	xemacs214@../../editors/xemacs \
 	xemacs214nox@../../editors/xemacs-nox11 \
 	xemacs215@../../editors/xemacs-current \
 	xemacs215nox@../../editors/xemacs-current-nox11
 _EMACS_ETCDIR.emacs=		share
 _EMACS_INFODIR.emacs=		${PKGINFODIR}
 _EMACS_LISPDIR.emacs=		share/emacs/site-lisp
 _EMACS_PKGNAME_PREFIX.emacs=
 _EMACS_CONFLICTS.emacs=		xemacs-${PKGBASE}-[0-9]*
 _EMACS_ETCDIR.xemacs=		lib/xemacs/site-packages/etc
 _EMACS_INFODIR.xemacs=		lib/xemacs/site-packages/info
 @@ -345,22 +351,18 @@ _EMACS_PLIST_SUBST+=	FOR_emacs_no_byte_c
 PLIST_SUBST+=		${_EMACS_PLIST_SUBST}
 PRINT_PLIST_AWK+=	{ gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
 			"$${EMACS_LISPPREFIX}"); \
 			print; next; }
+#
 # Build environment (buildlink3)
+#
 .if defined(EMACS_BUILDLINK)
 _EMACS_DIR=	${BUILDLINK_DIR}/share/emacs
 # A development version usually claims three digits, say, 27.0.50 etc.
 .  if ${EMACS_TYPE} == emacs28
 ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
 .  else
 ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
 .  endif
 .include	"${_EMACS_PKGDIR}/buildlink3.mk"
 .endif
 .endif	# EMACS_MK