Patch for devel/apr1

[Baptiste Daroussin]

On Mon, Feb 24, 2014 at 08:19:21PM +0400, Eygene Ryabinkin wrote:
> Mon, Feb 24, 2014 at 04:43:06PM +0100, Mathieu Arnold wrote:
> > +--On 24 février 2014 19:07:49 +0400 Eygene Ryabinkin <rea at freebsd.org>
> > wrote:
> > |> and doesn't work for options in a group.
> > | 
> > | Simple fix is attached.
> > 
> > Hum, there can be no simple fix, the reason it is not supported is that
> > with that, you can break the port by forcing multiple options where only
> > one should be enabled.
> 
> It works for me with OPTIONS_SINGLE of mutt with
> {{{
> # Mutt
> .if ${.CURDIR:M/usr/ports/mail/mutt}
> BATCH=yes
> WITH_SCREEN=yes
> WITH_NCURSES=yes                         # SCREEN: single
> WITH_SLANG=yes                        # SCREEN: single
> WITH_COMPRESSED_FOLDERS=yes
> WITHOUT_DEBUG=yes
> WITHOUT_FLOCK=yes
> WITH_GPGME=yes
> WITHOUT_GREETING_PATCH=yes
> WITHOUT_HTML=yes
> WITH_ICONV=yes
> WITHOUT_IDN=yes
> WITH_IFDEF_PATCH=yes
> WITHOUT_IMAP_HEADER_CACHE=yes
> WITH_LOCALES_FIX=yes
> WITH_MAILBOX_MANPAGES=yes
> WITH_MAILDIR_HEADER_CACHE=yes
> WITH_MAILDIR_MTIME_PATCH=yes
> WITHOUT_NNTP=yes
> WITHOUT_PARENT_CHILD_MATCH_PATCH=yes
> WITH_QUOTE_PATCH=yes
> WITH_REVERSE_REPLY_PATCH=yes
> WITH_SASL=yes
> WITHOUT_SGMLFORMAT=yes
> WITHOUT_SIDEBAR_PATCH=yes
> WITHOUT_SIGNATURE_MENU=yes
> WITH_SMIME_OUTLOOK_COMPAT=yes
> WITH_SMTP=yes
> WITH_TOKYOCABINET=yes
> WITHOUT_TRASH_PATCH=yes
> WITHOUT_XML=yes
> WITHOUT_ASPELL=yes
> WITHOUT_ISPELL=yes
> .endif
> }}}
> I have the proper error,
> {{{
> $ make
> ====> You must select one and only one option from the SCREEN single
> make: exec(exit) failed (No such file or directory)
> *** Error code 1
> 
> Stop.
> }}}
> 
> > I've just committed a patch to bsd.options.mk[1] so that it tells
> > you you are using an old way and should update.
> 
> Well, while this can have its own merits, it is a way too many POLA
> changes and sudden hickups (iconv in base, this change, ld's
> --add-needed change) that make me to collide my head and the
> table/wall.
> 
You cannot call POLA on something new OPTIONS_GROUP, OPTIONS_RADIO,
OPTIONS_SINGLE, OPTIONS_MULTI are new the maintainer as decided to use the new
interfaces because they are more convenient.

The old option framework as moved to OPTIONS_DEFINE and thus we maintain
compatibility for this change (hence the WITH/WITHOUT thing working properly
with OPTIONS_DEFINE options).

All you used to manually do via .if ${.CURDIR...} can be intrument a reliable
way with the new option framework directly and it will work with all OPTIONS_*
things:

mail_mutt_SET= TOKYOCABINET GPGME
mail_mutt_UNSET= ASPELL ISPELL

OPTIONS_SET will make it global and it can be overwritten by the specifion:
<cat>_<port>_SET

same goes for unset.

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-apache/attachments/20140224/d98b96f4/attachment.sig>