ports/149061: [PATCH] mutt/mail little cleanup and options

[David DEMELIER]

>Number:         149061
>Category:       ports
>Synopsis:       [PATCH] mutt/mail little cleanup and options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 29 10:10:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     David DEMELIER
>Release:        8.1-RELEASE
>Organization:
>Environment:
FreeBSD Melon.malikania.fr 8.1-RELEASE FreeBSD 8.1-RELEASE #1: Sun Jul 25 00:21:16 CEST 2010     root at Melon.malikania.fr:/usr/obj/usr/src/sys/Melon  amd64

>Description:
I think we must use OPTIONS when is it possible. I modified a little the mail/mutt Makefile to use options and I changed an .error to IGNORE which I think is really better to use.
>How-To-Repeat:

>Fix:
--- Makefile.orig	2010-07-29 10:39:22.000000000 +0200
+++ Makefile	2010-07-29 10:47:19.000000000 +0200
@@ -30,6 +30,17 @@
 COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
 
 CONFLICTS=	mutt-devel-*
+
+OPTIONS=	NLS "Native Language Support via gettext utilities" on \
+		SLANG "Adds display/screen management via S-Lang" off \
+		NCURSES "Adds ncurses console graphics support" off \
+		SMGL_DOCS "Enable mutt SMGL documentation" off \
+		LOCALES_FIX "Enable locales fixes" off \
+		MUTT_XFACE "Adds mutt X-Face" off \
+		MUTT_FLOCK "Enable mutt flock" on \
+		MUTT_ICONV "Enable mutt iconv" on \
+		GSSAPI "GSSAPI (Kerberos) support" on
+
 .include <bsd.port.pre.mk>
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
@@ -52,7 +63,7 @@
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 .if defined(WITHOUT_MUTT_ICONV)
-.error the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
+IGNORE=	the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
 	WITHOUT_NLS is also given
 .endif
 .elif !defined(WITHOUT_MUTT_ICONV)
@@ -61,7 +72,7 @@
 
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
-.elif defined(WITH_NCURSES_PORT)
+.elif defined(WITH_NCURSES)
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 .if !defined (MUTT_LITE)
@@ -89,9 +100,6 @@
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${DOCSDIR} --with-charmaps \
 		--enable-compressed
-.if defined(MUTT_CONFIGURE_ARGS)
-CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
-.endif
 .if defined(WITHOUT_MUTT_FLOCK)
 CONFIGURE_ARGS+=	--disable-flock
 .else
@@ -113,7 +121,7 @@
 .endif
 .if defined(WITH_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
+.elif defined(WITH_NCURSES)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: