diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | 5cc6a7c1f324655a55780f73b3d7d11d39d55ec5 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /www/lynx | |
| parent | a3f9a03576685fb9a6a35d58b1695247504fc00a (diff) | |
| download | pkgsrc-5cc6a7c1f324655a55780f73b3d7d11d39d55ec5.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 'www/lynx')
| -rw-r--r-- | www/lynx/options.mk | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/www/lynx/options.mk b/www/lynx/options.mk index 21dde3d76d2..2da1436b9f1 100644 --- a/www/lynx/options.mk +++ b/www/lynx/options.mk @@ -1,27 +1,16 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ -# Global and legacy options -.if defined(LYNX_SCREEN_LIB) || defined(USE_SOCKS) || defined(USE_INET6) -. if !defined(PKG_OPTIONS.lynx) -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang) -PKG_OPTIONS.lynx+= slang -. endif -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses) -PKG_OPTIONS.lynx+= ncurses -. endif -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses) -PKG_OPTIONS.lynx+= curses -. endif -. if defined(USE_SOCKS) && (${USE_SOCKS} == 4) -PKG_OPTIONS.lynx+= socks4 -. endif -. if defined(USE_SOCKS) && (${USE_SOCKS} == 5) -PKG_OPTIONS.lynx+= socks5 -. endif -. if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.lynx+= inet6 -. endif -. endif +.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang) +PKG_DEFAULT_OPTIONS+= slang +.endif +.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses) +PKG_DEFAULT_OPTIONS+= ncurses +.endif +.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses) +PKG_DEFAULT_OPTIONS+= curses +.endif +.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 .endif PKG_OPTIONS_VAR= PKG_OPTIONS.lynx |