From f81ae835adc78533f22ce227d12d3f56e6076f1a Mon Sep 17 00:00:00 2001 From: dillo Date: Tue, 31 May 2005 10:01:36 +0000 Subject: 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. --- databases/db4/options.mk | 7 ++----- databases/openldap/options.mk | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'databases') diff --git a/databases/db4/options.mk b/databases/db4/options.mk index 33d5d01682b..9c6b5656831 100644 --- a/databases/db4/options.mk +++ b/databases/db4/options.mk @@ -1,11 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2004/12/27 04:27:49 jlam Exp $ - -.if defined(WITH_JAVA) && !empty(WITH_JAVA:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= java -.endif +# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.db4 PKG_SUPPORTED_OPTIONS= java +PKG_OPTIONS_LEGACY_VARS+= WITH_JAVA:java .include "../../mk/bsd.options.mk" diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index 5c38a406ea9..4e3974e1408 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.11 2005/02/09 15:38:03 cube Exp $ +# $NetBSD: options.mk,v 1.12 2005/05/31 10:01:36 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap PKG_SUPPORTED_OPTIONS= bdb dynamic kerberos sasl slp -PKG_DEFAULT_OPTIONS+= bdb +PKG_SUGGESTED_OPTIONS= bdb .include "../../mk/bsd.options.mk" -- cgit v1.2.3