From d728e69caf5683ff8b696b33ff39f5c487f5b53f Mon Sep 17 00:00:00 2001
From: mef <mef@pkgsrc.org>
Date: Thu, 30 Oct 2014 21:41:57 +0000
Subject: 'CONFIG_SHELL= ksh' is only necessary for NetBSD-[5-6]* and 6.99.*

---
 cross/avr-binutils/Makefile   | 12 +++++++++---
 cross/nios2-binutils/Makefile | 14 ++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'cross')

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 37738ca2b50..36e7384470e 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/10/23 10:25:11 mef Exp $
+# $NetBSD: Makefile,v 1.26 2014/10/30 21:41:57 mef Exp $
 
 DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/avr-/}
@@ -16,9 +16,15 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
-# ./configure.lineno: 3239: Syntax error: Missing '}'
-# Makefile:2991: recipe for target 'configure-opcodes' failed
+
+# follows to devel/binutils
+# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
+	empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
+USE_TOOLS+=		ksh
 CONFIG_SHELL=		ksh
+.endif
 
 CONFIGURE_ARGS+=	--disable-werror --target=avr --disable-nls
 
diff --git a/cross/nios2-binutils/Makefile b/cross/nios2-binutils/Makefile
index e1898ed8363..f13b76b9695 100644
--- a/cross/nios2-binutils/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/10/23 10:30:10 mef Exp $
+# $NetBSD: Makefile,v 1.12 2014/10/30 21:48:47 mef Exp $
 
 DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/nios2-/}
@@ -20,9 +20,15 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 INFO_FILES=		# empty
-# ./configure.lineno: 3239: Syntax error: Missing '}'
-# Makefile:2991: recipe for target 'configure-opcodes' failed
-CONFIG_SHELL=		ksh
+
+# follows to devel/binutils
+# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*) && \
+       empty(MACHINE_PLATFORM:MNetBSD-6.99.*-*)
+USE_TOOLS+=	       ksh
+CONFIG_SHELL=	       ksh
+.endif
 
 NIOS2_TARGET=		nios2-elf
 CONFIGURE_ARGS+=	--disable-werror --target=${NIOS2_TARGET} --disable-nls
-- 
cgit v1.2.3