From d40ff3d8937ba64f7536a88e993d9b4ad873ed67 Mon Sep 17 00:00:00 2001 From: dillo Date: Wed, 1 Jun 2005 14:00:55 +0000 Subject: use PKG_OPTIONS_LEGACY_VARS to handle legacy variables set PKG_SUGGESTED_OPTIONS instead of PKG_DEFAULT_OPTIONS (which should be set by the user only) --- inputmethod/uim/options.mk | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'inputmethod') diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index 57893ecb2b2..e203fe7d163 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,25 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2005/03/29 18:47:52 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/06/01 14:00:55 dillo Exp $ -# Global and legacy options -.if defined(UIM_USE_ANTHY) && !empty(UIM_USE_ANTHY:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= anthy -.endif - -.if defined(UIM_USE_CANNA) && !empty(UIM_USE_CANNA:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= canna -.endif - -.if defined(UIM_USE_EB) && !empty(UIM_USE_EB:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= eb -.endif - -.if defined(UIM_USE_QT) && !empty(UIM_USE_QT:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= qt -.endif - -PKG_OPTIONS_VAR= PKG_OPTIONS.uim PKG_SUPPORTED_OPTIONS= anthy canna eb qt -PKG_DEFAULT_OPTIONS+= anthy canna +PKG_SUPPORTED_OPTIONS= anthy canna +PKG_OPTIONS_LEGACY_VARS+= UIM_USE_ANTHY:anthy +PKG_OPTIONS_LEGACY_VARS+= UIM_USE_CANNA:canna +PKG_OPTIONS_LEGACY_VARS+= UIM_USE_EB:eb +PKG_OPTIONS_LEGACY_VARS+= UIM_USE_qt:qt .include "../../mk/bsd.options.mk" -- cgit v1.2.3