diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | b1276828b47cd0e050c7db6a6dd702ffc806f96a (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /security/PAM | |
| parent | 4795460da1a16fd97804c0cfe23df962441269c8 (diff) | |
| download | pkgsrc-b1276828b47cd0e050c7db6a6dd702ffc806f96a.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 'security/PAM')
| -rw-r--r-- | security/PAM/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 9c14611446c..1caab4e0c34 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/08/05 02:42:12 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/08/22 19:32:52 jlam Exp $ # DISTNAME= Linux-PAM-0.77 @@ -38,13 +38,8 @@ MESSAGE_SUBST+= PAM_MODULEDIR=${PAM_MODULEDIR} .include "../../mk/bsd.prefs.mk" -# Global and legacy options -.if defined(USE_LIBCRACK) -. if !defined(PKG_OPTIONS.PAM) -. if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS]) -PKG_OPTIONS.PAM+= libcrack -. endif -. endif +.if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= libcrack .endif PKG_OPTIONS_VAR= PKG_OPTIONS.PAM |