summaryrefslogtreecommitdiff
path: root/mk/defaults
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2011-05-11 01:59:45 +0000
committerobache <obache@pkgsrc.org>2011-05-11 01:59:45 +0000
commitcf6b7732d32a81bfec363f38d0be7350979e0115 (patch)
tree1941e8f770811df42e914284e8e0da73ce992b73 /mk/defaults
parent46f68af3379a83b995dbb76a51c85ccda523ffd0 (diff)
downloadpkgsrc-cf6b7732d32a81bfec363f38d0be7350979e0115.tar.gz
emacs24 and emacs23nox is allowed for EMACS_TYPE.
Diffstat (limited to 'mk/defaults')
-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 711ed25a341..f7d6fc91fbe 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.200 2011/04/22 09:03:52 spz Exp $
+# $NetBSD: mk.conf,v 1.201 2011/05/11 01:59:45 obache Exp $
#
# This file provides default values for variables that may be overridden
@@ -833,7 +833,8 @@ ELK_GUI?= none
EMACS_TYPE?= emacs23
# Used by emacs.mk to determine which emacs version should be installed and
# emacs lisp packages should be built for.
-# Possible: emacs23, emacs22, emacs22nox, emacs21, emacs21nox, emacs20,
+# Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox,
+# emacs21, emacs21nox, emacs20,
# xemacs214, xemacs215
# Default: emacs23