[pkgsrc/trunk]: pkgsrc/editors/emacs21 emacs21: remove convoluted logic for u...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83d01e6a4b91
branches:  trunk
changeset: 354816:83d01e6a4b91
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri Nov 11 10:54:41 2016 +0000

description:
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.

diffstat:

 editors/emacs21/Makefile        |   4 ++--
 editors/emacs21/Makefile.common |  11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diffs (41 lines):

diff -r 118bff10d4a4 -r 83d01e6a4b91 editors/emacs21/Makefile
--- a/editors/emacs21/Makefile  Fri Nov 11 10:16:12 2016 +0000
+++ b/editors/emacs21/Makefile  Fri Nov 11 10:54:41 2016 +0000
@@ -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]*
diff -r 118bff10d4a4 -r 83d01e6a4b91 editors/emacs21/Makefile.common
--- a/editors/emacs21/Makefile.common   Fri Nov 11 10:16:12 2016 +0000
+++ b/editors/emacs21/Makefile.common   Fri Nov 11 10:54:41 2016 +0000
@@ -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 @@
 
 .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,