ports/152318: maintainer-update of mail/mutt-devel and mail/mutt-deve-lite

[Udo Schweigert]

>Number:         152318
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel and mail/mutt-deve-lite
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 17 08:30:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 8.1-STABLE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel and mail/mutt-devel-lite:

	- Added OPTIONS support.
	- Added support for Berkeley DB 5.1 (used by header caches)

Committer: This is a PR for two ports: mutt-devel (master port) and
           mutt-devel-lite (slave port).

	   New file (cvs add): mail/mutt-devel/options

>How-To-Repeat:
>Fix:
diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	2010-10-16 13:52:20.000000000 +0200
+++ ./Makefile	2010-11-17 08:44:01.000000000 +0100
@@ -168,6 +168,10 @@
 USE_AUTOTOOLS=	automake:111 autoconf:268
 USE_OPENSSL=	yes
 
+.if !defined(WITHOUT_MUTT_OPTIONS)
+.include "${.CURDIR}/../mutt-devel/options"
+.endif
+
 PLIST=		${WRKDIR}/PLIST
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SCRIPTS_ENV=	WRKDIR="${WRKDIR}"
@@ -195,11 +199,6 @@
 .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
 WITH_MUTT_IMAP_HEADER_CACHE=	yes
 .endif
-.if ${OSVERSION} >= 700033 || (${OSVERSION} < 700000 && ${OSVERSION} >= 602107)
-NCURSES_IS_DEFAULT=	yes
-.else
-SLANG_IS_DEFAULT=	yes
-.endif
 
 .if defined (MUTT_LITE)
 WITHOUT_MUTT_XML=			yes
@@ -253,12 +252,8 @@
 MUTT_USES_NCURSES=	yes
 .endif
 .if !defined(MUTT_USES_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(MUTT_USES_NCURSES)
-.if defined(SLANG_IS_DEFAULT)
-MUTT_USES_SLANG=	yes
-.elif defined(NCURSES_IS_DEFAULT)
 MUTT_USES_NCURSES=	yes
 .endif
-.endif
 .if defined(WITHOUT_MUTT_SGMLFORMAT)
 XML_USED=	no
 .endif
diff -ru  /usr/ports/mail/mutt-devel/files/patch-bdb ./files/patch-bdb
--- /usr/ports/mail/mutt-devel/files/patch-bdb	2010-08-10 06:06:27.000000000 +0200
+++ ./files/patch-bdb	2010-11-17 08:31:50.000000000 +0100
@@ -5,7 +5,7 @@
              done
          done
 -        BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+        BDB_VERSIONS="db-4 db4 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
++        BDB_VERSIONS="db-4 db4 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
          AC_MSG_CHECKING([for BerkeleyDB > 4.0])
          for d in $bdbpfx; do
              BDB_INCLUDE_DIR=""
diff -ru  /usr/ports/mail/mutt-devel/options ./options
--- /usr/ports/mail/mutt-devel/options	1970-01-01 01:00:00.000000000 +0100
+++ ./options	2010-11-17 08:42:25.000000000 +0100
@@ -0,0 +1,31 @@
+OPTIONS=	MUTT_ASPELL			"Enable aspell support"		off \
+		MUTT_COMPRESSED_FOLDERS		"Enable compressed folders"	on \
+		MUTT_CYRUS_SASL2		"Enable SASL2 authentication"	off \
+		MUTT_DEBUG			"Enable debugging capabilities"	off \
+		MUTT_FLOCK			"Enable flock() usage"		off \
+		MUTT_GPGME			"Enable gpgme interface"	off \
+		MUTT_GREETING_PATCH		"Enable greeting"		off \
+		MUTT_HTML			"Enable HTML documentation"	on \
+		MUTT_ICONV			"Enable iconv support"		on  \
+		MUTT_IDN			"Enable idn support"		off \
+		MUTT_IFDEF_PATCH		"Enable ifdef feature"		off \
+		MUTT_IMAP_HEADER_CACHE		"Enable imap header cache"	off \
+		MUTT_ISPELL			"Enable ispell support"		off \
+		MUTT_LOCALES_FIX		"Enable locales fix"		off \
+		MUTT_MAILBOX_MANPAGES		"Install mbox.5/mdf.8 manpages"	on  \
+		MUTT_MAILDIR_HEADER_CACHE	"Enable maildir header cache"	off \
+		MUTT_MAILDIR_MTIME_PATCH	"Enable Maildir mtime patch"	off \
+		MUTT_MBOX_HOOK_PATCH		"Enable enhanced mbox-hook"	off \
+		MUTT_NCURSES			"Enable ncurses support"	on \
+		MUTT_NCURSES_PORT		"Use ncurses from port"		off \
+		MUTT_NNTP			"Enable news reader"		off \
+		MUTT_PARENT_CHILD_MATCH		"Enable parent/child match"	off \
+		MUTT_QUOTE_PATCH		"Enable extended quoting"	on  \
+		MUTT_REVERSE_REPLY_PATCH	"Enable reverse_reply"		off \
+		MUTT_SGMLFORMAT			"Enable sgml support"		on  \
+		MUTT_SIDEBAR_PATCH		"Enable sidebar"		off \
+		MUTT_SIGNATURE_MENU		"Enable signature menu"		off \
+		MUTT_SLANG			"Enable slang support"		off \
+		MUTT_SMIME_OUTLOOK_COMPAT	"SMIME outlook compatible"	on \
+		MUTT_SMTP			"Enable SMTP relay support"	off \
+		MUTT_XML			"Use XML tools for documentation"		on 

diff -ru  /usr/ports/mail/mutt-devel-lite/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel-lite/Makefile	2005-05-30 15:46:02.000000000 +0200
+++ ./Makefile	2010-11-17 08:43:41.000000000 +0100
@@ -11,5 +11,6 @@
 COMMENT=	The Mongrel of Mail User Agents (development version, lite package)
 
 MUTT_LITE=	yes
+WITHOUT_MUTT_OPTIONS=	yes
 
 .include "${MASTERDIR}/Makefile"
>Release-Note:
>Audit-Trail:
>Unformatted: