[pkgsrc/trunk]: pkgsrc/shells/bash2 Convert to use bsd.options.mk and add a n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ff98ee68115
branches:  trunk
changeset: 482231:3ff98ee68115
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Oct 22 23:54:22 2004 +0000

description:
Convert to use bsd.options.mk and add a new option, multibyte, to
enable/disable multibyte support.  Ok'ed by wiz@.

diffstat:

 shells/bash2/Makefile |  25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r f9bac93f2921 -r 3ff98ee68115 shells/bash2/Makefile
--- a/shells/bash2/Makefile     Fri Oct 22 21:56:34 2004 +0000
+++ b/shells/bash2/Makefile     Fri Oct 22 23:54:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: Makefile,v 1.58 2004/10/22 23:54:22 minskim Exp $
 #
 
 DISTNAME=      bash-2.05b
@@ -30,12 +30,22 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=  static
+# Global and legacy options
+.if defined(BASH_STATIC)
+.  if !defined(PKG_OPTIONS.bash)
+.    if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
+PKG_OPTIONS.bash+=     static
+.    endif
+# Always enable multibyte support, because before converted to use
+# bsd.options.mk, this package did not allow to turn off the multibyte
+# support.
+PKG_OPTIONS.bash+=     multibyte
+.  endif
 .endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bash
-PKG_SUPPORTED_OPTIONS= static
+PKG_OPTIONS.bash?=     multibyte
+PKG_SUPPORTED_OPTIONS= multibyte static
 .include "../../mk/bsd.options.mk"
 
 ##
@@ -45,6 +55,13 @@
 CONFIGURE_ARGS+=       --enable-static-link
 .endif
 
+##
+## Multibyte support
+##
+.if empty(PKG_OPTIONS:Mmultibyte)
+CONFIGURE_ENV+=        ac_cv_type_wctype_t=no
+.endif
+
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${PREFIX}/man/man1
        ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${PREFIX}/man/man1