CVS commit: pkgsrc/mk/defaults

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Sep 18 14:02:42 UTC 2016

Modified Files:
        pkgsrc/mk/defaults: mk.conf

Log Message:
Add emacs25 and emacs25nox to possible values


To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 pkgsrc/mk/defaults/mk.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.264 pkgsrc/mk/defaults/mk.conf:1.265
--- pkgsrc/mk/defaults/mk.conf:1.264    Mon Jun 13 13:26:42 2016
+++ pkgsrc/mk/defaults/mk.conf  Sun Sep 18 14:02:42 2016
@@ -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