o Fix a segmentation fault.

o Enable WITH_MUTT_SLANG when PACKAGE_BUILDING (so mutt-devel behaves
  like mutt). This is safe, since slang has decent defaults now.

PR:		ports/540787
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

2 files changed, 13 insertions, 4 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d547214..b444c35 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -20,9 +20,7 @@
 # The two most important knobs are:
 #
 # In general you can choose between using the SLANG port (WITH_MUTT_SLANG)
-# and ncurses (WITH_MUTT_NCURSES) which is the default. Note that you may
-# have to set the variables COLORTERM=yes and COLORFGBG=color,color in your
-# environment to get slang function properly.
+# and ncurses (WITH_MUTT_NCURSES) which is the default.
 #
 # If you want to install the mutt documentation in html and ps format define:
 #  WITH_MUTT_HTML
@@ -130,7 +128,7 @@ pre-build:
 
 .if defined(PACKAGE_BUILDING)
 WITH_MUTT_SSL=			yes
-WITH_MUTT_NCURSES=		yes
+WITH_MUTT_SLANG=		yes
 WITH_MUTT_HTML=			yes
 WITH_MUTT_COMPRESSED_FOLDERS=	yes
 WITH_MUTT_QUOTE_PATCH=		yes
diff --git a/mail/mutt-devel/files/patch-thread.c b/mail/mutt-devel/files/patch-thread.c
new file mode 100644
index 0000000..7f231f6
--- /dev/null
+++ b/mail/mutt-devel/files/patch-thread.c
@@ -0,0 +1,11 @@
+--- thread.c.orig	Tue Jan 21 13:25:22 2003
++++ thread.c	Thu Apr 10 17:59:05 2003
+@@ -1272,7 +1272,7 @@
+   THREAD *threads[2];
+   int i, rc;
+ 
+-  if ((Sort & SORT_MASK) != SORT_THREADS)
++  if ((Sort & SORT_MASK) != SORT_THREADS || !hdr->thread)
+     return (1);
+ 
+   threads[0] = hdr->thread;