CVS commit: pkgsrc/editors/emacs

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Apr  7 10:35:28 UTC 2022

Modified Files:
        pkgsrc/editors/emacs: Makefile.common modules.mk

Log Message:
emacs: Use emacs28 from editors/emacs28

editors/emacs-snapshot will not be used.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/editors/emacs/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/editors/emacs/modules.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/emacs/Makefile.common
diff -u pkgsrc/editors/emacs/Makefile.common:1.45 pkgsrc/editors/emacs/Makefile.common:1.46
--- pkgsrc/editors/emacs/Makefile.common:1.45   Sun Sep  6 01:54:14 2020
+++ pkgsrc/editors/emacs/Makefile.common        Thu Apr  7 10:35:28 2022
@@ -1,4 +1,4 @@
-# $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
@@ -39,7 +39,7 @@ PKG_FAIL_REASON+=     "EMACS_TYPE is xemacs.
 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

Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.29 pkgsrc/editors/emacs/modules.mk:1.30
--- pkgsrc/editors/emacs/modules.mk:1.29        Thu Oct  8 00:15:35 2020
+++ pkgsrc/editors/emacs/modules.mk     Thu Apr  7 10:35:28 2022
@@ -1,4 +1,4 @@
-# $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).
 #
@@ -41,6 +41,7 @@
 #                      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,
@@ -63,11 +64,13 @@
 #              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,
@@ -180,10 +183,10 @@
 #              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:
@@ -232,6 +235,7 @@ BUILD_DEFS_EFFECTS+=        ${_SYS_VARS.emacs}
 _EMACS_VERSIONS_ALL= \
        emacs20 emacs21 emacs21nox emacs25 emacs25nox emacs26 emacs26nox \
        emacs27 emacs27nox \
+       emacs28 emacs28nox \
        xemacs214 xemacs214nox xemacs215 xemacs215nox
 
 _EMACS_PKGDIR_MAP= \
@@ -244,6 +248,8 @@ _EMACS_PKGDIR_MAP= \
        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 \
@@ -355,11 +361,7 @@ PRINT_PLIST_AWK+=  { gsub(/${EMACS_LISPPR
 .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