[pkgsrc/trunk]: pkgsrc Convert bash2 to use bsd.options.mk.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/853bbc23d417
branches:  trunk
changeset: 479219:853bbc23d417
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Aug 07 21:03:59 2004 +0000

description:
Convert bash2 to use bsd.options.mk.

diffstat:

 mk/bsd.pkg.defaults.mk |   7 +------
 shells/bash2/Makefile  |  20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (56 lines):

diff -r 9991c86d5bc9 -r 853bbc23d417 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Sat Aug 07 19:06:59 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Sat Aug 07 21:03:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.274 2004/08/07 14:13:06 xtraeme Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.275 2004/08/07 21:03:59 minskim Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -703,11 +703,6 @@
 # but it has problems with threads and does not work yet.
 # Default: not defined
 
-#BASH_STATIC=  YES
-# Used in bash2 to link it statically (for use as a root shell).
-# Possible: not defined, YES
-# Default: not defined
-
 #BATTLEBALL_USE_MESA=
 # Used in battleball to build in support for OpenGL/Mesa. Will use
 # Mesa-glx (rather than Mesa) if Mesa-glx is already installed.
diff -r 9991c86d5bc9 -r 853bbc23d417 shells/bash2/Makefile
--- a/shells/bash2/Makefile     Sat Aug 07 19:06:59 2004 +0000
+++ b/shells/bash2/Makefile     Sat Aug 07 21:03:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/07/11 01:23:29 salo Exp $
+# $NetBSD: Makefile,v 1.55 2004/08/07 21:03:59 minskim Exp $
 #
 
 DISTNAME=      bash-2.05b
@@ -30,9 +30,23 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=   BASH_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
+.  endif
+.endif
 
-.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
+PKG_OPTIONS_VAR=       PKG_OPTIONS.bash
+PKG_SUPPORTED_OPTIONS= static
+.include "../../mk/bsd.options.mk"
+
+##
+## Static link
+##
+.if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=       --enable-static-link
 .endif