summaryrefslogtreecommitdiff
path: root/shells/bash2
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-08-22 19:32:51 +0000
committerjlam <jlam@pkgsrc.org>2004-08-22 19:32:51 +0000
commit9d5426ff76defa85311d3e55ed2c442fb5ae9977 (patch)
treebe106f064832dabfe855335adc4a7d14708a360a /shells/bash2
parent3c0724db4840983688df4cd77ea88653e9b13249 (diff)
downloadpkgsrc-9d5426ff76defa85311d3e55ed2c442fb5ae9977.tar.gz
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework. Instead of appending to ${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes the default options to be the union of PKG_DEFAULT_OPTIONS and any old USE_* and FOO_USE_* settings. This fixes PR pkg/26590.
Diffstat (limited to 'shells/bash2')
-rw-r--r--shells/bash2/Makefile11
1 files changed, 3 insertions, 8 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index b91daf8f413..42322fa31c3 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2004/08/07 21:03:59 minskim Exp $
+# $NetBSD: Makefile,v 1.56 2004/08/22 19:32:52 jlam Exp $
#
DISTNAME= bash-2.05b
@@ -30,13 +30,8 @@ PKG_SHELL= ${PREFIX}/bin/bash
.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
-. endif
+.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+= static
.endif
PKG_OPTIONS_VAR= PKG_OPTIONS.bash