summaryrefslogtreecommitdiff
path: root/shells/bash2
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2005-05-31 10:01:36 +0000
committerdillo <dillo@pkgsrc.org>2005-05-31 10:01:36 +0000
commitf81ae835adc78533f22ce227d12d3f56e6076f1a (patch)
tree54f5cc64fe8b06d4695748b3d5b9967e8c030117 /shells/bash2
parent79084c0d28dd7c904bebb1b7d09f66fa505cfc47 (diff)
downloadpkgsrc-f81ae835adc78533f22ce227d12d3f56e6076f1a.tar.gz
Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also, make use of PKG_OPTIONS_LEGACY_VARS. Reviewed by wiz.
Diffstat (limited to 'shells/bash2')
-rw-r--r--shells/bash2/Makefile13
1 files changed, 4 insertions, 9 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 6cd8ac3381b..b5479e6ae6c 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.63 2005/05/31 10:01:39 dillo Exp $
#
DISTNAME= bash-2.05b
@@ -31,16 +31,11 @@ PKG_SHELL= ${PREFIX}/bin/bash
CFLAGS.Interix+= -DUSE_POSIX_GLOB_LIBRARY
-# Global and legacy options
-.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= static
-.endif
-
PKG_OPTIONS_VAR= PKG_OPTIONS.bash
PKG_SUPPORTED_OPTIONS= multibyte static
-.if !defined(PKG_OPTIONS.bash)
-PKG_DEFAULT_OPTIONS+= multibyte
-.endif
+PKG_SUGGESTED_OPTIONS= multibyte
+PKG_OPTIONS_LEGACY_VARS+= BASH_STATIC:static
+
.include "../../mk/bsd.options.mk"
##