diff options
| author | dillo <dillo> | 2005-05-31 10:01:36 +0000 |
|---|---|---|
| committer | dillo <dillo> | 2005-05-31 10:01:36 +0000 |
| commit | 3d75323aa5391188ab027b2688faacf8286ace0c (patch) | |
| tree | 54f5cc64fe8b06d4695748b3d5b9967e8c030117 /shells | |
| parent | 12f654f60a47071640b457d59c5edb54b8757615 (diff) | |
| download | pkgsrc-3d75323aa5391188ab027b2688faacf8286ace0c.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')
| -rw-r--r-- | shells/bash/Makefile | 12 | ||||
| -rw-r--r-- | shells/bash2/Makefile | 13 |
2 files changed, 8 insertions, 17 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index c03e5e1c191..b8d84da2c2a 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:21 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/05/31 10:01:39 dillo Exp $ # DISTNAME= bash-3.0 @@ -50,15 +50,11 @@ CONFIGURE_ARGS+= --enable-array-variables .include "../../mk/bsd.prefs.mk" -.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" ## 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" ## |