Author: alexander Date: 2007-04-30 02:48:22 -0600 (Mon, 30 Apr 2007) New Revision: 1869
Removed: trunk/packages/mutt/mutt-1.5.13-reject-1.patch Modified: trunk/packages/mutt/Makefile Log: Upgraded Mutt, dropped patches: Japanese is mostly merged, NNTP is unusable with gmane (always loads all articles in a given newsgroup, thus wasting bandwidth). The nntp_context option has effect on the number of _displayed_ article headers, not _downloaded_ ones. Built-in SMTP support is not enabled because it would need Cyrus SASL for authentication, and Tin still needs msmtp anyway. Modified: trunk/packages/mutt/Makefile =================================================================== --- trunk/packages/mutt/Makefile 2007-04-29 10:20:43 UTC (rev 1868) +++ trunk/packages/mutt/Makefile 2007-04-30 08:48:22 UTC (rev 1869) @@ -1,22 +1,13 @@ # mutt Makefile NM= mutt -VRS= 1.5.13 +VRS= 1.5.15 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.gz URL-$(FILE)= http://mirrors.dotsrc.org/mutt/devel/$(FILE) -SHA-$(FILE)= 6d5b88d33e1727bf0342c31f06d55d7a3d2d4e0a +SHA-$(FILE)= 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a -PATCH1= patch-$(VRS).vvv.nntp.gz -URL-$(PATCH1)= http://mutt.org.ua/download/mutt-$(VRS)/$(PATCH1) -SHA-$(PATCH1)= ce67dcc2f59a709553b626ed93c12cf68f7e8551 - -PATCH50= patch-$(VRS).mutt-j.multi-charset.1.gz -URL-$(PATCH50)= http://www.emaillab.org/mutt/$(VRS)/$(PATCH50) -SHA-$(PATCH50)= e36884d3cb9c88870feb6d7dc598534db59704dd - -PATCH51= mutt-$(VRS)-reject-1.patch # Targets include $(ROOT)/scripts/functions @@ -25,20 +16,12 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) $(PATCH1) $(PATCH50) +stage2: Makefile $(FILE) $(std_build) compile-stage2: - zcat ../$(PATCH50) | patch -Np1 - # Unfortunately, patches conflict. - # Apply the NNTP patch and fix rejects then - ( zcat ../$(PATCH1) | patch -Np1 ) || patch -Np1 -i ../$(PATCH51) - aclocal -I m4 - autoheader - automake --foreign - autoconf ./configure --prefix=/usr --sysconfdir=/etc --enable-imap \ - --enable-pop --enable-nntp --with-ssl --enable-hcache + --enable-pop --with-ssl --enable-hcache make make install install -m600 $(ROOT)/root/.muttrc /root Deleted: trunk/packages/mutt/mutt-1.5.13-reject-1.patch =================================================================== --- trunk/packages/mutt/mutt-1.5.13-reject-1.patch 2007-04-29 10:20:43 UTC (rev 1868) +++ trunk/packages/mutt/mutt-1.5.13-reject-1.patch 2007-04-30 08:48:22 UTC (rev 1869) @@ -1,23 +0,0 @@ ---- mutt-1.5.10/init.h 2005-10-25 08:49:20.000000000 +0600 -+++ mutt-1.5.10/init.h 2005-10-25 08:51:15.000000000 +0600 -@@ -203,6 +203,20 @@ - ** If set, Mutt will prompt you for carbon-copy (Cc) recipients before - ** editing the body of an outgoing message. - */ -+#ifdef USE_NNTP -+ { "ask_follow_up", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0 }, -+ /* -+ ** .pp -+ ** If set, Mutt will prompt you for follow-up groups before editing -+ ** the body of an outgoing message. -+ */ -+ { "ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, 0 }, -+ /* -+ ** .pp -+ ** If set, Mutt will prompt you for x-comment-to field before editing -+ ** the body of an outgoing message. -+ */ -+#endif - { "assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, UL 0}, - /* - ** .pp -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
