diff options
| -rw-r--r-- | editors/emacs/modules.mk | 25 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 8 |
2 files changed, 18 insertions, 15 deletions
diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk index 435095fbdeb..b9d4668e802 100644 --- a/editors/emacs/modules.mk +++ b/editors/emacs/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.23 2018/06/20 11:15:44 mef Exp $ +# $NetBSD: modules.mk,v 1.24 2018/06/24 21:19:10 wiz Exp $ # # This Makefile fragment handles Emacs Lisp Packages (== ELPs). # @@ -41,10 +41,11 @@ # The user's favourite Emacs version. The default # value is set in mk/defaults/mk.conf. # Possible values: -# emacs26, emacs25, emacs21, emacs21nox, emacs20, -# xemacs215, xemacs215nox, xemacs214, xemacs214nox +# emacs26, emacs26nox, emacs25, emacs25nox, emacs21, +# emacs21nox, emacs20, xemacs215, xemacs215nox, +# xemacs214, xemacs214nox # Default value: -# emacs25 +# emacs26 # # Variables ELPs can provide: # @@ -61,11 +62,13 @@ # Description: # Versions the ELP accepts (supports). # Possible values: -# emacs26, emacs25, emacs21, emacs21nox, emacs20, -# xemacs215, xemacs215nox, xemacs214, xemacs214nox +# emacs26, emacs26nox, emacs25, emacs25nox, emacs21, +# emacs21nox, emacs20, xemacs215, xemacs215nox, +# xemacs214, xemacs214nox # Default value: -# emacs26, emacs25, emacs21, emacs21nox, emacs20, -# xemacs215, xemacs215nox, xemacs214, xemacs214nox +# emacs26, emacs26nox, emacs25, emacs25nox, emacs21, +# emacs21nox, emacs20, xemacs215, xemacs215nox, +# xemacs214, xemacs214nox # # EMACS_BUILDLINK # Description: @@ -128,7 +131,7 @@ # Description: # Emacs major version. # Possible values: -# 20, 21, 22, 23, 24, 25, <integers more than that in the future> +# 20, 21, 25, 26, <integers more than that in the future> # # EMACS_VERSION_MINOR # Description: @@ -174,10 +177,10 @@ # Possible values: # XXX # -# FOR_{emacs26,emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox} +# FOR_{emacs26,emacs26nox,emacs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox} # FOR_{emacs,xemacs} # FOR_{emacs_x,emacs_nox} -# NOTFOR_{emacs26,emacs25,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox} +# NOTFOR_{emacs26,eemacs26nox,macs25,emacs25nox,emacs21,emacs21nox,emacs20,xemacs215,xemacs215nox,xemacs214,xemacs214nox} # NOTFOR_{emacs,xemacs} # NOTFOR_{emacs_x,emacs_nox} # Description: diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index b666aa2803f..62b5f9d168f 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.295 2018/06/18 10:59:55 schmonz Exp $ +# $NetBSD: mk.conf,v 1.296 2018/06/24 21:19:10 wiz Exp $ # # This file provides default values for variables that may be overridden @@ -921,12 +921,12 @@ ELK_GUI?= none # Possible: none, or some combination of xaw and/or motif # Default: none -EMACS_TYPE?= emacs25 +EMACS_TYPE?= emacs26 # Used by emacs/modules.mk to determine which emacs version should be installed # and emacs lisp packages should be built for. -# Possible: emacs25, emacs25nox, emacs21, emacs21nox, emacs20, +# Possible: emacs26, emacs26nox, emacs25, emacs25nox, emacs21, emacs21nox, emacs20, # xemacs214, xemacs215 -# Default: emacs25 +# Default: emacs26 EXIM_GROUP?= mail # Used in the exim package to specify the server group. |