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 24C797A26D for ; Fri, 11 Nov 2016 10:54:43 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C7D72855E2; Fri, 11 Nov 2016 10:54:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 58F3E855AC for ; Fri, 11 Nov 2016 10:54:42 +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 mUR_5B4S8s8O for ; Fri, 11 Nov 2016 10:54:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DC7B285578 for ; Fri, 11 Nov 2016 10:54:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4171DFBA6; Fri, 11 Nov 2016 10:54:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1478861681106210" MIME-Version: 1.0 Date: Fri, 11 Nov 2016 10:54:41 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/editors/emacs21 To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20161111105441.4171DFBA6@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. --_----------=_1478861681106210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Fri Nov 11 10:54:41 UTC 2016 Modified Files: pkgsrc/editors/emacs21: Makefile Makefile.common Log Message: emacs21: remove convoluted logic for using binutils hack -- use it unconditionally here too. it's highly unlikely someone has such old binutils. bump PKGREVISION - it causes runtime crashes. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/emacs21/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/editors/emacs21/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1478861681106210 Content-Disposition: inline Content-Length: 1751 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/emacs21/Makefile diff -u pkgsrc/editors/emacs21/Makefile:1.36 pkgsrc/editors/emacs21/Makefile:1.37 --- pkgsrc/editors/emacs21/Makefile:1.36 Sat Jul 9 06:38:14 2016 +++ pkgsrc/editors/emacs21/Makefile Fri Nov 11 10:54:41 2016 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2016/07/09 06:38:14 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2016/11/11 10:54:41 maya Exp $ -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= editors CONFLICTS+= emacs21-nox11-[0-9]* Index: pkgsrc/editors/emacs21/Makefile.common diff -u pkgsrc/editors/emacs21/Makefile.common:1.16 pkgsrc/editors/emacs21/Makefile.common:1.17 --- pkgsrc/editors/emacs21/Makefile.common:1.16 Thu Feb 25 12:22:40 2016 +++ pkgsrc/editors/emacs21/Makefile.common Fri Nov 11 10:54:41 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2016/02/25 12:22:40 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.17 2016/11/11 10:54:41 maya Exp $ # # used by editors/emacs21/Makefile # used by editors/emacs21-nox11/Makefile @@ -39,19 +39,10 @@ INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}$ .include "../../mk/bsd.prefs.mk" -# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1. -.if (${OPSYS} == "NetBSD" && \ - (empty(OS_VERSION:M1.[0-5]*) && \ - empty(OS_VERSION:M1.6_*) && \ - empty(OS_VERSION:M1.6) && \ - empty(OS_VERSION:M1.6.[0-9]*) && \ - empty(OS_VERSION:M1.6[A-P]*))) || \ - ${OPSYS} == "DragonFly" # If using GNU ld 2.13.2.1 or later, avoid creating combined reloc # sections and .data reloc sections, both of which Emacs can't handle # properly. Analyzed by Stephen Ma. LDFLAGS+= -Wl,-z,nocombreloc -.endif # Use terminfo on NetBSD-6. # We cannot use terminfo.*.mk as emacs WILL force a link to termcap, --_----------=_1478861681106210--