diff options
| author | ryoon <ryoon@pkgsrc.org> | 2022-04-07 10:35:28 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2022-04-07 10:35:28 +0000 |
| commit | 3786ed6df26be4f10fd5a880b31018d878cba552 (patch) | |
| tree | 85581492ce7509a2e7eedbab8f8ac7235fb76bc2 /editors | |
| parent | ffb7edb34be2f69c2c0415788394de784d5b9f60 (diff) | |
| download | pkgsrc-3786ed6df26be4f10fd5a880b31018d878cba552.tar.gz | |
emacs: Use emacs28 from editors/emacs28
editors/emacs-snapshot will not be used.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile.common | 4 | ||||
| -rw-r--r-- | editors/emacs/modules.mk | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index 0c322863c85..a382403c0e5 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -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 diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk index 9f58535b49e..c13f43a2362 100644 --- a/editors/emacs/modules.mk +++ b/editors/emacs/modules.mk @@ -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_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \ .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 |