Update to snapshot 20050825 (merge from mutt 1.5.10).

Add some addtional options for headers cache, idn [1].
Provide common set of options that are compatible with mutt and mutt-devel ports [2].

Submitted by:	Rocco Rutte [1]
		obrien [2]
Approved by:	perky (mentor)

4 files changed, 47 insertions, 114 deletions

diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile
index 1db0c5e59dde..59041de3bf98 100644
--- a/mail/mutt-ng/Makefile
+++ b/mail/mutt-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mutt-ng
-PORTVERSION=	20050726
+PORTVERSION=	20050825
 CATEGORIES=	mail
 MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/
 DISTNAME=	muttng-${PORTVERSION}
@@ -44,44 +44,67 @@ CONFIGURE_ARGS+=	--disable-iconv
 OPTIONS=	POP "Enable pop3 support" on \
 		IMAP "Enable imap support" on \
 		NNTP "Enable nntp support" off \
-		COMPRESSED "Enable compressed folder support" off \
-		FLOCK "Enable flock to lock files" off \
-		HCACHE "Enable headers caching" on \
+		COMPRESSED "Enable compressed folder support" on \
+		FLOCK "Enable flock to lock files" on \
+		HCACHE_DB4 "Enable headers caching via DB4" on \
+		HCACHE_GDBM "Enable headers caching via gdbm" off \
+		HCACHE_QDBM "Enable headers caching via qdbm" off \
 		ESMTP "Enable libesmtp support for sending mail" off \
 		SLANG "Compile with SLANG frontend" off \
-		NCURSES_PORT "Compile with ncurses frontend" off \
-		SASL2 "Compile with sasl2 support for authentication" off
+		NCURSES_PORT "Compile with ncurses frontend via port" off \
+		SASL2 "Compile with sasl2 support for authentication" off \
+		GNUTLS "Compile with SSL support via GNUTLS" off \
+		LIBIDN "Enable international domain names" off \
+		DEBUG "Compile a debug version" on
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
+WITH_MUTT_IMAP_HEADER_CACHE=  yes
+.endif
+
 .if defined (WITH_POP)
 CONFIGURE_ARGS+=	--enable-pop
 .endif
 
-.if defined (WITH_IMAP)
+.if defined (WITH_IMAP) || defined(WITH_MUTT_IMAP_HEADER_CACHE)
 CONFIGURE_ARGS+=	--enable-imap
 .endif
 
-.if defined(WITH_POP) || defined(WITH_IMAP)
+.if defined(WITH_POP) || defined(WITH_IMAP) || defined(WITH_NNTP) || defined(WITH_SSL)
+.if !defined(WITH_GNUTLS)
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=	--with-gnutls=${LOCALBASE}
+LIB_DEPENDS+=		gnutls.12:${PORTSDIR}/security/gnutls
+.endif
 .endif
 
-.if defined (WITH_NNTP)
+.if defined (WITH_NNTP) || defined(WITH_MUTT_NNTP)
 CONFIGURE_ARGS+=	--enable-nntp
 .endif
 
-.if defined (WITH_COMPRESSED)
+.if defined (WITH_COMPRESSED) || defined(WITH_MUTT_COMPRESSED_FOLDERS)
 CONFIGURE_ARGS+=	--enable-compressed
 .endif
 
-.if defined (WITH_HCACHE)
+.if defined (WITH_HCACHE_DB4) || defined(WITH_MUTT_IMAP_HEADER_CACHE)
 CONFIGURE_ARGS+=	--enable-hcache --without-qdbm --without-gdbm --with-bdb=${LOCALBASE}
 LIB_DEPENDS+=		db41.1:${PORTSDIR}/databases/db41
+.elif defined (WITH_HCACHE_GDBM)
+CONFIGURE_ARGS+=	--enable-hcache --without-qdbm
+LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
+.elif defined (WITH_HCACHE_QDBM)
+CONFIGURE_ARGS+=	--enable-hcache
+LIB_DEPENDS+=		qdbm.11:${PORTSDIR}/databases/qdbm
 .endif
 
 .if defined (WITH_FLOCK)
 CONFIGURE_ARGS+=	--enable-flock
 CONFIGURE_ARGS+=	--disable-fcntl
+.elif defined(WITHOUT_MUTT_FLOCK)
+CONFIGURE_ARGS+=	--disable-flock
+CONFIGURE_ARGS+=	--enable-fcntl
 .endif
 
 .if defined(WITH_SLANG) && !defined(WITH_NCURSES_PORT)
@@ -89,12 +112,12 @@ LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 CONFIGURE_ARGS+=	--with-slang=${LOCALBASE}
 .elif defined(WITH_NCURSES_PORT) && !defined(WITH_SLANG)
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-CONFIGURE_ARGS+=	--with-ncurses=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-curses=${LOCALBASE}
 .elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT)
 BROKEN=	"You may not specify both WITH_SLANG and WITH_NCURSES options"
 .endif
 
-.if defined(WITH_SASL2)
+.if defined(WITH_SASL2) || defined(WITH_MUTT_CYRUS_SASL2)
 .if !defined(WITH_POP) && !defined(WITH_IMAP)
 BROKEN=	"SASL2 only is useful for imap or pop"
 .endif
