summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2004-10-22 10:48:01 +0000
committermartti <martti@pkgsrc.org>2004-10-22 10:48:01 +0000
commit9e9d22e2b31fffd7f1d438724e53c85c1f6d3d31 (patch)
treecd040e153e440e1aaf9281e3088546fdc19929b5 /shells
parente0dfb9eb74832c6f6b872fbff243f52d0b273ba1 (diff)
downloadpkgsrc-9e9d22e2b31fffd7f1d438724e53c85c1f6d3d31.tar.gz
Make this work on NetBSD 1.6.2 (pkg/27330). Patch from Juan RP, minor
fixes by me.
Diffstat (limited to 'shells')
-rw-r--r--shells/bash/Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 09a3d2d2ad3..05208ff39f2 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/21 16:36:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/22 10:48:01 martti Exp $
#
DISTNAME= bash-3.0
@@ -25,11 +25,18 @@ INFO_FILES= bash.info
PKG_SHELL= ${PREFIX}/bin/bash
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(OPSYS:MNetBSD) && empty(OS_VERSION:M1.[56]*)
+CONFIGURE_ARGS+= --enable-multibyte
+.else
+CONFIGURE_ARGS+= --disable-multibyte
+.endif
+
# All features enabled by default.
CONFIGURE_ARGS+= --enable-readline
CONFIGURE_ARGS+= --enable-progcomp
CONFIGURE_ARGS+= --enable-process-substitution
-CONFIGURE_ARGS+= --enable-multibyte
CONFIGURE_ARGS+= --enable-job-control
CONFIGURE_ARGS+= --enable-history
CONFIGURE_ARGS+= --enable-help-builtin
@@ -42,8 +49,6 @@ CONFIGURE_ARGS+= --enable-alias
CONFIGURE_ARGS+= --enable-brace-expansion
CONFIGURE_ARGS+= --enable-array-variables
-.include "../../mk/bsd.prefs.mk"
-
.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
PKG_DEFAULT_OPTIONS+= static
.endif