Bug 176970 - [PATCH] mail/mutt SASL option broken
Summary: [PATCH] mail/mutt SASL option broken
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Jason Helfman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-14 21:10 UTC by John Marshall
Modified: 2013-03-15 07:00 UTC (History)
0 users

See Also:


Attachments
mutt.diff (1.25 KB, patch)
2013-03-14 21:10 UTC, John Marshall
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Marshall 2013-03-14 21:10:01 UTC
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'
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-14 21:10:09 UTC
Maintainer of mail/mutt,

Please note that PR ports/176970 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/176970

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-03-14 21:10:10 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Jason Helfman freebsd_committer freebsd_triage 2013-03-14 22:50:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jgh

I'll take it.
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-03-14 23:17:35 UTC
Author: jgh
Date: Thu Mar 14 23:17:26 2013
New Revision: 314192
URL: http://svnweb.freebsd.org/changeset/ports/314192

Log:
  - fix CYRUS_SASL2 breakage
  
  PR:		176970 (based on)
  Submitted by:	john.marshall@riverwillow.com.au
  Approved by:	maintainer, udo.schweigert@siemens.com (implicit)

Modified:
  head/mail/mutt/Makefile

Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile	Thu Mar 14 23:14:38 2013	(r314191)
+++ head/mail/mutt/Makefile	Thu Mar 14 23:17:26 2013	(r314192)
@@ -183,7 +183,7 @@ CONFIGURE_ARGS+=	--disable-nls
 
 .if ${PORT_OPTIONS:MCYRUS_SASL2}
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	with-sasl=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MSMIME_OUTLOOK_COMPAT}
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-03-15 06:52:49 UTC
Author: jgh
Date: Fri Mar 15 06:52:42 2013
New Revision: 314263
URL: http://svnweb.freebsd.org/changeset/ports/314263

Log:
  - rename CYRUS_SASL2 option to SASL [1,2]
  - add tokyocabinet option [2]
  
  PR:		176970 [1]
  Submitted by:	john.marshall@riverwillow.com.au [1], maintainer (private mail) [2]
  Approved by:	maintainer, udo.schweigert@siemens.com

Modified:
  head/mail/mutt/Makefile

Modified: head/mail/mutt/Makefile
==============================================================================
--- head/mail/mutt/Makefile	Fri Mar 15 06:45:07 2013	(r314262)
+++ head/mail/mutt/Makefile	Fri Mar 15 06:52:42 2013	(r314263)
@@ -59,14 +59,14 @@ USE_OPENSSL=	yes
 LITE=	YES
 .endif
 .if !defined (LITE)
-OPTIONS_DEFINE=	COMPRESSED_FOLDERS CYRUS_SASL2 DEBUG FLOCK \
+OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL 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
+		SIGNATURE_MENU SMIME_OUTLOOK_COMPAT SMTP TOKYOCABINET \
+		TRASH_PATCH XML
 
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_RADIO=	SPELL
@@ -74,7 +74,7 @@ OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
 
 COMPRESSED_FOLDERS_DESC=	Compressed folders
-CYRUS_SASL2_DESC=	SASL2 authentication
+SASL_DESC=	SASL authentication
 DEBUG_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
 GPGME_DESC=	Gpgme interface
@@ -97,6 +97,7 @@ SIGNATURE_MENU_DESC=	Signature menu
 SLANG_DESC=	SLANG support
 SMIME_OUTLOOK_COMPAT_DESC=	SMIME outlook compatibility
 SMTP_DESC=	SMTP relay support
+TOKYOCABINET=	Use tokyocabinet instead of Berkley DB
 TRASH_PATCH_DESC=	Trash folder support
 XML_DESC=	Use XML tools for building documentation
 
@@ -181,7 +182,7 @@ SCRIPTS_ENV+=	NLS="yes"
 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}
 .endif
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Jason Helfman freebsd_committer freebsd_triage 2013-03-15 06:52:58 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!