From john.marshall@riverwillow.com.au  Thu Mar 14 21:02:47 2013
Return-Path: <john.marshall@riverwillow.com.au>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id C1D5E8BA
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Mar 2013 21:02:47 +0000 (UTC)
	(envelope-from john.marshall@riverwillow.com.au)
Received: from mail1.riverwillow.net.au (mail1.riverwillow.net.au [203.58.93.36])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E02FB2E
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Mar 2013 21:02:46 +0000 (UTC)
Received: from rwpc13.mby.riverwillow.net.au (rwpc13.mby.riverwillow.net.au [172.25.24.200])
	(authenticated bits=0)
	by mail1.riverwillow.net.au (8.14.6/8.14.6) with ESMTP id r2EL2YVb030161
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 15 Mar 2013 08:02:35 +1100 (AEDT)
Received: from rwpc13.mby.riverwillow.net.au (john@localhost [127.0.0.1])
	by rwpc13.mby.riverwillow.net.au (8.14.5/8.14.5) with ESMTP id r2EL2Y5g098896
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 15 Mar 2013 08:02:34 +1100 (AEDT)
	(envelope-from john.marshall@riverwillow.com.au)
Received: (from john@localhost)
	by rwpc13.mby.riverwillow.net.au (8.14.5/8.14.5/Submit) id r2EL2XLe098895;
	Fri, 15 Mar 2013 08:02:33 +1100 (AEDT)
	(envelope-from john)
Message-Id: <201303142102.r2EL2XLe098895@rwpc13.mby.riverwillow.net.au>
Date: Fri, 15 Mar 2013 08:02:33 +1100 (AEDT)
From: John Marshall <john.marshall@riverwillow.com.au>
Reply-To: John Marshall <john.marshall@riverwillow.com.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] mail/mutt SASL option broken
X-Send-Pr-Version: 3.113
X-GNATS-Notify: udo.schweigert@siemens.com

>Number:         176970
>Category:       ports
>Synopsis:       [PATCH] mail/mutt SASL option broken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 14 21:10:01 UTC 2013
>Closed-Date:    Fri Mar 15 06:53:00 UTC 2013
>Last-Modified:  Fri Mar 15 07:00:00 UTC 2013
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Mar 14 21:10:10 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176970 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: udo.schweigert@siemens.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/176970: [PATCH] mail/mutt SASL option broken
Date: Thu, 14 Mar 2013 21:10:09 UT

 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
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Thu Mar 14 22:50:06 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176970 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176970: commit references a PR
Date: Thu, 14 Mar 2013 23:17:35 +0000 (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"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: jgh 
State-Changed-When: Fri Mar 15 06:52:58 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176970 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176970: commit references a PR
Date: Fri, 15 Mar 2013 06:52:49 +0000 (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"
 
>Unformatted:
