pkg/26758: mail/mutt-devel doesn't build with slang

[holger%jhweiss.de@localhost]

>Number:         26758
>Category:       pkg
>Synopsis:       mail/mutt-devel doesn't build with slang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 25 01:32:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Holger Weiss
>Release:        NetBSD 2.0_BETA
>Organization:
>Environment:
System: NetBSD eos.jhweiss.de 2.0_BETA NetBSD 2.0_BETA (GENERIC) #0: Thu Aug 5 
05:24:27 CEST 2004 
holger%eos.jhweiss.de@localhost:/usr/build/obj/sys/arch/sparc64/compile/GENERIC 
sparc64
Architecture: sparc64
Machine: sparc64
>Description:
        mail/mutt-devel fails to link against S-Lang since menu.c contains
        (n)curses specific code (which was backed out from Mutt CVS shortly
        after the release of 1.5.6):

gcc  -Wall -pedantic -O2 -pipe -mcpu=ultrasparc -I/usr/pkg/include 
-I/usr/include -s -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib 
-L/usr/pkg/lib -o mutt  patchlist.o addrbook.o alias.o attach.o base64.o  
browser.o buffy.o color.o crypt.o cryptglue.o commands.o complete.o  compose.o 
copy.o curs_lib.o curs_main.o date.o edit.o enter.o flags.o  init.o filter.o 
from.o getdomain.o handler.o hash.o hdrline.o headers.o  help.o hook.o keymap.o 
main.o mbox.o menu.o mh.o mx.o pager.o parse.o  pattern.o postpone.o query.o 
recvattach.o recvcmd.o rfc822.o rfc1524.o  rfc2047.o rfc2231.o score.o send.o 
sendlib.o signal.o sort.o status.o  system.o thread.o charset.o history.o lib.o 
muttlib.o editmsg.o utf8.o  mbyte.o wcwidth.o url.o ascii.o mutt_idna.o pgp.o 
pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o smime.o  
resize.o dotlock.o pop.o pop_lib.o pop_auth.o account.o mutt_socket.o 
mutt_tunnel.o md5c.o  -Limap -limap -lslang -lm       -lintl  -ltermlib -li!
 ntl
muttlib.o(.text+0x100): In function `mutt_adv_mktemp':
: warning: mktemp() possibly used unsafely, use mkstemp() or mkdtemp()
menu.o(.text+0x65c): In function `print_enriched_string':
: undefined reference to `PAIR_NUMBER'
menu.o(.text+0x668): In function `print_enriched_string':
: undefined reference to `pair_content'
menu.o(.text+0x670): In function `print_enriched_string':
: undefined reference to `PAIR_NUMBER'
menu.o(.text+0x67c): In function `print_enriched_string':
: undefined reference to `pair_content'
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/mail/mutt-devel/work.eos/mutt-1.5.6
>How-To-Repeat:
        cd pkgsrc/mail/mutt-devel
        make PKG_OPTIONS.mutt=slang
>Fix:
        Use the (n)curses code only if not linking against S-Lang:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile    5 Aug 2004 03:04:33 -0000       1.28
+++ Makefile    25 Aug 2004 01:29:58 -0000
@@ -2,6 +2,7 @@
 
 DISTNAME=              mutt-1.5.6i
 PKGNAME=               ${DISTNAME:C/i$//}
+PKGREVISION=           1
 CATEGORIES=            mail
 MUTT_SITES=            ftp://ftp.mutt.org/mutt/ \
                        
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo    5 Aug 2004 03:24:39 -0000       1.18
+++ distinfo    25 Aug 2004 01:29:58 -0000
@@ -9,3 +9,4 @@
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
 SHA1 (patch-al) = e645a9daf6d439292a83bb196b19bede3fa046e1
+SHA1 (patch-am) = 4f246b530fdacf9a8acf30c3659083d52aba1195
Index: patches/patch-am
===================================================================
RCS file: patches/patch-am
diff -N patches/patch-am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-am    25 Aug 2004 01:29:58 -0000
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- menu.c.orig        2004-02-01 18:10:57.000000000 +0100
++++ menu.c
+@@ -38,7 +38,9 @@ static void print_enriched_string (int a
+   size_t k;
+   size_t n = mutt_strlen ((char *)s);
+   mbstate_t mbstate;
++#ifndef USE_SLANG_CURSES
+   short f1, f2, b1, b2;
++#endif
+ 
+   memset (&mbstate, 0, sizeof (mbstate));
+   while (*s)
+@@ -47,9 +49,11 @@ static void print_enriched_string (int a
+     {
+       if (do_color)
+       {
++#ifndef USE_SLANG_CURSES
+       pair_content(PAIR_NUMBER(ColorDefs[MT_COLOR_TREE]), &f1, &b1);
+       pair_content(PAIR_NUMBER(attr), &f2, &b2);
+       if (b1 == b2)
++#endif /* not USE_SLANG_CURSES */
+         SETCOLOR (MT_COLOR_TREE);
+       }
+       while (*s && *s < M_TREE_MAX)
>Release-Note:
>Audit-Trail:
>Unformatted: