Sun Sep 18 14:02:42 2016 UTC ()
Add emacs25 and emacs25nox to possible values


(ryoon)
diff -r1.264 -r1.265 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.264 -r1.265 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2016/06/13 13:26:42 1.264
+++ pkgsrc/mk/defaults/mk.conf 2016/09/18 14:02:42 1.265
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.264 2016/06/13 13:26:42 jperkin Exp $ 1# $NetBSD: mk.conf,v 1.265 2016/09/18 14:02:42 ryoon Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -857,27 +857,28 @@ DIALER_GROUP?= dialer @@ -857,27 +857,28 @@ DIALER_GROUP?= dialer
857DT_LAYOUT?= US 857DT_LAYOUT?= US
858# Used by dt package to specify the keyboard layout. 858# Used by dt package to specify the keyboard layout.
859# Possible: US, FI, FR, GER, DV 859# Possible: US, FI, FR, GER, DV
860# Default: FI 860# Default: FI
861 861
862ELK_GUI?= none 862ELK_GUI?= none
863# Used by elk to determine which GUI API modules are enabled. 863# Used by elk to determine which GUI API modules are enabled.
864# Possible: none, or some combination of xaw and/or motif 864# Possible: none, or some combination of xaw and/or motif
865# Default: none 865# Default: none
866 866
867EMACS_TYPE?= emacs24 867EMACS_TYPE?= emacs24
868# Used by emacs/modules.mk to determine which emacs version should be installed 868# Used by emacs/modules.mk to determine which emacs version should be installed
869# and emacs lisp packages should be built for. 869# and emacs lisp packages should be built for.
870# Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox, 870# Possible: emacs25, emacs25nox, emacs24, emacs24nox,
 871# emacs23, emacs23nox, emacs22, emacs22nox,
871# emacs21, emacs21nox, emacs20, 872# emacs21, emacs21nox, emacs20,
872# xemacs214, xemacs215 873# xemacs214, xemacs215
873# Default: emacs24 874# Default: emacs24
874 875
875EXIM_GROUP?= mail 876EXIM_GROUP?= mail
876# Used in the exim package to specify the server group. 877# Used in the exim package to specify the server group.
877# Possible: any group name 878# Possible: any group name
878# Default: mail 879# Default: mail
879 880
880EXIM_USER?= mail 881EXIM_USER?= mail
881# Used in the exim package to specify the server user. 882# Used in the exim package to specify the server user.
882# Possible: any user name 883# Possible: any user name
883# Default: mail 884# Default: mail