mutt: bump to version 1.5.21

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/mutt/mutt-1.5.17+20080114-nodoc.patch b/package/mutt/mutt-1.5.17+20080114-nodoc.patch
deleted file mode 100644 (file)
index 6fd556d..0000000
--- a/package/mutt/mutt-1.5.17+20080114-nodoc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Disable the documentation build
-
-The documentation tool is compiled for the target, but executed on the
-host. We don't bother fixing this, as we don't care of the
-documentation in Buildroot.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: mutt-1.5.17+20080114/Makefile.am
-===================================================================
---- mutt-1.5.17+20080114.orig/Makefile.am      2010-05-15 18:15:08.000000000 +0200
-+++ mutt-1.5.17+20080114/Makefile.am   2010-05-15 18:15:17.000000000 +0200
-@@ -9,7 +9,7 @@
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
- 
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
- 
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 

diff --git a/package/mutt/mutt-1.5.21-nodoc.patch b/package/mutt/mutt-1.5.21-nodoc.patch
new file mode 100644 (file)
index 0000000..6fd556d
--- /dev/null
+++ b/package/mutt/mutt-1.5.21-nodoc.patch
@@ -0,0 +1,21 @@
+Disable the documentation build
+
+The documentation tool is compiled for the target, but executed on the
+host. We don't bother fixing this, as we don't care of the
+documentation in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: mutt-1.5.17+20080114/Makefile.am
+===================================================================
+--- mutt-1.5.17+20080114.orig/Makefile.am      2010-05-15 18:15:08.000000000 +0200
++++ mutt-1.5.17+20080114/Makefile.am   2010-05-15 18:15:17.000000000 +0200
+@@ -9,7 +9,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 

diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index 4b75cc84bacc71a39276e91e4c1be47e97d3fdac..4c8e3991ee008527d069809ddccec7c1001d7c90 100644 (file)
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -3,23 +3,11 @@
 # mutt
 #
 #############################################################
-MUTT_VERSION:=1.5.17+20080114
-MUTT_SOURCE:=mutt_$(MUTT_VERSION).orig.tar.gz
-MUTT_PATCH:=mutt_$(MUTT_VERSION)-1.diff.gz
-MUTT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mutt/
-MUTT_DEPENDENCIES=ncurses
-MUTT_CONF_OPT = \
-               --disable-smtp \
-               --disable-iconv \
-               --without-wc-funcs
-MUTT_AUTORECONF=YES
 
-define MUTT_APPLY_DEBIAN_PATCHES
-        if [ -d $(@D)/debian/patches ]; then \
-                support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
-        fi
-endef
-
-MUTT_POST_PATCH_HOOKS += MUTT_APPLY_DEBIAN_PATCHES
+MUTT_VERSION = 1.5.21
+MUTT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mutt
+MUTT_DEPENDENCIES = ncurses
+MUTT_CONF_OPT = --disable-iconv --disable-smtp
+MUTT_AUTORECONF = YES
 
 $(eval $(call AUTOTARGETS))