[pkgsrc/trunk]: pkgsrc/mail/mutt Enable compressed mbox using the 1.6.0 patch

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed6075c8bec2
branches:  trunk
changeset: 347891:ed6075c8bec2
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Wed Jun 01 21:56:12 2016 +0000

description:
Enable compressed mbox using the 1.6.0 patch
Make sure docbook-xsl is present to build documentation

Patch kindly suggested by Andreas Kusalananda Kahari

diffstat:

 mail/mutt/Makefile   |   3 ++-
 mail/mutt/distinfo   |   6 +++++-
 mail/mutt/options.mk |  12 ++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r db64fc8cef66 -r ed6075c8bec2 mail/mutt/Makefile
--- a/mail/mutt/Makefile        Wed Jun 01 21:46:42 2016 +0000
+++ b/mail/mutt/Makefile        Wed Jun 01 21:56:12 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.178 2016/05/02 09:03:13 tron Exp $
+# $NetBSD: Makefile,v 1.179 2016/06/01 21:56:12 tonio Exp $
 
 DISTNAME=              mutt-1.6.1
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          ftp://ftp.mutt.org/pub/mutt/
 
diff -r db64fc8cef66 -r ed6075c8bec2 mail/mutt/distinfo
--- a/mail/mutt/distinfo        Wed Jun 01 21:46:42 2016 +0000
+++ b/mail/mutt/distinfo        Wed Jun 01 21:56:12 2016 +0000
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.43 2016/05/02 09:03:13 tron Exp $
+$NetBSD: distinfo,v 1.44 2016/06/01 21:56:12 tonio Exp $
 
 SHA1 (mutt-1.6.1.tar.gz) = ff1c76209a5c299018fc72b9e2e1ab98bf5138dd
 RMD160 (mutt-1.6.1.tar.gz) = 2d9133d233c98b75891a488778c0d498c4827f36
 SHA512 (mutt-1.6.1.tar.gz) = a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5
 Size (mutt-1.6.1.tar.gz) = 3956840 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
+Size (patch-1.6.0.rr.compressed.gz) = 9977 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
diff -r db64fc8cef66 -r ed6075c8bec2 mail/mutt/options.mk
--- a/mail/mutt/options.mk      Wed Jun 01 21:46:42 2016 +0000
+++ b/mail/mutt/options.mk      Wed Jun 01 21:56:12 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2016/02/25 15:00:51 jperkin Exp $
+# $NetBSD: options.mk,v 1.21 2016/06/01 21:56:12 tonio Exp $
 
 # Global and legacy options
 
@@ -10,9 +10,9 @@
 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
 # un-comment out the following lines whenever updating distinfo
 # and patches are up-to-date
-#PKG_SUGGESTED_OPTIONS+=       mutt-compressed-mbox
 #PKG_SUGGESTED_OPTIONS+=       mutt-sidebar
 
 .include "../../mk/bsd.options.mk"
@@ -122,8 +122,11 @@
 PLIST_VARS+=           compressed_mbox
 .if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
 PLIST.compressed_mbox= yes
-PATCH_SITES+=          http://mutt.org.ua/download/${PKGNAME_NOREV}/
-PATCHFILES+=           patch-${PKGVERSION_NOREV}.rr.compressed.gz
+#PATCH_SITES+=         http://mutt.org.ua/download/${PKGNAME_NOREV}/
+#PATCHFILES+=          patch-${PKGVERSION_NOREV}.rr.compressed.gz
+# use the 1.6.0 patch, as suggested by Andreas Kusalananda Kahari
+PATCH_SITES+=          http://mutt.org.ua/download/mutt-1.6.0/
+PATCHFILES+=           patch-1.6.0.rr.compressed.gz
 PATCH_DIST_STRIP=      -p1
 CONFIGURE_ARGS+=       --enable-compressed
 SUBST_CLASSES+=                compress
@@ -135,6 +138,7 @@
 SUBST_SED.compress+=   -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
 # add xsltproc to be able to regenerate the documentation
 BUILD_DEPENDS+=                libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 .endif
 
 ###