Wed Jun 1 21:56:12 2016 UTC ()
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


(tonio)
diff -r1.178 -r1.179 pkgsrc/mail/mutt/Makefile
diff -r1.43 -r1.44 pkgsrc/mail/mutt/distinfo
diff -r1.20 -r1.21 pkgsrc/mail/mutt/options.mk
cvs diff -r1.178 -r1.179 pkgsrc/mail/mutt/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mutt/Makefile 2016/05/02 09:03:13 1.178
+++ pkgsrc/mail/mutt/Makefile 2016/06/01 21:56:12 1.179
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1# $NetBSD: Makefile,v 1.178 2016/05/02 09:03:13 tron Exp $ 1# $NetBSD: Makefile,v 1.179 2016/06/01 21:56:12 tonio Exp $
2 2
3DISTNAME= mutt-1.6.1 3DISTNAME= mutt-1.6.1
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ 6MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/
6 7
7MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
8HOMEPAGE= http://www.mutt.org/ 9HOMEPAGE= http://www.mutt.org/
9COMMENT= Text-based MIME mail client with PGP & S/MIME support 10COMMENT= Text-based MIME mail client with PGP & S/MIME support
10LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer 11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
11 12
12.include "Makefile.common" 13.include "Makefile.common"
13 14
14.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.43 -r1.44 pkgsrc/mail/mutt/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt/distinfo 2016/05/02 09:03:13 1.43
+++ pkgsrc/mail/mutt/distinfo 2016/06/01 21:56:12 1.44
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1$NetBSD: distinfo,v 1.43 2016/05/02 09:03:13 tron Exp $ 1$NetBSD: distinfo,v 1.44 2016/06/01 21:56:12 tonio Exp $
2 2
3SHA1 (mutt-1.6.1.tar.gz) = ff1c76209a5c299018fc72b9e2e1ab98bf5138dd 3SHA1 (mutt-1.6.1.tar.gz) = ff1c76209a5c299018fc72b9e2e1ab98bf5138dd
4RMD160 (mutt-1.6.1.tar.gz) = 2d9133d233c98b75891a488778c0d498c4827f36 4RMD160 (mutt-1.6.1.tar.gz) = 2d9133d233c98b75891a488778c0d498c4827f36
5SHA512 (mutt-1.6.1.tar.gz) = a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 5SHA512 (mutt-1.6.1.tar.gz) = a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5
6Size (mutt-1.6.1.tar.gz) = 3956840 bytes 6Size (mutt-1.6.1.tar.gz) = 3956840 bytes
 7SHA1 (patch-1.6.0.rr.compressed.gz) = 9a672673dd0bd4a2c1624627a8be3c558af2a5d8
 8RMD160 (patch-1.6.0.rr.compressed.gz) = f648b17a84b48c3e8529f45df48ff8bce908dc08
 9SHA512 (patch-1.6.0.rr.compressed.gz) = 2b37b84cb930bcc3809910c400298e798d293d7c351b58b59b44d76f48263af1c068a282c6a3baa7de8f42a23c0a86a4dabb11919be892356eff5bf303b199d9
 10Size (patch-1.6.0.rr.compressed.gz) = 9977 bytes
7SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 11SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
8SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681 12SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
9SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 13SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
10SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344 14SHA1 (patch-ad) = 6db5792162a0752ee533f5cd4cb3896e0ca92344
11SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6 15SHA1 (patch-ae) = 6534848a4c27d4a3830edd8d4e19d1181fe396d6
12SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61 16SHA1 (patch-af) = e924223be1a5f894d41d430bc5741cae1e4cfe61
13SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12 17SHA1 (patch-ag) = b7902d2412538f15bc25b123ca742c03a3dd3a12
14SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed 18SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
15SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3 19SHA1 (patch-al) = 49542905cde263b8d4c79f71cce3759024c804a3
16SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f 20SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
17SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1 21SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
18SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5 22SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
19SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 23SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
cvs diff -r1.20 -r1.21 pkgsrc/mail/mutt/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt/options.mk 2016/02/25 15:00:51 1.20
+++ pkgsrc/mail/mutt/options.mk 2016/06/01 21:56:12 1.21
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: options.mk,v 1.20 2016/02/25 15:00:51 jperkin Exp $ 1# $NetBSD: options.mk,v 1.21 2016/06/01 21:56:12 tonio Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt 5PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
6PKG_OPTIONS_REQUIRED_GROUPS= display 6PKG_OPTIONS_REQUIRED_GROUPS= display
7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses 7PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses
8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl 8PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp 9PKG_SUPPORTED_OPTIONS+= mutt-hcache tokyocabinet mutt-smtp
10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox 10PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox
11PKG_SUPPORTED_OPTIONS+= mutt-sidebar 11PKG_SUPPORTED_OPTIONS+= mutt-sidebar
12PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl 12PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl
 13PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox
13# un-comment out the following lines whenever updating distinfo 14# un-comment out the following lines whenever updating distinfo
14# and patches are up-to-date 15# and patches are up-to-date
15#PKG_SUGGESTED_OPTIONS+= mutt-compressed-mbox 
16#PKG_SUGGESTED_OPTIONS+= mutt-sidebar 16#PKG_SUGGESTED_OPTIONS+= mutt-sidebar
17 17
18.include "../../mk/bsd.options.mk" 18.include "../../mk/bsd.options.mk"
19 19
20### 20###
21### Slang 21### Slang
22### 22###
23.if !empty(PKG_OPTIONS:Mslang) 23.if !empty(PKG_OPTIONS:Mslang)
24. include "../../devel/libslang/buildlink3.mk" 24. include "../../devel/libslang/buildlink3.mk"
25CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 25CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
26.endif 26.endif
27 27
28### 28###
@@ -112,39 +112,43 @@ CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBA @@ -112,39 +112,43 @@ CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBA
112CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib 112CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib
113CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 113CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
114. endif 114. endif
115.else 115.else
116CONFIGURE_ARGS+= --disable-hcache 116CONFIGURE_ARGS+= --disable-hcache
117.endif 117.endif
118 118
119### 119###
120### Compressed mail boxes 120### Compressed mail boxes
121### 121###
122PLIST_VARS+= compressed_mbox 122PLIST_VARS+= compressed_mbox
123.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) 123.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
124PLIST.compressed_mbox= yes 124PLIST.compressed_mbox= yes
125PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/ 125#PATCH_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/
126PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz 126#PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz
 127# use the 1.6.0 patch, as suggested by Andreas Kusalananda Kahari
 128PATCH_SITES+= http://mutt.org.ua/download/mutt-1.6.0/
 129PATCHFILES+= patch-1.6.0.rr.compressed.gz
127PATCH_DIST_STRIP= -p1 130PATCH_DIST_STRIP= -p1
128CONFIGURE_ARGS+= --enable-compressed 131CONFIGURE_ARGS+= --enable-compressed
129SUBST_CLASSES+= compress 132SUBST_CLASSES+= compress
130SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress 133SUBST_MESSAGE.compress= Patch Makefile.in to avoid autoreconf for compress
131SUBST_STAGE.compress= post-patch 134SUBST_STAGE.compress= post-patch
132SUBST_FILES.compress= Makefile.in 135SUBST_FILES.compress= Makefile.in
133SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,' 136SUBST_SED.compress= -e 's,^mutt_SOURCES = ,mutt_SOURCES = compress.c ,'
134SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,' 137SUBST_SED.compress+= -e 's,^EXTRA_DIST = ,EXTRA_DIST = compress.h ,'
135SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,' 138SUBST_SED.compress+= -e 's,^mutt_OBJECTS = ,mutt_OBJECTS = compress.o ,'
136# add xsltproc to be able to regenerate the documentation 139# add xsltproc to be able to regenerate the documentation
137BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 140BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 141BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
138.endif 142.endif
139 143
140### 144###
141### Internal SMTP relay support 145### Internal SMTP relay support
142### 146###
143.if !empty(PKG_OPTIONS:Mmutt-smtp) 147.if !empty(PKG_OPTIONS:Mmutt-smtp)
144CONFIGURE_ARGS+= --enable-smtp 148CONFIGURE_ARGS+= --enable-smtp
145.else 149.else
146CONFIGURE_ARGS+= --disable-smtp 150CONFIGURE_ARGS+= --disable-smtp
147.endif 151.endif
148 152
149### 153###
150### Sidebar support 154### Sidebar support