Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 40DDC7A265 for ; Sun, 18 Sep 2016 14:02:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E51D485EAE; Sun, 18 Sep 2016 14:02:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7573B85E8A for ; Sun, 18 Sep 2016 14:02:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id HFT88R_IYka7 for ; Sun, 18 Sep 2016 14:02:43 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D0A9E84CEE for ; Sun, 18 Sep 2016 14:02:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C378FFBD1; Sun, 18 Sep 2016 14:02:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1474207362192370" MIME-Version: 1.0 Date: Sun, 18 Sep 2016 14:02:42 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/mk/defaults To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20160918140242.C378FFBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1474207362192370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1474207362192370 Content-Disposition: inline Content-Length: 888 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1474207362192370--