svn commit: r314137 - in head/mail/mutt: . scripts

[Adam McDougall]

On 03/14/13 03:34, Jason Helfman wrote:
> Author: jgh
> Date: Thu Mar 14 07:34:30 2013
> New Revision: 314137
> URL: http://svnweb.freebsd.org/changeset/ports/314137
> 
> Log:
>   - adopt optionsNG and remove legacy information from pkg-descr
>   
>   PR:		175149
>   Submitted by:	jgh@/maintainer
>   Approved by:	maintainer, Udo.Schweigert at siemens.com
> 
> Modified:
>   head/mail/mutt/Makefile
>   head/mail/mutt/pkg-descr
>   head/mail/mutt/scripts/generate-plist
> 
> Modified: head/mail/mutt/Makefile
> ==============================================================================
> --- head/mail/mutt/Makefile	Thu Mar 14 07:18:55 2013	(r314136)
> +++ head/mail/mutt/Makefile	Thu Mar 14 07:34:30 2013	(r314137)

...

> +.if !defined (LITE)
> +OPTIONS_DEFINE=	COMPRESSED_FOLDERS CYRUS_SASL2 DEBUG FLOCK \
> +		GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
> +		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
> +		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
> +		NNTP PARENT_CHILD_MATCH_PATCH \
> +		QUOTE_PATCH REVERSE_REPLY_PATCH SGMLFORMAT SIDEBAR_PATCH \
> +		SIGNATURE_MENU SMIME_OUTLOOK_COMPAT SMTP TRASH_PATCH \
> +		XML

...

> -.if !defined(WITHOUT_GSSAPI)
> +
> +.if ${PORT_OPTIONS:MGSSAPI}
>  .if exists(${LOCALBASE}/bin/krb5-config)
> -LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
> +LIB_DEPENDS+=		gssapi_krb5.2:${PORTSDIR}/security/krb5
>  CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
>  .elif exists(${KRB5_HOME}/bin/krb5-config)
>  LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
> @@ -415,24 +269,27 @@ CONFIGURE_ARGS+=	--with-gss=${HEIMDAL_HO
>  LDFLAGS+=		-L${HEIMDAL_HOME}/lib -rpath=${HEIMDAL_HOME}/lib
>  .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
>  CONFIGURE_ARGS+=	--with-gss
> -USE_KRB5_SYS=YES
> +WITH_KRB5_SYS=YES
>  .endif
>  .endif

"WITHOUT_GSSAPI" was converted into a positive option "GSSAPI" but
GSSAPI isn't listed as an option in "make config".  Can it be added to
OPTIONS_DEFINE above and include a proper description if needed, and
should it be enabled by default like it used to be?  Thanks.