Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2013 06:52:42 +0000 (UTC)
From:      Jason Helfman <jgh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r314263 - head/mail/mutt
Message-ID:  <201303150652.r2F6qgxR005108@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303150652.r2F6qgxR005108>