From 05a8cd489fc7416ac5b8aeeb3f2104ed78087b71 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 20 Feb 2011 14:22:15 +0000
Subject: MirBSD support from Benny Siegert in PR 44606.

---
 shells/bash/distinfo         |  5 ++++-
 shells/bash/patches/patch-ai | 15 +++++++++++++++
 shells/bash/patches/patch-aj | 25 +++++++++++++++++++++++++
 shells/bash/patches/patch-ak | 14 ++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 shells/bash/patches/patch-ai
 create mode 100644 shells/bash/patches/patch-aj
 create mode 100644 shells/bash/patches/patch-ak

(limited to 'shells')

diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index ca1476ec458..0d4cc968f25 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2010/04/15 12:49:41 joerg Exp $
+$NetBSD: distinfo,v 1.22 2011/02/20 14:22:15 wiz Exp $
 
 SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150
 RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207
@@ -6,3 +6,6 @@ Size (bash-4.1.tar.gz) = 6598300 bytes
 SHA1 (patch-aa) = 24fefdd101926d89b4b9faea1ca74a34bdd5b99f
 SHA1 (patch-af) = 769ca529b3a755faa70f517988722276088859b7
 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
+SHA1 (patch-ai) = 26825922898567841bed0bf62a8dee3bcc50cd75
+SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e
+SHA1 (patch-ak) = 6dfb7195f45f81064f687a4c9febb9dcae721aa7
diff --git a/shells/bash/patches/patch-ai b/shells/bash/patches/patch-ai
new file mode 100644
index 00000000000..fe6aeabddbe
--- /dev/null
+++ b/shells/bash/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2011/02/20 14:22:15 wiz Exp $
+
+Add MirBSD.
+
+--- support/shobj-conf.orig	Wed Oct 28 13:19:57 2009
++++ support/shobj-conf
+@@ -197,7 +197,7 @@ darwin*|macosx*)
+ 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
+ 	;;
+ 
+-openbsd*|netbsd*)
++openbsd*|netbsd*|mirbsd*)
+ 	SHOBJ_CFLAGS=-fPIC
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared'
diff --git a/shells/bash/patches/patch-aj b/shells/bash/patches/patch-aj
new file mode 100644
index 00000000000..4dfb708f43e
--- /dev/null
+++ b/shells/bash/patches/patch-aj
@@ -0,0 +1,25 @@
+$NetBSD: patch-aj,v 1.1 2011/02/20 14:22:15 wiz Exp $
+
+This patch fixes the build on MirBSD and OpenBSD, where LIBINTL and
+LIBICONV are incorrectly set.
+
+--- Makefile.in.orig	Wed Dec 30 18:05:16 2009
++++ Makefile.in
+@@ -341,7 +341,7 @@ INTL_LIBDIR = $(dot)/$(LIBSUBDIR)/intl
+ INTL_ABSSRC = ${topdir}/$(INTL_LIB)
+ INTL_BUILDDIR = ${LIBBUILD}/intl
+ 
+-INTL_LIB     = @LIBINTL@
++INTL_LIB     = @LTLIBINTL@
+ INTL_LIBRARY = $(INTL_LIBDIR)/libintl.a
+ INTL_DEP = @INTL_DEP@
+ INTL_INC = @INTL_INC@
+@@ -349,7 +349,7 @@ INTL_INC = @INTL_INC@
+ LIBINTL_H = @LIBINTL_H@
+ 
+ # libiconv
+-LIBICONV = @LIBICONV@
++LIBICONV = @LTLIBICONV@
+ 
+ # tests
+ LIBINTL = @LIBINTL@
diff --git a/shells/bash/patches/patch-ak b/shells/bash/patches/patch-ak
new file mode 100644
index 00000000000..a2ebb1785da
--- /dev/null
+++ b/shells/bash/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2011/02/20 14:22:16 wiz Exp $
+
+Add MirBSD.
+
+--- configure.orig	Tue Dec 29 13:34:27 2009
++++ configure
+@@ -2192,6 +2192,7 @@ sparc-linux*)	opt_bash_malloc=no ;;	# sp
+ #*-freebsd*-gnu)	opt_bash_malloc=no ;;	# there's some undetermined problem here
+ #*-freebsd*)	opt_bash_malloc=no ;;	# they claim it's better; I disagree
+ *-openbsd*)	opt_bash_malloc=no ;;	# they claim it needs eight-bit alignment
++*-mirbsd*)	opt_bash_malloc=no ;;	# they claim it needs eight-bit alignment
+ *-aix*)		opt_bash_malloc=no ;;	# AIX machines
+ *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
+ *-macos*)	opt_bash_malloc=no ;;	# Apple MacOS X
-- 
cgit v1.2.3