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 BD72B7A270 for ; Mon, 2 Jan 2017 14:40:39 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6D173855AA; Mon, 2 Jan 2017 14:40:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F18F285579 for ; Mon, 2 Jan 2017 14:40:38 +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 WBOUxDaNupWz for ; Mon, 2 Jan 2017 14:40:38 +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 4D5AE85575 for ; Mon, 2 Jan 2017 14:40:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 46D54FBA6; Mon, 2 Jan 2017 14:40:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1483368038225850" MIME-Version: 1.0 Date: Mon, 2 Jan 2017 14:40:38 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2016Q4] pkgsrc/editors/emacs To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170102144038.46D54FBA6@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. --_----------=_1483368038225850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon Jan 2 14:40:38 UTC 2017 Modified Files: pkgsrc/editors/emacs [pkgsrc-2016Q4]: Makefile.common Log Message: Pullup ticket #5177 - requested by dholland editors/emacs: build fix PR pkg/51757. Revisions pulled up: - editors/emacs/Makefile.common 1.41 --- Module Name: pkgsrc Committed By: tron Date: Sun Jan 1 02:06:46 UTC 2017 Modified Files: pkgsrc/editors/emacs: Makefile.common Log Message: Use the package "editors/emacs25" and not "editors/emacs-snapshot" for the new default "emacs25". To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.32.1 pkgsrc/editors/emacs/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1483368038225850 Content-Disposition: inline Content-Length: 888 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/emacs/Makefile.common diff -u pkgsrc/editors/emacs/Makefile.common:1.40 pkgsrc/editors/emacs/Makefile.common:1.40.32.1 --- pkgsrc/editors/emacs/Makefile.common:1.40 Sat Feb 23 23:36:49 2013 +++ pkgsrc/editors/emacs/Makefile.common Mon Jan 2 14:40:38 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2013/02/23 23:36:49 dholland Exp $ +# $NetBSD: Makefile.common,v 1.40.32.1 2017/01/02 14:40:38 bsiegert Exp $ # # used by editors/emacs/Makefile # used by editors/emacs-nox11/Makefile @@ -38,7 +38,7 @@ PKG_FAIL_REASON+= "EMACS_TYPE is xemacs. # (Set these to avoid crashing out below.) EMACS_PKGDIR= ../../editors/xemacs EMACS_PACKAGE= xemacs -.elif ${MY_EMACS_TYPE} == "emacs25" +.elif ${MY_EMACS_TYPE} == "emacs26" EMACS_PKGDIR= ../../editors/emacs-snapshot EMACS_PACKAGE= ${EMACS_BASE_TYPE} .elif !empty(MY_EMACS_TYPE:M*nox) --_----------=_1483368038225850--