Date: Fri, 15 Mar 2013 08:02:33 +1100 (AEDT) From: John Marshall <john.marshall@riverwillow.com.au> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176970: [PATCH] mail/mutt SASL option broken Message-ID: <201303142102.r2EL2XLe098895@rwpc13.mby.riverwillow.net.au> Resent-Message-ID: <201303142110.r2ELA2di048426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176970
>Category: ports
>Synopsis: [PATCH] mail/mutt SASL option broken
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 14 21:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: John Marshall
>Release: FreeBSD 9.1-RELEASE i386
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwpc13 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243728: Sat Dec 1 15:19:05 AEDT 2012 root@rwpc13:/usr/obj/build/src/sys/RWPC13 i386
>Description:
The port fails 'make configure' if the CYRUS_SASL2 option is selected.
The option broke during the recent major optionsNG conversion in
r314137.
The attached patch fixes the breakage and adopts the standard SASL
option name.
I haven't tested any combinations of options other than what I use.
>How-To-Repeat:
Select option CYRUS_SASL2 and attempt 'make configure'
>Fix:
--- mutt.diff begins here ---
Index: mail/mutt/Makefile
===================================================================
--- mail/mutt/Makefile (revision 314138)
+++ mail/mutt/Makefile (working copy)
@@ -59,12 +59,12 @@
LITE= YES
.endif
.if !defined (LITE)
-OPTIONS_DEFINE= COMPRESSED_FOLDERS CYRUS_SASL2 DEBUG FLOCK \
+OPTIONS_DEFINE= COMPRESSED_FOLDERS 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 \
+ QUOTE_PATCH REVERSE_REPLY_PATCH SASL SGMLFORMAT SIDEBAR_PATCH \
SIGNATURE_MENU SMIME_OUTLOOK_COMPAT SMTP TRASH_PATCH \
XML
@@ -74,7 +74,6 @@
OPTIONS_SINGLE_SCREEN= NCURSES SLANG
COMPRESSED_FOLDERS_DESC= Compressed folders
-CYRUS_SASL2_DESC= SASL2 authentication
DEBUG_DESC= Debugging capabilities
FLOCK_DESC= flock() usage
GPGME_DESC= Gpgme interface
@@ -181,9 +180,9 @@
CONFIGURE_ARGS+= --disable-nls
.endif
-.if ${PORT_OPTIONS:MCYRUS_SASL2}
+.if ${PORT_OPTIONS:MSASL}
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+= with-sasl=${LOCALBASE}
+CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
.if ${PORT_OPTIONS:MSMIME_OUTLOOK_COMPAT}
--- mutt.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303142102.r2EL2XLe098895>