pkg/31451: UPDATE: mutt-devel to 1.5.11 +IDN

[Charlie Allom <charlie%rubberduck.com@localhost>]

>Number:         31451
>Category:       pkg
>Synopsis:       UPDATE: mutt-devel to 1.5.11 +IDN option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Oct 03 04:06:00 +0000 2005
>Originator:     Charlie Allom <charlie%rubberduck.com@localhost>
>Release:        NetBSD 2.0_STABLE
>Organization:
 hail eris
 http://rubberduck.com/
>Environment:
        
        
System: NetBSD lazy 2.0_STABLE NetBSD 2.0_STABLE (LAZY) #0: Fri Jul 15 06:41:35 
CDT 2005 root@lazy:/usr/src/netbsd-2/sys/arch/i386/compile/LAZY i386
Architecture: i386
Machine: i386
>Description:
        please update mutt-devel to 1.5.11 and add this IDN option?
>How-To-Repeat:
        
>Fix:
        

first remove patches/patch-ae - then apply these 4 patches.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile    6 Sep 2005 07:26:35 -0000       1.37
+++ Makefile    3 Oct 2005 03:51:16 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.37 2005/09/06 07:26:35 jlam Exp $
 
-DISTNAME=              mutt-1.5.10i
-PKGNAME=               ${DISTNAME:C/i$//}
+DISTNAME=              mutt-1.5.11
 CATEGORIES=            mail
 MUTT_SITES=            ftp://ftp.mutt.org/mutt/ \
                        
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -17,7 +16,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/${DISTNAME:C/i$$//}
 BUILD_USES_MSGFMT=     yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            perl:run
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/distinfo,v
retrieving revision 1.26
diff -u -r1.26 distinfo
--- distinfo    3 Sep 2005 16:57:07 -0000       1.26
+++ distinfo    3 Oct 2005 03:51:47 -0000
@@ -1,14 +1,13 @@
 $NetBSD: distinfo,v 1.26 2005/09/03 16:57:07 tonio Exp $
 
-SHA1 (mutt-1.5.10i.tar.gz) = 3f9cbd330b1458a5c317fd29331f425aa36e0877
-RMD160 (mutt-1.5.10i.tar.gz) = e6855dd72e41b5e451b17bac9934bea8ca0c5db7
-Size (mutt-1.5.10i.tar.gz) = 3156345 bytes
+SHA1 (mutt-1.5.11.tar.gz) = cc5823016fe7de6ee3a131b19a3f78796f9f53d5
+RMD160 (mutt-1.5.11.tar.gz) = 812bfa6b1c9bfb1650341f7522298699c7b214a5
+Size (mutt-1.5.11.tar.gz) = 3187375 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = deab9098ad64ab77b29233a3bf3df1439f36989a
 SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = c427d4ef5129018f26e5a4b3ee2fa5bfb59af3b9
-SHA1 (patch-ae) = b3d88646e7c350f00a551d1127e517b0dd19c5c1
-SHA1 (patch-ag) = 134cd5f16d0be9c4f15eb13e8908079794dfe7f6
+SHA1 (patch-ag) = 0a446a066cca8c726ad42098016a3d0d1661f57b
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
 SHA1 (patch-ai) = 7d9883198a22615fb1792a41fce3ee9821f48f08
 SHA1 (patch-al) = 9a2c61fae88c6c42534490ee19498677a355c276
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/options.mk,v
retrieving revision 1.8
diff -u -r1.8 options.mk
--- options.mk  3 Sep 2005 03:21:23 -0000       1.8
+++ options.mk  3 Oct 2005 03:52:59 -0000
@@ -3,8 +3,8 @@
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mutt
-PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl mutt-hcache
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl mutt-hcache idn
+PKG_SUGGESTED_OPTIONS= ssl idn
 
 .include "../../mk/bsd.options.mk"
 
@@ -58,3 +58,13 @@
 .else
 CONFIGURE_ARGS+=       --disable-hcache
 .endif
+
+###
+### Internationalized Domain Names
+###
+.if !empty(PKG_OPTIONS:Midn)
+.  include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-idn=${BUILDLINK_PREFIX.libidn}
+.else
+CONFIGURE_ARGS+=       --disable-idn
+.endif
Index: patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/mail/mutt-devel/patches/patch-ag,v
retrieving revision 1.4
diff -u -r1.4 patch-ag
--- patch-ag    3 Sep 2005 16:57:07 -0000       1.4
+++ patch-ag    3 Oct 2005 03:52:16 -0000
@@ -13,12 +13,3 @@
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
        for f in $(topsrcdir_DOCFILES) ; do \
                $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-@@ -170,7 +170,7 @@
-       -e 's,@docdir\@,$(docdir),g'
- 
- mutt.1: $(srcdir)/mutt.man
--      $(EDIT) $< > $@
-+      $(EDIT) $(srcdir)/mutt.man > $@
- 
- muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h 
muttrc.man.head muttrc.man.tail
-       $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m |       \

>Unformatted: