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 /security/mit-krb5 | |
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 'security/mit-krb5')
-rw-r--r-- | security/mit-krb5/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 14b8f91c400..15162f0acba 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/30 21:05:42 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/08/22 19:32:52 jlam Exp $ DISTNAME= krb5-1.3.4 PKGNAME= mit-${DISTNAME} @@ -54,13 +54,8 @@ CONFIGURE_ARGS+= --without-krb4 CONFIGURE_ARGS+= --without-tcl MAKE_ENV+= ROOT_USER=${ROOT_USER} -# Global and legacy options -.if defined(KERBEROS_PREFIX_CMDS) -. if !defined(PKG_OPTIONS.mit-krb5) -. if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) -PKG_OPTIONS.mit-krb5+= 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.mit-krb5 |