updated to use the new compressed folders patch from the normal source and
new sidebar patch based on the one from the normal source (lunar-linux.org)
fixed as was done previously to remove the conflicting PATCHES diff.
again, rm /usr/ports/distfiles/patch-1.5.17.sidebar.txt if you tried an
earlier version of this.
ok?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile.inc,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile.inc
--- Makefile.inc 21 Jun 2007 17:26:29 -0000 1.24
+++ Makefile.inc 8 Nov 2007 16:03:45 -0000
@@ -61,6 +61,7 @@ WANTLIB+= ncurses
PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0
PATCH_DIST_STRIP= -p1
CONFIGURE_ARGS+= --enable-compressed
+WANTLIB+= z
.else
SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0
.endif
@@ -78,10 +79,10 @@ CONFIGURE_ARGS+= --without-idn
.endif
.if ${FLAVOR:L:Msidebar}
-PATCHFILES+= patch-1.5.16.sidebar.txt:1
+PATCHFILES+= patch-${VERSION}.sidebar.txt:1
PATCH_DIST_STRIP= -p1
.else
-SUPDISTFILES+= patch-1.5.16.sidebar.txt:1
+SUPDISTFILES+= patch-${VERSION}.sidebar.txt:1
.endif
.if defined(HOMESPOOL)
Index: snapshot/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- snapshot/Makefile 16 Sep 2007 00:17:05 -0000 1.44
+++ snapshot/Makefile 8 Nov 2007 16:03:45 -0000
@@ -2,15 +2,14 @@
COMMENT= tty-based e-mail client, development version
-VERSION= 1.5.16
+VERSION= 1.5.17
DISTNAME= mutt-${VERSION}
-PKGNAME= ${DISTNAME}p0
MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
FLAVORS= idn sasl sidebar
FLAVOR?=
-AUTOCONF_VERSION=2.60
+AUTOCONF_VERSION=2.61
CONFIGURE_ARGS= --enable-smtp \
--mandir=${PREFIX}/man \
Index: snapshot/distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- snapshot/distinfo 21 Jun 2007 17:26:29 -0000 1.25
+++ snapshot/distinfo 8 Nov 2007 16:03:45 -0000
@@ -1,15 +1,15 @@
-MD5 (mutt-1.5.16.tar.gz) = EO/3Ak27fOH3c9aIpp6p2w==
-MD5 (patch-1.5.16.rr.compressed.1.gz) = St5xYsuTi8FRkLrqi5iSVA==
-MD5 (patch-1.5.16.sidebar.txt) = Me9/WpVI767ssby2uePkYw==
-RMD160 (mutt-1.5.16.tar.gz) = OzRVmapiqVa5yIGZT/10FWpb+Ag=
-RMD160 (patch-1.5.16.rr.compressed.1.gz) = MulgEqbUn2Fu8GViucKafJU4L8I=
-RMD160 (patch-1.5.16.sidebar.txt) = 9b71caq/743Qw+ISBv5gWnKmgKg=
-SHA1 (mutt-1.5.16.tar.gz) = SqqCvcddXhKsxy309h+7+H/WT8E=
-SHA1 (patch-1.5.16.rr.compressed.1.gz) = nLX1bHvXnu38h26A3IwczUEus0M=
-SHA1 (patch-1.5.16.sidebar.txt) = zoKMAsbqbwNxarkkdEMsGaY3HJA=
-SHA256 (mutt-1.5.16.tar.gz) = gl6SCzlNtvVvqN60WXfAYTMfWdlTlE4n/1lWJbutPoM=
-SHA256 (patch-1.5.16.rr.compressed.1.gz) =
4UJ6Tw/XJ5v194AkcrsmKfvfkoVDC1x3xziayWKs0+c=
-SHA256 (patch-1.5.16.sidebar.txt) =
DaSKRzkuYBWofGE3mdqri+RRWD69cF63iF5/rjBeraM=
-SIZE (mutt-1.5.16.tar.gz) = 3534894
-SIZE (patch-1.5.16.rr.compressed.1.gz) = 10542
-SIZE (patch-1.5.16.sidebar.txt) = 42221
+MD5 (mutt-1.5.17.tar.gz) = STh0WL4MtSuFrg1zr2marg==
+MD5 (patch-1.5.17.rr.compressed.1.gz) = S3q6MkECN1Sw0qEzxpdaxw==
+MD5 (patch-1.5.17.sidebar.txt) = Q+L7L33eFleUG0hbZkQ/1g==
+RMD160 (mutt-1.5.17.tar.gz) = 5chKJ60lcwr+ZIeekb7YmgIeBYA=
+RMD160 (patch-1.5.17.rr.compressed.1.gz) = U0U+6LB/ej9VouIf+eoSvMOKmnM=
+RMD160 (patch-1.5.17.sidebar.txt) = vo7hGr4ulyFhsLredWXBwro6LHk=
+SHA1 (mutt-1.5.17.tar.gz) = a1F0X8S69GOt3lPpHvsqbH7shJI=
+SHA1 (patch-1.5.17.rr.compressed.1.gz) = J7Y4aUZCe9rhc+ouGNFgiu0vW74=
+SHA1 (patch-1.5.17.sidebar.txt) = 26vlHrPQkujVEIOa64sWkGJF9vQ=
+SHA256 (mutt-1.5.17.tar.gz) = F4ZbGhDiPM+HV8BWV8fX9wVUV/CgTurNnuVg7rbe+oE=
+SHA256 (patch-1.5.17.rr.compressed.1.gz) =
GjEO3AZnpeCeRkXsxtWWPigW+h8kcDgeEp4jodD6a20=
+SHA256 (patch-1.5.17.sidebar.txt) =
5I6ZGd2xzRcy9dzeHxmiQ15C/7HkW1+vSq3XpcHSpVQ=
+SIZE (mutt-1.5.17.tar.gz) = 3572651
+SIZE (patch-1.5.17.rr.compressed.1.gz) = 337422
+SIZE (patch-1.5.17.sidebar.txt) = 50165
Index: snapshot/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- snapshot/patches/patch-Makefile_in 21 Jun 2007 17:26:29 -0000 1.4
+++ snapshot/patches/patch-Makefile_in 8 Nov 2007 16:03:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2007/06/21 17:26:29 bernd Exp $
---- Makefile.in.orig Fri Apr 6 22:05:40 2007
-+++ Makefile.in Sat Apr 7 11:40:35 2007
-@@ -945,7 +945,7 @@ info: info-recursive
+--- Makefile.in.orig Thu Nov 1 19:13:14 2007
++++ Makefile.in Fri Nov 2 08:17:10 2007
+@@ -948,7 +948,7 @@ info: info-recursive
info-am:
Index: snapshot/patches/patch-browser_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-browser_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-browser_c
--- snapshot/patches/patch-browser_c 21 Jun 2007 17:26:29 -0000 1.4
+++ snapshot/patches/patch-browser_c 8 Nov 2007 16:03:45 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-browser_c,v 1.4 2007/06/21 17:26:29 bernd Exp $
---- browser.c.orig Tue Apr 3 06:57:21 2007
-+++ browser.c Sat Apr 7 11:40:27 2007
+--- browser.c.orig Wed Sep 5 19:28:05 2007
++++ browser.c Fri Nov 2 08:17:06 2007
@@ -27,6 +27,7 @@
#include "buffy.h"
#include "mapping.h"
@@ -9,7 +9,7 @@ $OpenBSD: patch-browser_c,v 1.4 2007/06/
#include "mailbox.h"
#include "browser.h"
#ifdef USE_IMAP
-@@ -351,6 +352,21 @@ static void init_state (struct browser_state *state, M
+@@ -352,6 +353,21 @@ static void init_state (struct browser_state *state, M
menu->data = state->entry;
}
@@ -31,7 +31,7 @@ $OpenBSD: patch-browser_c,v 1.4 2007/06/
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
char *d, const char *prefix)
{
-@@ -414,6 +430,7 @@ static int examine_directory (MUTTMENU *menu, struct b
+@@ -415,6 +431,7 @@ static int examine_directory (MUTTMENU *menu, struct b
tmp = Incoming;
while (tmp && mutt_strcmp (buffer, tmp->path))
tmp = tmp->next;
@@ -39,7 +39,7 @@ $OpenBSD: patch-browser_c,v 1.4 2007/06/
add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
}
closedir (dp);
-@@ -463,6 +480,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
+@@ -464,6 +481,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
Index: snapshot/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- snapshot/patches/patch-configure_ac 21 Jun 2007 17:26:29 -0000 1.1
+++ snapshot/patches/patch-configure_ac 8 Nov 2007 16:03:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.1 2007/06/21 17:26:29 bernd Exp $
---- configure.ac.orig Sat Apr 7 11:41:40 2007
-+++ configure.ac Sat Apr 7 11:41:58 2007
-@@ -531,7 +531,7 @@ docdir=$mutt_cv_docdir
+--- configure.ac.orig Thu Nov 1 19:10:06 2007
++++ configure.ac Fri Nov 2 08:17:10 2007
+@@ -532,7 +532,7 @@ docdir=$mutt_cv_docdir
AC_SUBST(docdir)
if test x$mutt_cv_setgid = xyes; then
Index: snapshot/patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-doc_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-doc_Makefile_in
--- snapshot/patches/patch-doc_Makefile_in 21 Jun 2007 17:26:29 -0000
1.6
+++ snapshot/patches/patch-doc_Makefile_in 8 Nov 2007 16:03:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.6 2007/06/21 17:26:29 bernd Exp $
---- doc/Makefile.in.orig Fri Apr 6 09:17:10 2007
-+++ doc/Makefile.in Sat Apr 7 11:40:35 2007
-@@ -395,7 +395,7 @@ uninstall-am: uninstall-info-am uninstall-local
+--- doc/Makefile.in.orig Thu Nov 1 19:13:14 2007
++++ doc/Makefile.in Fri Nov 2 08:17:10 2007
+@@ -396,7 +396,7 @@ uninstall-am: uninstall-info-am uninstall-local
all:
$(MAKE) makedoc-all
@@ -10,7 +10,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.6 20
install-data-local: makedoc-all instdoc
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -472,8 +472,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked manual.txt
+@@ -475,8 +475,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked manual.txt
muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head
muttrc.man.tail
$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \
Index: snapshot/patches/patch-lib_c
===================================================================
RCS file: snapshot/patches/patch-lib_c
diff -N snapshot/patches/patch-lib_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ snapshot/patches/patch-lib_c 8 Nov 2007 16:03:45 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- lib.c.orig Fri Nov 2 08:22:46 2007
++++ lib.c Fri Nov 2 08:24:20 2007
+@@ -451,8 +451,13 @@ int safe_rename (const char *src, const char *target)
+ * FUSE may return ENOSYS. VFAT may return EPERM. FreeBSD's
+ * msdosfs may return EOPNOTSUPP. ENOTSUP can also appear.
+ */
++#if defined(ENOTSUP)
+ if (errno == EXDEV || errno == ENOSYS || errno == EPERM ||
+ errno == ENOTSUP || errno == EOPNOTSUPP)
++#else
++ if (errno == EXDEV || errno == ENOSYS || errno == EPERM ||
++ errno == EOPNOTSUPP)
++#endif
+ {
+ dprint (1, (debugfile, "safe_rename: trying rename...\n"));
+ if (rename (src, target) == -1)
Index: snapshot/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- snapshot/pkg/PLIST 21 Jun 2007 17:26:29 -0000 1.16
+++ snapshot/pkg/PLIST 8 Nov 2007 16:03:45 -0000
@@ -37,6 +37,7 @@ share/doc/mutt/manual.html
share/doc/mutt/manual.txt
share/doc/mutt/mimesupport.html
share/doc/mutt/miscellany.html
+share/doc/mutt/optionalfeatures.html
share/doc/mutt/patch-notes.txt
share/doc/mutt/reference.html
share/doc/mutt/samples/
