From 222d88df550ef1ae906d721fdf5b5aa11256c1b8 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Fri, 22 Oct 2004 23:54:22 +0000
Subject: Convert to use bsd.options.mk and add a new option, multibyte, to
 enable/disable multibyte support.  Ok'ed by wiz@.

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

(limited to 'shells')

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 9a03ea3317e..2a49cd38c4e 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -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 @@ PKG_SHELL=		${PREFIX}/bin/bash
 
 .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 @@ PKG_SUPPORTED_OPTIONS=	static
 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
-- 
cgit v1.2.3