Convert to use bsd.options.mk. The relevant options variable to set

for each package can be determined by invoking:

	make show-var VARNAME=PKG_OPTIONS_VAR

The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).

1 files changed, 15 insertions, 30 deletions

diff --git a/mail/mutt-devel/Makefile.options b/mail/mutt-devel/Makefile.options
index 43b2fd0fb81..3715c78aecc 100644
--- a/mail/mutt-devel/Makefile.options
+++ b/mail/mutt-devel/Makefile.options
@@ -1,52 +1,37 @@
-# $NetBSD: Makefile.options,v 1.2 2004/07/23 15:00:12 jlam Exp $
-#
-# MUTT_ALL_OPTIONS lists all of the currently-supported optional modules
-# that may be built into Mutt.
-#
-# MUTT_OPTIONS is a list of the modules that will be built into Mutt.
-#
-MUTT_ALL_OPTIONS=	slang ncurses ssl sasl
+# $NetBSD: Makefile.options,v 1.3 2004/07/30 21:05:41 jlam Exp $
 
+# Global and legacy options
 .if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \
     defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL)
-.  if !defined(MUTT_OPTIONS)
+.  if !defined(PKG_OPTIONS.mutt)
 .    if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
-MUTT_OPTIONS+=		slang
+PKG_OPTIONS.mutt+=	slang
 .    endif
 .    if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
-MUTT_OPTIONS+=		ncurses
+PKG_OPTIONS.mutt+=	ncurses
 .    endif
 .    if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
-MUTT_OPTIONS+=		ssl
+PKG_OPTIONS.mutt+=	ssl
 .    endif
 .    if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
-MUTT_OPTIONS+=		sasl
+PKG_OPTIONS.mutt+=	sasl
 .    endif
 .  endif
 .endif
+PKG_OPTIONS.mutt?=	ssl
 
-MUTT_OPTIONS?=		ssl
-BUILD_DEFS+=		MUTT_OPTIONS
-
-_MUTT_OPTIONS=		# empty
-.for _opt_ in ${MUTT_OPTIONS}
-.  if empty(_MUTT_OPTIONS:M${_opt_})
-.    if !empty(MUTT_ALL_OPTIONS:M${_opt_})
-_MUTT_OPTIONS+=		${_opt_}
-.    else
-PKG_FAIL_REASON+=	"\"${_opt_}\" is not a supported Mutt build option."
-.    endif
-.  endif
-.endfor
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
+PKG_SUPPORTED_OPTIONS=	slang ncurses ssl sasl
+.include "../../mk/bsd.options.mk"
 
 ###
 ### Slang and ncurses
 ###
-.if !empty(_MUTT_OPTIONS:Mslang)
+.if !empty(PKG_OPTIONS:Mslang)
 .  include "../../devel/libslang/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
 .else
-.  if !empty(_MUTT_OPTIONS:Mslang)
+.  if !empty(PKG_OPTIONS:Mslang)
 USE_NCURSES=		yes
 .  endif
 .  include "../../devel/ncurses/buildlink3.mk"
@@ -56,7 +41,7 @@ CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 ###
 ### SASLv2
 ###
-.if !empty(_MUTT_OPTIONS:Msasl)
+.if !empty(PKG_OPTIONS:Msasl)
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl}
 .endif
@@ -64,7 +49,7 @@ CONFIGURE_ARGS+=	--with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl}
 ###
 ### SSL
 ###
-.if !empty(_MUTT_OPTIONS:Mssl)
+.if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 .else