I just noticed when rereading that diff that the checksums for
patch-1.6.0.rr.compressed.gz were still in there. Take them out.
Cheers,
Andreas
On Thu, Aug 25, 2016 at 01:02:05PM +0200, Andreas Kusalananda Kähäri wrote:
> Hi,
>
> When mutt was updated to 1.7.0, the compressed-mbox flavor stopped
> working (failed at patching stage). I noticed just now that the
> compressed-mbox patch was updated to fit mutt 1.7.0, and as far as I can
> see it works as advertised.
>
> Here's a patch to fix the compressed-mbox flavor of mutt:
>
>
> Index: Makefile
> ===================================================================
> RCS file: /Users/kk/NetBSD-CVS/pkgsrc/mail/mutt/Makefile,v
> retrieving revision 1.182
> diff -u -r1.182 Makefile
> --- Makefile 21 Aug 2016 11:39:31 -0000 1.182
> +++ Makefile 25 Aug 2016 10:55:26 -0000
> @@ -4,6 +4,8 @@
> CATEGORIES= mail
> MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/
>
> +PKGREVISION= 1
> +
> MAINTAINER= tonio%NetBSD.org@localhost
> HOMEPAGE= http://www.mutt.org/
> COMMENT= Text-based MIME mail client with PGP & S/MIME support
> Index: distinfo
> ===================================================================
> RCS file: /Users/kk/NetBSD-CVS/pkgsrc/mail/mutt/distinfo,v
> retrieving revision 1.48
> diff -u -r1.48 distinfo
> --- distinfo 21 Aug 2016 16:59:21 -0000 1.48
> +++ distinfo 25 Aug 2016 10:55:41 -0000
> @@ -4,6 +4,10 @@
> 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.7.0.rr.compressed.gz) = ae60fc19e6f37eae30300b76a5326cb4d9b5d3fc
> +RMD160 (patch-1.7.0.rr.compressed.gz) = 0c862a434e0fc9069dc89f9c80fe2c2ba9bec570
> +SHA512 (patch-1.7.0.rr.compressed.gz) = 33e4cff4a60c6fa63542891a130b6dd11b22a6ab3b98ca8f09d2677c1287a054801c721a20a6139fa4f69e400548e9d5da61073e67aea93ae5cde6d0675e0394
> +Size (patch-1.7.0.rr.compressed.gz) = 9992 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: options.mk
> ===================================================================
> RCS file: /Users/kk/NetBSD-CVS/pkgsrc/mail/mutt/options.mk,v
> retrieving revision 1.23
> diff -u -r1.23 options.mk
> --- options.mk 21 Aug 2016 16:59:21 -0000 1.23
> +++ options.mk 25 Aug 2016 10:55:06 -0000
> @@ -120,11 +120,8 @@
> .if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) \
> || make(distinfo) || make(mps) || make(makepatchsum)
> PLIST.compressed_mbox= yes
> -#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_SITES+= http://mutt.org.ua/download/${PKGNAME_NOREV}/
> +PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.gz
> PATCH_DIST_STRIP= -p1
> CONFIGURE_ARGS+= --enable-compressed
> SUBST_CLASSES+= compress
Attachment:
signature.asc
Description: PGP signature