summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2016-09-18 14:02:42 +0000
committerryoon <ryoon@pkgsrc.org>2016-09-18 14:02:42 +0000
commit2ea6bdc19801723915b5cbff775edbf8358b4e26 (patch)
treea16ec8fc7749e2597e72601c82fb1e6651120cc2 /mk
parent3ac003b286473bce5f203f0a20ecf1af06654b2e (diff)
downloadpkgsrc-2ea6bdc19801723915b5cbff775edbf8358b4e26.tar.gz
Add emacs25 and emacs25nox to possible values
Diffstat (limited to 'mk')
-rw-r--r--mk/defaults/mk.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 4204a2bea30..9ddba8befee 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.264 2016/06/13 13:26:42 jperkin Exp $
+# $NetBSD: mk.conf,v 1.265 2016/09/18 14:02:42 ryoon Exp $
#
# This file provides default values for variables that may be overridden
@@ -867,7 +867,8 @@ ELK_GUI?= none
EMACS_TYPE?= emacs24
# Used by emacs/modules.mk to determine which emacs version should be installed
# and emacs lisp packages should be built for.
-# Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox,
+# Possible: emacs25, emacs25nox, emacs24, emacs24nox,
+# emacs23, emacs23nox, emacs22, emacs22nox,
# emacs21, emacs21nox, emacs20,
# xemacs214, xemacs215
# Default: emacs24