@@ -107,6 +130,15 @@ LIB_DEPENDS+=	esmtp.6:${PORTSDIR}/mail/libesmtp
 CONFIGURE_ARGS+=	--with-libesmtp=${LOCALBASE}
 .endif
 
+.if defined(WITH_LIBIDN)
+LIB_DEPENDS+=	idn.16:${PORTSDIR}/devel/libidn
+CONFIGURE_ARGS+=	--with-idn=${LOCALBASE}
+.endif
+
+.if defined (WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 .if !defined (NOPORTDOCS)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .else
diff --git a/mail/mutt-ng/distinfo b/mail/mutt-ng/distinfo
index 7fad2b710265..62c8789970ce 100644
--- a/mail/mutt-ng/distinfo
+++ b/mail/mutt-ng/distinfo
@@ -1,2 +1,2 @@
-MD5 (muttng-20050726.tar.gz) = cc3d39cdaa985c28357d0d671e732597
-SIZE (muttng-20050726.tar.gz) = 2272249
+MD5 (muttng-20050825.tar.gz) = e6c8ac27f9ddfb689b346201c7b56e3c
+SIZE (muttng-20050825.tar.gz) = 2571608
diff --git a/mail/mutt-ng/files/patch-intl_Makefile.in b/mail/mutt-ng/files/patch-intl_Makefile.in
deleted file mode 100644
index 7ced86681c2f..000000000000
--- a/mail/mutt-ng/files/patch-intl_Makefile.in
+++ /dev/null
@@ -1,85 +0,0 @@
---- intl/Makefile.in.orig	Mon Aug  1 13:21:23 2005
-+++ intl/Makefile.in	Mon Aug  1 13:24:12 2005
-@@ -142,44 +142,44 @@
- # package, you have to use `configure --with-included-gettext'.
- install: install-exec install-data
- install-exec: all
--	if test "$(PACKAGE)" = "gettext" \
--	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
--	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
--	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
--	  $(LIBTOOL) --mode=install \
--	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
--	else \
--	  : ; \
--	fi
--	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
--	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
--	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
--	  dest=$(DESTDIR)$(libdir)/charset.alias; \
--	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
--	    orig=$(DESTDIR)$(libdir)/charset.alias; \
--	    sed -f ref-add.sed $$orig > $$temp; \
--	    $(INSTALL_DATA) $$temp $$dest; \
--	    rm -f $$temp; \
--	  else \
--	    if test @GLIBC21@ = no; then \
--	      orig=charset.alias; \
--	      sed -f ref-add.sed $$orig > $$temp; \
--	      $(INSTALL_DATA) $$temp $$dest; \
--	      rm -f $$temp; \
--	    fi; \
--	  fi; \
--	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
--	  test -f $(DESTDIR)$(localedir)/locale.alias \
--	    && orig=$(DESTDIR)$(localedir)/locale.alias \
--	    || orig=$(srcdir)/locale.alias; \
--	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
--	  dest=$(DESTDIR)$(localedir)/locale.alias; \
--	  sed -f ref-add.sed $$orig > $$temp; \
--	  $(INSTALL_DATA) $$temp $$dest; \
--	  rm -f $$temp; \
--	else \
--	  : ; \
--	fi
-+#	if test "$(PACKAGE)" = "gettext" \
-+#	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-+#	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-+#	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-+#	  $(LIBTOOL) --mode=install \
-+#	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-+#	else \
-+#	  : ; \
-+#	fi
-+#	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-+#	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
-+#	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-+#	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-+#	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-+#	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-+#	    sed -f ref-add.sed $$orig > $$temp; \
-+#	    $(INSTALL_DATA) $$temp $$dest; \
-+#	    rm -f $$temp; \
-+#	  else \
-+#	    if test @GLIBC21@ = no; then \
-+#	      orig=charset.alias; \
-+#	      sed -f ref-add.sed $$orig > $$temp; \
-+#	      $(INSTALL_DATA) $$temp $$dest; \
-+#	      rm -f $$temp; \
-+#	    fi; \
-+#	  fi; \
-+#	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
-+#	  test -f $(DESTDIR)$(localedir)/locale.alias \
-+#	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-+#	    || orig=$(srcdir)/locale.alias; \
-+#	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-+#	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-+#	  sed -f ref-add.sed $$orig > $$temp; \
-+#	  $(INSTALL_DATA) $$temp $$dest; \
-+#	  rm -f $$temp; \
-+#	else \
-+#	  : ; \
-+#	fi
- install-data: all
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
diff --git a/mail/mutt-ng/files/patch-intl_dcigettext.c b/mail/mutt-ng/files/patch-intl_dcigettext.c
deleted file mode 100644
index 840167e151f8..000000000000
--- a/mail/mutt-ng/files/patch-intl_dcigettext.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- intl/dcigettext.c.orig	Sat Jun 18 01:40:35 2005
-+++ intl/dcigettext.c	Sat Jun 18 01:40:57 2005
-@@ -58,11 +58,6 @@
- #include <stdlib.h>
- 
- #include <string.h>
--#if !HAVE_STRCHR && !defined _LIBC
--# ifndef strchr
--#  define strchr index
--# endif
--#endif
- 
- #if defined HAVE_UNISTD_H || defined _LIBC
- # include <unistd.h>