ports/115109: maintainer-update of mail/mutt-devel

[Udo Schweigert]

>Number:         115109
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>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 Aug 01 08:00:07 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel:

	- Use ncurses as default for recent 6.x and 7.x OSVERSIONs to
	  have an UTF-8 enabled mutt out of the box.

	- Add WITH_MUTT_SMTP know.

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	2007-07-06 14:00:39.000000000 +0200
+++ ./Makefile	2007-08-01 09:20:19.000000000 +0200
@@ -20,9 +20,9 @@
 # The two most important knobs are:
 #
 # In general you can choose between using ncurses (WITH_MUTT_NCURSES)
-# and SLANG (WITH_MUTT_SLANG) which is the default. Note that you may
-# have to set the variables COLORTERM=yes and COLORFGBG="color1;color2" in your
-# environment to get slang function properly.
+# and SLANG (WITH_MUTT_SLANG). Note that you may have to set the variables
+# COLORTERM=yes and COLORFGBG="color1;color2" in your environment to get slang
+# function properly.
 # The default version for slang is 1.x. Define WITH_MUTT_SLANG2 if you want
 # to use the slang version 2.x
 # The default version for ncurses is that which comes with the operating
@@ -104,6 +104,9 @@
 # If you want to enable the `greeting' option define:
 #  WITH_MUTT_GREETING_PATCH
 #
+# If you want to enable the internal SMTP relay support define:
+#  WITH_MUTT_SMTP
+#
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.16
@@ -203,6 +206,11 @@
 IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
 .endif
 .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
@@ -261,8 +269,12 @@
 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
 MUTT_USES_SLANG1=	yes
+.elif defined(NCURSES_IS_DEFAULT)
+MUTT_USES_NCURSES=	yes
+.endif
 .endif
 .if defined(WITHOUT_MUTT_SGMLFORMAT)
 XML_USED=	no
@@ -382,6 +394,11 @@
 USE_KRB5_SYS=YES
 .endif
 .endif
+.if defined(WITH_MUTT_SMTP)
+CONFIGURE_ARGS+= --enable-smtp
+.else
+CONFIGURE_ARGS+= --disable-smtp
+.endif
 
 PATCH_DIST_STRIP=	-p1
 
>Release-Note:
>Audit-Trail:
>Unformatted: