Browse Source

mutt: update to 1.8.0, drop patch

Waldemar Brodkorb 8 years ago
parent
commit
6fa5d0f1f8
2 changed files with 4 additions and 23 deletions
  1. 4 3
      package/mutt/Makefile
  2. 0 20
      package/mutt/patches/patch-Makefile_in

+ 4 - 3
package/mutt/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		mutt
-PKG_VERSION:=		1.7.2
+PKG_VERSION:=		1.8.0
 PKG_RELEASE:=		1
-PKG_HASH:=		1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9
+PKG_HASH:=		45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab
 PKG_DESCR:=		mail client for console
 PKG_SECTION:=		net/mail
 PKG_DEPENDS:=		libncurses
@@ -30,7 +30,8 @@ TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--with-homespool="~/Maildir" \
 			--with-curses="$(STAGING_TARGET_DIR)/usr" \
 			--enable-pop \
-			--enable-imap
+			--enable-imap \
+			--disable-doc
 
 ifeq ($(ADK_PACKAGE_MUTT_WITHOUT_SSL),y)
 CONFIGURE_ARGS+=	--without-ssl

+ 0 - 20
package/mutt/patches/patch-Makefile_in

@@ -1,20 +0,0 @@
---- mutt-1.6.1.orig/Makefile.in	2016-04-30 23:18:36.000000000 +0200
-+++ mutt-1.6.1/Makefile.in	2016-05-05 18:58:58.115870242 +0200
-@@ -267,7 +267,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = m4 po intl doc contrib imap
-+DIST_SUBDIRS = m4 po intl contrib imap
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(srcdir)/hcachever.sh.in $(srcdir)/muttbug.sh.in \
- 	$(top_srcdir)/flymake.am $(top_srcdir)/intl/Makefile.in \
-@@ -470,7 +470,7 @@ get_cs_cmdline = $(call get_cs_compile,$
- 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 po intl contrib $(IMAP_SUBDIR)
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
- @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)