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

[Udo Schweigert]

>Number:         72882
>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:   Tue Oct 19 15:20:17 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel:

	- Update the maildir-header-cache and fix breakage if db41 or db4 are
	  installed.

This patch fixes also 72878

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/files/extra-patch-maildir-header-cache ./files/extra-patch-maildir-header-cache
--- /usr/ports/mail/mutt-devel/files/extra-patch-maildir-header-cache	Tue Oct 12 18:42:03 2004
+++ ./files/extra-patch-maildir-header-cache	Tue Oct 19 17:09:59 2004
@@ -2,14 +2,27 @@
 --- a/PATCHES
 +++ b/PATCHES
 @@ -0,0 +1 @@
-+patch-1.5.6.tg.hcache.9
++patch-1.5.6.tg.hcache.10
 diff -Nru a/configure.in b/configure.in
 --- a/configure.in	2004-08-18 09:43:09 +02:00
-+++ b/configure.in	2004-09-02 13:09:08 +02:00
-@@ -768,6 +768,90 @@
++++ b/configure.in	2004-10-14 07:21:52 +02:00
+@@ -692,11 +692,6 @@
+    AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
+ fi
  
-         fi])
+-if test "$need_md5" = "yes"
+-then
+-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o"
+-fi
+-
+ dnl -- end socket --
+ 
+ AC_ARG_ENABLE(debug, [  --enable-debug             Enable debugging support],
+@@ -767,6 +762,96 @@
+                    NOTE: this requires significant more memory when defined.])
  
+         fi])
++
 +dnl -- start cache --
 +AC_ARG_ENABLE(hcache, [  --enable-hcache            Enable header caching],
 +[if test x$enableval = xyes; then
@@ -19,6 +32,7 @@
 +    OLDCPPFLAGS="$CPPFLAGS"
 +    OLDLIBS="$LIBS"
 +
++    need_md5="yes"
 +    ac_prefer_gdbm=yes
 +    AC_ARG_WITH(gdbm, [  --without-gdbm             Get rid of gdbm even if it is available ],
 +        ac_prefer_gdbm=$withval)
@@ -42,7 +56,7 @@
 +                bdbpfx="$bdbpfx $d/$v"
 +            done
 +        done
-+        BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
++        BDB_VERSIONS="db-4.2 db4.2 db42 ''"
 +        AC_MSG_CHECKING([for BerkeleyDB > 4.0])
 +        for d in $bdbpfx; do
 +            BDB_INCLUDE_DIR=""
@@ -94,9 +108,13 @@
 +fi])
 +dnl -- end cache --
 +
++if test "$need_md5" = "yes"
++then
++        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o"
++fi
+ 
  AC_SUBST(MUTTLIBS)
  AC_SUBST(MUTT_LIB_OBJECTS)
- AC_SUBST(LIBIMAP)
 diff -Nru a/globals.h b/globals.h
 --- a/globals.h	2004-08-18 09:43:11 +02:00
 +++ b/globals.h	2004-08-26 22:32:53 +02:00
>Release-Note:
>Audit-Trail:
>Unformatted: