svn commit: r320512 - in head/mail/mutt14: . files

[Matthias Andree]

Author: mandree
Date: Tue Jun 11 00:19:18 2013
New Revision: 320512
URL: http://svnweb.freebsd.org/changeset/ports/320512

Log:
  + Fix fallout from optionsNG conversion (discussed with bapt@):
  - MUTT_FLOCK vs. CONFIGURE_ARGS logic was inverted.
  - MUTT_ICONV was mistyped as MITT_ICONV so that the check was defective.
  
  + While here, make SLANG/NCURSES a radio group for clarity
    (these two options are optional and mutually exclusive).
  
  + Add a patch to send the proper length in an IMAP APPEND command;
    a size_t argument was printed with %d, which failed where
    sizeof(int) != sizeof(size_t), i. e. on 64-bit systems,
    or when the value was in ]INT_MAX; UINT_MAX] (2^31 or beyond).
    We now use %lu and cast the argument to unsigned long.
    Bump PORTREVISION.
  
  + Shorten COMMENT to avoid its truncation in pkg_info output.

Added:
  head/mail/mutt14/files/patch-message.c   (contents, props changed)
Modified:
  head/mail/mutt14/Makefile

Modified: head/mail/mutt14/Makefile
==============================================================================
--- head/mail/mutt14/Makefile	Tue Jun 11 00:13:12 2013	(r320511)
+++ head/mail/mutt14/Makefile	Tue Jun 11 00:19:18 2013	(r320512)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.2.3
+PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -19,18 +20,29 @@ PATCHFILES=	patch-${PATCHVERSION}.rr.com
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	udo.schweigert at siemens.com
-COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
+COMMENT?=	The Mongrel of Mailers (part Elm, Pine, Mush, mh, etc.)
 
 CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* mutt-[^1].[^4]*
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}14${PKGNAMESUFFIX}
 
-OPTIONS_DEFINE=	NLS SLANG NCURSES SGML_DOCS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
+OPTIONS_DEFINE=	NLS SGML_DOCS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
 OPTIONS_DEFAULT=	MUTT_FLOCK MUTT_ICONV GSSAPI
-SGML_DOCS_DESC=		mutt SGML documentation
-LOCALES_FIX_DESC=	locales fixes
-MUTT_XFACE_DESC=	Adds mutt X-Face
-MUTT_FLOCK_DESC=	mutt flock
-MUTT_ICONV_DESC=	mutt iconv
+
+OPTIONS_RADIO=		CONS
+OPTIONS_RADIO_CONS=	SLANG NCURSES
+
+.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
+OPTIONS_DEFAULT+=	SLANG
+.endif
+
+CONS_DESC=	Console driver (if none chosen, uses ncurses from base system)
+SLANG_DESC=	Adds display/screen management via S-Lang
+NCURSES_DESC=	Adds console graphics support with ncurses from ports
+SGML_DOCS_DESC=	Build mutt's SGML documentation
+LOCALES_FIX_DESC=	Enable locales fixes
+MUTT_XFACE_DESC=	Adds mutt X-Face support
+MUTT_FLOCK_DESC=	Use flock() for file locks
+MUTT_ICONV_DESC=	Enable mutt's iconv character conversion feature
 
 USE_OPENSSL=	yes
 
@@ -52,8 +64,8 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textpro
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext iconv
 .if ! ${PORT_OPTIONS:MMUTT_ICONV}
-IGNORE=	the MUTT_ICONV options of the mutt port only be deactivate if \
-	NLS is also deactivated
+IGNORE=	the MUTT_ICONV options of the mutt port only be disabled if \
+	NLS is also disabled
 .endif
 .elif ${PORT_OPTIONS:MMUTT_ICONV}
 USES+=	iconv
@@ -94,9 +106,9 @@ CONFIGURE_ARGS=	--enable-pop --enable-im
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 .if ${PORT_OPTIONS:MMUTT_FLOCK}
-CONFIGURE_ARGS+=	--disable-flock
-.else
 CONFIGURE_ARGS+=	--enable-flock
+.else
+CONFIGURE_ARGS+=	--disable-flock
 .endif
 .if ${PORT_OPTIONS:MLOCALES_FIX}
 CONFIGURE_ARGS+=	--enable-locales-fix
@@ -107,7 +119,7 @@ PLIST_SUB+=	NLS=""
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
-.if ! ${PORT_OPTIONS:MMITT_ICONV} && ! ${PORT_OPTIONS:MNLS}
+.if ! ${PORT_OPTIONS:MMUTT_ICONV} && ! ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-iconv
 .else
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}

Added: head/mail/mutt14/files/patch-message.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/mutt14/files/patch-message.c	Tue Jun 11 00:19:18 2013	(r320512)
@@ -0,0 +1,11 @@
+--- imap/message.c.orig	2007-05-23 03:17:53.000000000 +0200
++++ imap/message.c	2013-06-04 00:53:42.000000000 +0200
+@@ -435,7 +435,7 @@
+   rewind (fp);
+   
+   imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
+-  snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%d}", mbox, len);
++  snprintf (buf, sizeof (buf), "APPEND %s (\\Seen) {%lu}", mbox, (unsigned long)len);
+ 
+   imap_cmd_start (idata, buf);
+