pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/shells/bash Make this work on NetBSD 1.6.2 (pkg/27330)...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b23374d8c88a
branches:  trunk
changeset: 482215:b23374d8c88a
user:      martti <martti%pkgsrc.org@localhost>
date:      Fri Oct 22 10:48:01 2004 +0000

description:
Make this work on NetBSD 1.6.2 (pkg/27330). Patch from Juan RP, minor
fixes by me.

diffstat:

 shells/bash/Makefile |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 4eafaca1c58a -r b23374d8c88a shells/bash/Makefile
--- a/shells/bash/Makefile      Fri Oct 22 10:36:06 2004 +0000
+++ b/shells/bash/Makefile      Fri Oct 22 10:48:01 2004 +0000
@@ -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 @@
 
 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-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



Home | Main Index | Thread Index | Old Index