From 19ceab46ecc006628ef47ecbd0e5dce25b53ded8 Mon Sep 17 00:00:00 2001 From: tonio Date: Sun, 18 May 2008 08:26:30 +0000 Subject: Update mail/mutt-devel to 1.5.18 From the announce: "Mutt 1.5.18 contains 6 months of bug fixes, documentation improvements and performance enhancements since the release of 1.5.17, but I believe only one new feature ($time_inc, for controlling the rate at which status updates are displayed)." --- mail/mutt-devel/Makefile | 9 ++++----- mail/mutt-devel/distinfo | 22 +++++++++------------- mail/mutt-devel/options.mk | 12 ++++++------ mail/mutt-devel/patches/patch-ab | 14 +++++++------- mail/mutt-devel/patches/patch-ac | 13 ------------- mail/mutt-devel/patches/patch-ag | 14 +++++++------- mail/mutt-devel/patches/patch-am | 4 +++- mail/mutt-devel/patches/patch-an | 4 +++- mail/mutt-devel/patches/patch-ao | 4 +++- 9 files changed, 42 insertions(+), 54 deletions(-) delete mode 100644 mail/mutt-devel/patches/patch-ac (limited to 'mail/mutt-devel') diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 914be853834..5ebd73cabd4 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2008/04/12 22:43:03 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2008/05/18 08:26:30 tonio Exp $ -DISTNAME= mutt-1.5.17 -PKGREVISION= 5 +DISTNAME= mutt-1.5.18 CATEGORIES= mail MUTT_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \ @@ -35,7 +34,7 @@ MAKE_ENV+= CHGRP=${CHGRP:Q} CHMOD=${CHMOD:Q} # support mailwrapper. CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail .endif - + .if (${OPSYS} == "SunOS") CONFIGURE_ARGS+= --without-wc-funcs .endif @@ -55,7 +54,7 @@ DOCDIR= ${PREFIX}/share/doc/mutt EGDIR= ${PREFIX}/share/examples/mutt CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types -FILES_SUBST+= DOCDIR=${DOCDIR:Q} +FILES_SUBST+= DOCDIR=${DOCDIR} INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} # Define WRKSRC explicitly so we can use its value below. diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index ff010517933..c76fc7caa5b 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -1,20 +1,16 @@ -$NetBSD: distinfo,v 1.47 2008/04/26 11:11:15 tonio Exp $ +$NetBSD: distinfo,v 1.48 2008/05/18 08:26:30 tonio Exp $ -SHA1 (mutt-1.5.17.tar.gz) = 6b51745fc4baf463adde53e91efb2a6c7eec8492 -RMD160 (mutt-1.5.17.tar.gz) = e5c84a27ad25730afe64879e91bed89a021e0580 -Size (mutt-1.5.17.tar.gz) = 3572651 bytes +SHA1 (mutt-1.5.18.tar.gz) = a835a1933297494f2c6c68b9a334cc1d71a95e5a +RMD160 (mutt-1.5.18.tar.gz) = 1c8595f66eb9aa94c01a6020be20a75c0c8d2d14 +Size (mutt-1.5.18.tar.gz) = 3602632 bytes SHA1 (patch-1.5.14.dgc.xlabel_ext.9) = a5e3a6542d16c3a4fbd833986655bdc5c7896e5e RMD160 (patch-1.5.14.dgc.xlabel_ext.9) = 137d89ca5d9001efb8bea79ea523487b22145384 Size (patch-1.5.14.dgc.xlabel_ext.9) = 12881 bytes -SHA1 (patch-1.5.17.rr.compressed.1.gz) = 1f28b1a270871332a0c4dbaf11dd7132431b98db -RMD160 (patch-1.5.17.rr.compressed.1.gz) = 39e244d2bf9e6db5f9c9d88f2b64d8aa7ea6b87b -Size (patch-1.5.17.rr.compressed.1.gz) = 10589 bytes SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 -SHA1 (patch-ab) = 4f9e8cbcec719263998d61fcc9a707548d804477 -SHA1 (patch-ac) = 48cae7543eeb3980dfdea8573ea2ec2192aca091 +SHA1 (patch-ab) = afc1b743c9299d0aa817dff3a0e580bbb3b9302a SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc -SHA1 (patch-ag) = b8daf23256cd2cfd8c60cae646eb36ec1656823f +SHA1 (patch-ag) = b27327f0da19f8f3aad8d11505d7e6eabe9febd8 SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d -SHA1 (patch-am) = f1461cc64cb06e674390db0f594fd69a6b56f391 -SHA1 (patch-an) = 3599eb33ea2ffd0120e479ca200519f0f8d10811 -SHA1 (patch-ao) = 425318a712a11ae9a715fd8a6a153bf4d5a9f3d1 +SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f +SHA1 (patch-an) = dcd89d76cab32bed582a3f9c40e979508fdffa06 +SHA1 (patch-ao) = edf836ff0f55caecb47c4662d228b498af4d7a18 diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index c5338192131..fa591119b36 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.30 2008/04/26 11:11:15 tonio Exp $ +# $NetBSD: options.mk,v 1.31 2008/05/18 08:26:30 tonio Exp $ # Global and legacy options @@ -6,7 +6,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.mutt PKG_OPTIONS_REQUIRED_GROUPS= display PKG_OPTIONS_GROUP.display= slang ncurses ncursesw curses PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl -PKG_SUPPORTED_OPTIONS+= mutt-compressed-mbox mutt-hcache mutt-smtp mutt-xlabel +PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-smtp mutt-xlabel PKG_SUGGESTED_OPTIONS= ssl smime curses .include "../../mk/bsd.options.mk" @@ -101,10 +101,10 @@ CONFIGURE_ARGS+= --disable-hcache ### Compressed mail boxes ### .if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) -PATCH_SITES= http://www.spinnaker.de/mutt/compressed/ -PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz -PATCH_DIST_STRIP= -p1 -CONFIGURE_ARGS+= --enable-compressed +PATCH_SITES= http://www.spinnaker.de/mutt/compressed/ +PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz +PATCH_DIST_STRIP= -p1 +CONFIGURE_ARGS+= --enable-compressed .endif ### diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab index 1f95a8635bb..5235ecff03e 100644 --- a/mail/mutt-devel/patches/patch-ab +++ b/mail/mutt-devel/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.10 2007/03/04 17:22:46 tonio Exp $ +$NetBSD: patch-ab,v 1.11 2008/05/18 08:26:31 tonio Exp $ ---- Makefile.in.orig 2007-03-04 13:33:38.000000000 +0100 +--- Makefile.in.orig Sat May 17 20:04:33 2008 +++ Makefile.in -@@ -170,7 +170,7 @@ DEBUGGER = @DEBUGGER@ - # @rm -rf makedoc - # $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc +@@ -161,7 +161,7 @@ DATADIRNAME = @DATADIRNAME@ + DBX = @DBX@ + DEBUGGER = @DEBUGGER@ DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \ + -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \ -DHAVE_CONFIG_H=1 DEPDIR = @DEPDIR@ -@@ -279,7 +279,7 @@ infodir = @infodir@ +@@ -271,7 +271,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.10 2007/03/04 17:22:46 tonio Exp $ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ -@@ -1035,8 +1035,8 @@ install-exec-hook: +@@ -1021,8 +1021,8 @@ install-exec-hook: ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ fi if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac deleted file mode 100644 index b91a8b930cd..00000000000 --- a/mail/mutt-devel/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2007/12/03 16:47:25 wiz Exp $ - ---- smime_keys.pl.orig 2007-03-02 19:44:44.000000000 +0100 -+++ smime_keys.pl -@@ -225,7 +225,7 @@ You must set this in your mutt config fi - EOF - #' - -- $answer =~ /\"(.*?)\"/ and return $1; -+ $answer =~ /\"(.*?)\"/ and return `echo -n $1`; - - $answer =~ /^Mutt (.*?) / and die<