diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
| commit | dfe460ba774f2a95167edac5ba4a3edb868d569d (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /security/heimdal | |
| parent | 1b244d8d5ecef0e41548499a16a5812d4f65a208 (diff) | |
| download | pkgsrc-dfe460ba774f2a95167edac5ba4a3edb868d569d.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/heimdal')
| -rw-r--r-- | security/heimdal/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index df8f17255aa..812e5ebf222 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/08/05 16:28:45 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:52 jlam Exp $ DISTNAME= heimdal-0.6.1 PKGREVISION= 1 @@ -37,16 +37,8 @@ LIBS.SunOS= -ltermcap CONFIGURE_ARGS+= --with-openssl=${SSLBASE} .include "../../security/openssl/buildlink3.mk" -# Global and legacy options -.if defined(USE_DB4) || defined(KERBEROS_PREFIX_CMDS) -. if !defined(PKG_OPTIONS.heimdal) -. if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS]) -PKG_OPTIONS.heimdal+= db4 -. endif -. if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) -PKG_OPTIONS.heimdal+= prefix-cmds -. endif -. endif +.if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= prefix-cmds .endif PKG_OPTIONS_VAR= PKG_OPTIONS.heimdal |