Sun May 18 08:26:31 2008 UTC ()
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)."


(tonio)
diff -r1.67 -r1.68 pkgsrc/mail/mutt-devel/Makefile
diff -r1.47 -r1.48 pkgsrc/mail/mutt-devel/distinfo
diff -r1.30 -r1.31 pkgsrc/mail/mutt-devel/options.mk
diff -r1.10 -r1.11 pkgsrc/mail/mutt-devel/patches/patch-ab
diff -r1.6 -r0 pkgsrc/mail/mutt-devel/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/mail/mutt-devel/patches/patch-ag
diff -r1.5 -r1.6 pkgsrc/mail/mutt-devel/patches/patch-am
diff -r1.1 -r1.2 pkgsrc/mail/mutt-devel/patches/patch-an
diff -r1.1 -r1.2 pkgsrc/mail/mutt-devel/patches/patch-ao
cvs diff -r1.67 -r1.68 pkgsrc/mail/mutt-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/Makefile 2008/04/12 22:43:03 1.67
+++ pkgsrc/mail/mutt-devel/Attic/Makefile 2008/05/18 08:26:30 1.68
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.67 2008/04/12 22:43:03 jlam Exp $ 1# $NetBSD: Makefile,v 1.68 2008/05/18 08:26:30 tonio Exp $
2 2
3DISTNAME= mutt-1.5.17 3DISTNAME= mutt-1.5.18
4PKGREVISION= 5 
5CATEGORIES= mail 4CATEGORIES= mail
6MUTT_SITES= ftp://ftp.mutt.org/mutt/ \ 5MUTT_SITES= ftp://ftp.mutt.org/mutt/ \
7 ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \ 6 ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
8 ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \ 7 ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
9 ftp://ftp.fu-berlin.de/unix/mail/mutt/ 8 ftp://ftp.fu-berlin.de/unix/mail/mutt/
10MASTER_SITES= ${MUTT_SITES:=devel/} 9MASTER_SITES= ${MUTT_SITES:=devel/}
11 10
12MAINTAINER= tonio@NetBSD.org 11MAINTAINER= tonio@NetBSD.org
13HOMEPAGE= http://www.mutt.org/ 12HOMEPAGE= http://www.mutt.org/
14COMMENT= Text-based MIME mail client with PGP & S/MIME support 13COMMENT= Text-based MIME mail client with PGP & S/MIME support
15 14
16PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
@@ -25,47 +24,47 @@ GNU_CONFIGURE= yes @@ -25,47 +24,47 @@ GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
26 --with-docdir=${PREFIX}/share/doc/mutt \ 25 --with-docdir=${PREFIX}/share/doc/mutt \
27 --without-included-gettext \ 26 --without-included-gettext \
28 --enable-pop \ 27 --enable-pop \
29 --enable-imap 28 --enable-imap
30MAKE_ENV+= CHGRP=${CHGRP:Q} CHMOD=${CHMOD:Q} 29MAKE_ENV+= CHGRP=${CHGRP:Q} CHMOD=${CHMOD:Q}
31 30
32.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 31.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
33# Force sendmail to /usr/sbin to avoid postfix's 32# Force sendmail to /usr/sbin to avoid postfix's
34# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which 33# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which
35# support mailwrapper. 34# support mailwrapper.
36CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail 35CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail
37.endif 36.endif
38  37
39.if (${OPSYS} == "SunOS") 38.if (${OPSYS} == "SunOS")
40CONFIGURE_ARGS+= --without-wc-funcs 39CONFIGURE_ARGS+= --without-wc-funcs
41.endif 40.endif
42 41
43# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh 42# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
44# there. 43# there.
45# 44#
46.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*) 45.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
47CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh 46CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh
48.endif 47.endif
49 48
50.include "options.mk" 49.include "options.mk"
51 50
52LDFLAGS+= ${_STRIPFLAG_CC} 51LDFLAGS+= ${_STRIPFLAG_CC}
53 52
54DOCDIR= ${PREFIX}/share/doc/mutt 53DOCDIR= ${PREFIX}/share/doc/mutt
55EGDIR= ${PREFIX}/share/examples/mutt 54EGDIR= ${PREFIX}/share/examples/mutt
56CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc 55CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
57CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 56CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
58FILES_SUBST+= DOCDIR=${DOCDIR:Q} 57FILES_SUBST+= DOCDIR=${DOCDIR}
59INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 58INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
60 59
61# Define WRKSRC explicitly so we can use its value below. 60# Define WRKSRC explicitly so we can use its value below.
62WRKSRC= ${WRKDIR}/${DISTNAME} 61WRKSRC= ${WRKDIR}/${DISTNAME}
63PLIST_VARS+= dotlock 62PLIST_VARS+= dotlock
64.if exists(${WRKSRC}/mutt_dotlock) 63.if exists(${WRKSRC}/mutt_dotlock)
65PLIST.dotlock= yes 64PLIST.dotlock= yes
66.endif 65.endif
67INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 66INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
68 67
69.include "../../converters/libiconv/buildlink3.mk" 68.include "../../converters/libiconv/buildlink3.mk"
70.include "../../devel/gettext-lib/buildlink3.mk" 69.include "../../devel/gettext-lib/buildlink3.mk"
71 70
cvs diff -r1.47 -r1.48 pkgsrc/mail/mutt-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/distinfo 2008/04/26 11:11:15 1.47
+++ pkgsrc/mail/mutt-devel/Attic/distinfo 2008/05/18 08:26:30 1.48
@@ -1,20 +1,16 @@ @@ -1,20 +1,16 @@
1$NetBSD: distinfo,v 1.47 2008/04/26 11:11:15 tonio Exp $ 1$NetBSD: distinfo,v 1.48 2008/05/18 08:26:30 tonio Exp $
2 2
3SHA1 (mutt-1.5.17.tar.gz) = 6b51745fc4baf463adde53e91efb2a6c7eec8492 3SHA1 (mutt-1.5.18.tar.gz) = a835a1933297494f2c6c68b9a334cc1d71a95e5a
4RMD160 (mutt-1.5.17.tar.gz) = e5c84a27ad25730afe64879e91bed89a021e0580 4RMD160 (mutt-1.5.18.tar.gz) = 1c8595f66eb9aa94c01a6020be20a75c0c8d2d14
5Size (mutt-1.5.17.tar.gz) = 3572651 bytes 5Size (mutt-1.5.18.tar.gz) = 3602632 bytes
6SHA1 (patch-1.5.14.dgc.xlabel_ext.9) = a5e3a6542d16c3a4fbd833986655bdc5c7896e5e 6SHA1 (patch-1.5.14.dgc.xlabel_ext.9) = a5e3a6542d16c3a4fbd833986655bdc5c7896e5e
7RMD160 (patch-1.5.14.dgc.xlabel_ext.9) = 137d89ca5d9001efb8bea79ea523487b22145384 7RMD160 (patch-1.5.14.dgc.xlabel_ext.9) = 137d89ca5d9001efb8bea79ea523487b22145384
8Size (patch-1.5.14.dgc.xlabel_ext.9) = 12881 bytes 8Size (patch-1.5.14.dgc.xlabel_ext.9) = 12881 bytes
9SHA1 (patch-1.5.17.rr.compressed.1.gz) = 1f28b1a270871332a0c4dbaf11dd7132431b98db 
10RMD160 (patch-1.5.17.rr.compressed.1.gz) = 39e244d2bf9e6db5f9c9d88f2b64d8aa7ea6b87b 
11Size (patch-1.5.17.rr.compressed.1.gz) = 10589 bytes 
12SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 9SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
13SHA1 (patch-ab) = 4f9e8cbcec719263998d61fcc9a707548d804477 10SHA1 (patch-ab) = afc1b743c9299d0aa817dff3a0e580bbb3b9302a
14SHA1 (patch-ac) = 48cae7543eeb3980dfdea8573ea2ec2192aca091 
15SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc 11SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
16SHA1 (patch-ag) = b8daf23256cd2cfd8c60cae646eb36ec1656823f 12SHA1 (patch-ag) = b27327f0da19f8f3aad8d11505d7e6eabe9febd8
17SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d 13SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
18SHA1 (patch-am) = f1461cc64cb06e674390db0f594fd69a6b56f391 14SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
19SHA1 (patch-an) = 3599eb33ea2ffd0120e479ca200519f0f8d10811 15SHA1 (patch-an) = dcd89d76cab32bed582a3f9c40e979508fdffa06
20SHA1 (patch-ao) = 425318a712a11ae9a715fd8a6a153bf4d5a9f3d1 16SHA1 (patch-ao) = edf836ff0f55caecb47c4662d228b498af4d7a18
cvs diff -r1.30 -r1.31 pkgsrc/mail/mutt-devel/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/options.mk 2008/04/26 11:11:15 1.30
+++ pkgsrc/mail/mutt-devel/Attic/options.mk 2008/05/18 08:26:30 1.31
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.30 2008/04/26 11:11:15 tonio Exp $ 1# $NetBSD: options.mk,v 1.31 2008/05/18 08:26:30 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-compressed-mbox mutt-hcache mutt-smtp mutt-xlabel 9PKG_SUPPORTED_OPTIONS+= mutt-hcache mutt-smtp mutt-xlabel
10PKG_SUGGESTED_OPTIONS= ssl smime curses 10PKG_SUGGESTED_OPTIONS= ssl smime curses
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14### 14###
15### Slang 15### Slang
16### 16###
17.if !empty(PKG_OPTIONS:Mslang) 17.if !empty(PKG_OPTIONS:Mslang)
18. include "../../devel/libslang/buildlink3.mk" 18. include "../../devel/libslang/buildlink3.mk"
19CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang} 19CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
20.endif 20.endif
21 21
22### 22###
@@ -91,30 +91,30 @@ CONFIGURE_ARGS+= --without-gdbm @@ -91,30 +91,30 @@ CONFIGURE_ARGS+= --without-gdbm
91# since the real -I and -L flags are added by buildlink already. 91# since the real -I and -L flags are added by buildlink already.
92# 92#
93CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include 93CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include
94CONFIGURE_ENV+= BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib 94CONFIGURE_ENV+= BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib
95CONFIGURE_ENV+= BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q} 95CONFIGURE_ENV+= BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q}
96.else 96.else
97CONFIGURE_ARGS+= --disable-hcache 97CONFIGURE_ARGS+= --disable-hcache
98.endif 98.endif
99 99
100### 100###
101### Compressed mail boxes 101### Compressed mail boxes
102### 102###
103.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox) 103.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
104PATCH_SITES= http://www.spinnaker.de/mutt/compressed/ 104PATCH_SITES= http://www.spinnaker.de/mutt/compressed/
105PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz 105PATCHFILES+= patch-${PKGVERSION_NOREV}.rr.compressed.1.gz
106PATCH_DIST_STRIP= -p1 106PATCH_DIST_STRIP= -p1
107CONFIGURE_ARGS+= --enable-compressed 107CONFIGURE_ARGS+= --enable-compressed
108.endif 108.endif
109 109
110### 110###
111### Internal SMTP relay support 111### Internal SMTP relay support
112### 112###
113.if !empty(PKG_OPTIONS:Mmutt-smtp) 113.if !empty(PKG_OPTIONS:Mmutt-smtp)
114CONFIGURE_ARGS+= --enable-smtp 114CONFIGURE_ARGS+= --enable-smtp
115.else 115.else
116CONFIGURE_ARGS+= --disable-smtp 116CONFIGURE_ARGS+= --disable-smtp
117.endif 117.endif
118 118
119### 119###
120### X-Label header support 120### X-Label header support
cvs diff -r1.10 -r1.11 pkgsrc/mail/mutt-devel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/patches/Attic/patch-ab 2007/03/04 17:22:46 1.10
+++ pkgsrc/mail/mutt-devel/patches/Attic/patch-ab 2008/05/18 08:26:31 1.11
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-ab,v 1.10 2007/03/04 17:22:46 tonio Exp $ 1$NetBSD: patch-ab,v 1.11 2008/05/18 08:26:31 tonio Exp $
2 2
3--- Makefile.in.orig 2007-03-04 13:33:38.000000000 +0100 3--- Makefile.in.orig Sat May 17 20:04:33 2008
4+++ Makefile.in 4+++ Makefile.in
5@@ -170,7 +170,7 @@ DEBUGGER = @DEBUGGER@ 5@@ -161,7 +161,7 @@ DATADIRNAME = @DATADIRNAME@
6 # @rm -rf makedoc 6 DBX = @DBX@
7 # $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc 7 DEBUGGER = @DEBUGGER@
8 DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ 8 DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
9- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \ 9- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
10+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \ 10+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
11 -DHAVE_CONFIG_H=1 11 -DHAVE_CONFIG_H=1
12  12
13 DEPDIR = @DEPDIR@ 13 DEPDIR = @DEPDIR@
14@@ -279,7 +279,7 @@ infodir = @infodir@ 14@@ -271,7 +271,7 @@ infodir = @infodir@
15 install_sh = @install_sh@ 15 install_sh = @install_sh@
16 libdir = @libdir@ 16 libdir = @libdir@
17 libexecdir = @libexecdir@ 17 libexecdir = @libexecdir@
18-localedir = @localedir@ 18-localedir = @localedir@
19+localedir = $(prefix)/share/locale 19+localedir = $(prefix)/share/locale
20 localstatedir = @localstatedir@ 20 localstatedir = @localstatedir@
21 mandir = @mandir@ 21 mandir = @mandir@
22 mkdir_p = @mkdir_p@ 22 mkdir_p = @mkdir_p@
23@@ -1035,8 +1035,8 @@ install-exec-hook: 23@@ -1021,8 +1021,8 @@ install-exec-hook:
24 ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ 24 ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
25 fi 25 fi
26 if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ 26 if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
27- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ 27- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
28- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \ 28- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
29+ ${CHGRP} @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ 29+ ${CHGRP} @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
30+ ${CHMOD} @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \ 30+ ${CHMOD} @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
31 { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \ 31 { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
32 fi 32 fi
33  33
File Deleted: pkgsrc/mail/mutt-devel/patches/Attic/patch-ac
cvs diff -r1.6 -r1.7 pkgsrc/mail/mutt-devel/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/patches/Attic/patch-ag 2007/04/21 18:27:21 1.6
+++ pkgsrc/mail/mutt-devel/patches/Attic/patch-ag 2008/05/18 08:26:31 1.7
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-ag,v 1.6 2007/04/21 18:27:21 tonio Exp $ 1$NetBSD: patch-ag,v 1.7 2008/05/18 08:26:31 tonio Exp $
2 2
3--- doc/Makefile.in.orig 2007-04-06 09:17:10.000000000 +0200 3--- doc/Makefile.in.orig Sun Apr 20 05:08:50 2008
4+++ doc/Makefile.in 4+++ doc/Makefile.in
5@@ -395,7 +395,7 @@ uninstall-am: uninstall-info-am uninstal 5@@ -491,7 +491,7 @@ uninstall-am: uninstall-info-am uninstal
6 all: 
7 $(MAKE) makedoc-all 
8  6
9-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt 7 all: makedoc-all
 8
 9-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
10+makedoc-all: mutt.1 muttrc.man 10+makedoc-all: mutt.1 muttrc.man
11  11
12 install-data-local: makedoc-all instdoc 12 install-data-local: makedoc-all instdoc
13 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 13 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
14@@ -406,8 +406,8 @@ install-data-local: makedoc-all instdoc 14@@ -503,8 +503,8 @@ install-data-local: makedoc-all instdoc
15 ./instdoc $(srcdir)/dotlock.man \ 15 ./instdoc $(srcdir)/dotlock.man \
16 $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 16 $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
17 ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 17 ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
18- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5 18- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
19- ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5 19- ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
20+ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5 20+ ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
21+ ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5 21+ ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mutt-mmdf.5
22 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) 22 $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
23 for f in $(topsrcdir_DOCFILES) ; do \ 23 for f in $(topsrcdir_DOCFILES) ; do \
24 $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ 24 $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
cvs diff -r1.5 -r1.6 pkgsrc/mail/mutt-devel/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/patches/Attic/patch-am 2007/12/06 08:51:51 1.5
+++ pkgsrc/mail/mutt-devel/patches/Attic/patch-am 2008/05/18 08:26:31 1.6
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-am,v 1.5 2007/12/06 08:51:51 cjs Exp $ 1$NetBSD: patch-am,v 1.6 2008/05/18 08:26:31 tonio Exp $
 2
 3Add change_folder_next option.
2 4
3--- mutt.h.orig 2007-08-29 02:44:16.000000000 +0900 5--- mutt.h.orig 2007-08-29 02:44:16.000000000 +0900
4+++ mutt.h 2007-12-06 17:36:02.000000000 +0900 6+++ mutt.h 2007-12-06 17:36:02.000000000 +0900
5@@ -339,6 +339,7 @@ 7@@ -339,6 +339,7 @@
6 OPTBEEPNEW, 8 OPTBEEPNEW,
7 OPTBOUNCEDELIVERED, 9 OPTBOUNCEDELIVERED,
8 OPTBRAILLEFRIENDLY, 10 OPTBRAILLEFRIENDLY,
9+ OPTCHANGEFOLDERNEXT, 11+ OPTCHANGEFOLDERNEXT,
10 OPTCHECKMBOXSIZE, 12 OPTCHECKMBOXSIZE,
11 OPTCHECKNEW, 13 OPTCHECKNEW,
12 OPTCOLLAPSEUNREAD, 14 OPTCOLLAPSEUNREAD,
cvs diff -r1.1 -r1.2 pkgsrc/mail/mutt-devel/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/patches/Attic/patch-an 2007/12/06 08:51:51 1.1
+++ pkgsrc/mail/mutt-devel/patches/Attic/patch-an 2008/05/18 08:26:31 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-an,v 1.1 2007/12/06 08:51:51 cjs Exp $ 1$NetBSD: patch-an,v 1.2 2008/05/18 08:26:31 tonio Exp $
 2
 3Add change_folder_next option.
2 4
3--- init.h.orig 2007-11-01 02:48:52.000000000 +0900 5--- init.h.orig 2007-11-01 02:48:52.000000000 +0900
4+++ init.h 2007-12-06 17:35:34.000000000 +0900 6+++ init.h 2007-12-06 17:35:34.000000000 +0900
5@@ -317,6 +317,13 @@ 7@@ -317,6 +317,13 @@
6 ** Character set your terminal uses to display and enter textual data. 8 ** Character set your terminal uses to display and enter textual data.
7 ** It is also the fallback for $$send_charset. 9 ** It is also the fallback for $$send_charset.
8 */ 10 */
9+ { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 }, 11+ { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
10+ /* 12+ /*
11+ ** .pp 13+ ** .pp
12+ ** When this variable is set, the change-folder command will start at the 14+ ** When this variable is set, the change-folder command will start at the
13+ ** next folder after the current folder in your mailbox list instead of 15+ ** next folder after the current folder in your mailbox list instead of
14+ ** starting at the first folder. 16+ ** starting at the first folder.
cvs diff -r1.1 -r1.2 pkgsrc/mail/mutt-devel/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/patches/Attic/patch-ao 2007/12/06 08:51:52 1.1
+++ pkgsrc/mail/mutt-devel/patches/Attic/patch-ao 2008/05/18 08:26:31 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ao,v 1.1 2007/12/06 08:51:52 cjs Exp $ 1$NetBSD: patch-ao,v 1.2 2008/05/18 08:26:31 tonio Exp $
 2
 3Add change_folder_next option.
2 4
3--- curs_main.c.orig 2007-12-06 17:32:01.000000000 +0900 5--- curs_main.c.orig 2007-12-06 17:32:01.000000000 +0900
4+++ curs_main.c 2007-12-06 17:34:20.000000000 +0900 6+++ curs_main.c 2007-12-06 17:34:20.000000000 +0900
5@@ -1080,6 +1080,12 @@ 7@@ -1080,6 +1080,12 @@
6 } 8 }
7 else 9 else
8 { 10 {
9+ if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path) 11+ if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
10+ if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path) 12+ if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
11+ { 13+ {
12+ strfcpy (buf, Context->path, sizeof (buf)); 14+ strfcpy (buf, Context->path, sizeof (buf));
13+ mutt_pretty_mailbox (buf); 15+ mutt_pretty_mailbox (buf);
14+ } 16+ }