[pkgsrc/trunk]: pkgsrc/shells/bash2 Append options to PKG_DEFAULT_OPTIONS ins...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5081e0ff74de
branches:  trunk
changeset: 482243:5081e0ff74de
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Oct 23 08:10:40 2004 +0000

description:
Append options to PKG_DEFAULT_OPTIONS instead of ${PKG_OPTIONS_VER},
following the semantic change of PKG_DEFAULT_OPTIONS.

diffstat:

 shells/bash2/Makefile |  18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diffs (36 lines):

diff -r a1247508d896 -r 5081e0ff74de shells/bash2/Makefile
--- a/shells/bash2/Makefile     Sat Oct 23 08:08:26 2004 +0000
+++ b/shells/bash2/Makefile     Sat Oct 23 08:10:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2004/10/22 23:54:22 minskim Exp $
+# $NetBSD: Makefile,v 1.59 2004/10/23 08:10:40 minskim Exp $
 #
 
 DISTNAME=      bash-2.05b
@@ -31,21 +31,15 @@
 .include "../../mk/bsd.prefs.mk"
 
 # 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
+.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=  static
 .endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bash
-PKG_OPTIONS.bash?=     multibyte
 PKG_SUPPORTED_OPTIONS= multibyte static
+.if !defined(PKG_OPTIONS.bash)
+PKG_DEFAULT_OPTIONS+=  multibyte
+.endif
 .include "../../mk/bsd.options.mk"
 
 ##