Thu Jan 30 12:12:08 2014 UTC ()
emacs.mk does not exists and EMACS_TYPE is used in emacs/modules.mk now.


(obache)
diff -r1.230 -r1.231 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.230 -r1.231 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2014/01/30 11:56:48 1.230
+++ pkgsrc/mk/defaults/mk.conf 2014/01/30 12:12:08 1.231
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.230 2014/01/30 11:56:48 obache Exp $ 1# $NetBSD: mk.conf,v 1.231 2014/01/30 12:12:08 obache 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
@@ -816,28 +816,28 @@ DIALER_GROUP?= dialer @@ -816,28 +816,28 @@ DIALER_GROUP?= dialer
816# Default: dialer 816# Default: dialer
817 817
818DT_LAYOUT?= US 818DT_LAYOUT?= US
819# Used by dt package to specify the keyboard layout. 819# Used by dt package to specify the keyboard layout.
820# Possible: US, FI, FR, GER, DV 820# Possible: US, FI, FR, GER, DV
821# Default: FI 821# Default: FI
822 822
823ELK_GUI?= none 823ELK_GUI?= none
824# Used by elk to determine which GUI API modules are enabled. 824# Used by elk to determine which GUI API modules are enabled.
825# Possible: none, or some combination of xaw and/or motif 825# Possible: none, or some combination of xaw and/or motif
826# Default: none 826# Default: none
827 827
828EMACS_TYPE?= emacs24 828EMACS_TYPE?= emacs24
829# Used by emacs.mk to determine which emacs version should be installed and 829# Used by emacs/modules.mk to determine which emacs version should be installed
830# emacs lisp packages should be built for. 830# and emacs lisp packages should be built for.
831# Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox, 831# Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox,
832# emacs21, emacs21nox, emacs20, 832# emacs21, emacs21nox, emacs20,
833# xemacs214, xemacs215 833# xemacs214, xemacs215
834# Default: emacs24 834# Default: emacs24
835 835
836EXIM_GROUP?= mail 836EXIM_GROUP?= mail
837# Used in the exim package to specify the server group. 837# Used in the exim package to specify the server group.
838# Possible: any group name 838# Possible: any group name
839# Default: mail 839# Default: mail
840 840
841EXIM_USER?= mail 841EXIM_USER?= mail
842# Used in the exim package to specify the server user. 842# Used in the exim package to specify the server user.
843# Possible: any user name 843# Possible: any user name