mutt: update to 1.5.21 * explicitly disable IDN * use PKG_INSTALL * refresh patches

SVN-Revision: 24815

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 20dc3ea576dd49f7edd0553568f1d7fca37a0ec8..28df6714d227d1e9b8456db815406a4b61398c35 100644 (file)
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mutt
-PKG_VERSION:=1.5.20
+PKG_VERSION:=1.5.21
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@SF/mutt
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=027cdd9959203de0c3c64149a7ee351c
+PKG_MD5SUM:=a29db8f1d51e2f10c070bf88e8a553fd
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,11 +37,12 @@ CONFIGURE_ARGS += \
        --oldincludedir=$(PKG_BUILD_DIR)/. \
        --enable-pop \
        --enable-imap \
-       --with-ssl
+       --with-ssl \
+       --without-idn
 
 define Package/mutt/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mutt $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutt $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,mutt))

diff --git a/mail/mutt/patches/001-no_po_and_docs.patch b/mail/mutt/patches/001-no_po_and_docs.patch
index 9953c10a96082f1154c2d3464b6d22fa82988ece..a64599323425fd5ba31c8054061ebe5e744c5528 100644 (file)
--- a/mail/mutt/patches/001-no_po_and_docs.patch
+++ b/mail/mutt/patches/001-no_po_and_docs.patch
@@ -1,11 +1,11 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -340,7 +340,7 @@ top_srcdir = @top_srcdir@
+@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.6 foreign
  @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
  @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
 -SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
 +SUBDIRS = m4 intl contrib $(IMAP_SUBDIR)
  bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
- mutt_SOURCES = \
+ @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h $(HCVERSION)