CVS commit: pkgsrc/mail/mutt

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug 21 16:59:21 UTC 2016

Modified Files:
        pkgsrc/mail/mutt: distinfo options.mk

Log Message:
the sidebar patch was merged in 1.7.0 according to changelog, so
we can remove that


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/mutt/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/mutt/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.47 pkgsrc/mail/mutt/distinfo:1.48
--- pkgsrc/mail/mutt/distinfo:1.47      Sun Aug 21 16:46:17 2016
+++ pkgsrc/mail/mutt/distinfo   Sun Aug 21 16:59:21 2016
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.47 2016/08/21 16:46:17 tnn Exp $
+$NetBSD: distinfo,v 1.48 2016/08/21 16:59:21 tnn Exp $
 
 SHA1 (mutt-1.7.0.tar.gz) = 0d9c0ae7d4725e2216ea0c1271ae19ab8bcf653b
 RMD160 (mutt-1.7.0.tar.gz) = f508f0332d2dfcaa398c3b68889ac619781b1651
 SHA512 (mutt-1.7.0.tar.gz) = 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612
 Size (mutt-1.7.0.tar.gz) = 4019567 bytes
-SHA1 (patch-1.5.23.sidebar.20140412.txt) = 8b86f148d8e1a0b37b0b77268349f4c94e797561
-RMD160 (patch-1.5.23.sidebar.20140412.txt) = 55b691a9d959040d2844644c165b10377a53744d
-SHA512 (patch-1.5.23.sidebar.20140412.txt) = ac023f1ba5843a010de497b9cd85b22af6a30ceb8622c01be3c5b7e8e0761d8efe8e86e8c9b11aa96dcc405e8b1657672ec6da111b703d562bddf35ba848d34d
-Size (patch-1.5.23.sidebar.20140412.txt) = 66728 bytes
 SHA1 (patch-1.6.0.rr.compressed.gz) = 9a672673dd0bd4a2c1624627a8be3c558af2a5d8
 RMD160 (patch-1.6.0.rr.compressed.gz) = f648b17a84b48c3e8529f45df48ff8bce908dc08
 SHA512 (patch-1.6.0.rr.compressed.gz) = 2b37b84cb930bcc3809910c400298e798d293d7c351b58b59b44d76f48263af1c068a282c6a3baa7de8f42a23c0a86a4dabb11919be892356eff5bf303b199d9

Index: pkgsrc/mail/mutt/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.22 pkgsrc/mail/mutt/options.mk:1.23
--- pkgsrc/mail/mutt/options.mk:1.22    Sun Aug 21 16:46:17 2016
+++ pkgsrc/mail/mutt/options.mk Sun Aug 21 16:59:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2016/08/21 16:46:17 tnn Exp $
+# $NetBSD: options.mk,v 1.23 2016/08/21 16:59:21 tnn Exp $
 
 # Global and legacy options
 
@@ -8,9 +8,9 @@ PKG_OPTIONS_GROUP.display=      slang ncurses
 PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
 PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
 PKG_SUPPORTED_OPTIONS+=        mutt-compressed-mbox
-PKG_SUPPORTED_OPTIONS+=        mutt-sidebar
 PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl
-PKG_SUGGESTED_OPTIONS+=        mutt-compressed-mbox
+# patch does not apply
+#PKG_SUGGESTED_OPTIONS+=       mutt-compressed-mbox
 
 .include "../../mk/bsd.options.mk"
 
@@ -149,18 +149,6 @@ CONFIGURE_ARGS+=   --disable-smtp
 .endif
 
 ###
-### Sidebar support
-###
-.if !empty(PKG_OPTIONS:Mmutt-sidebar)  \
-       || make(distinfo) || make(mps) || make(makepatchsum)
-# http://www.lunar-linux.org/mutt-sidebar/
-PATCH_SITES+=          http://lunar-linux.org/~tchan/mutt/
-PATCHFILES+=           patch-1.5.23.sidebar.20140412.txt
-PATCH_DIST_STRIP=      -p1
-PATCH_FUZZ_FACTOR=     -F1
-.endif
-
-###
 ### Internationalized Domain Names
 ###
 .if !empty(PKG_OPTIONS:Midn)