1.5.17->1.5.18, all patchsets are from upstream sources, sidebar has
the usual "strip out the diff to PATCHES so it doesn't conflict with
compressed and mirror it".
Muttrc moved to doc/, I added another variable so we can still use
the same do-install in Makefile.inc for both. No problems compiling/
packaging any of the variants linked to the build.
Any comments/ok? (I've only just started running with it, so I'll
hold off actually committing for a couple of days at least).
M Makefile.inc
M snapshot/Makefile
M snapshot/distinfo
R snapshot/patches/patch-Makefile_in
M snapshot/patches/patch-configure_ac
M snapshot/patches/patch-doc_Makefile_in
M snapshot/patches/patch-imap_browse_c
R snapshot/patches/patch-lib_c
M snapshot/patches/patch-smime_keys_pl
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile.inc,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile.inc
--- Makefile.inc 9 May 2008 17:46:51 -0000 1.26
+++ Makefile.inc 18 May 2008 22:26:59 -0000
@@ -74,10 +74,10 @@ CONFIGURE_ARGS+= --without-idn
.endif
.if ${FLAVOR:L:Msidebar}
-PATCHFILES+= patch-1.5.17.sidebar.txt:1
+PATCHFILES+= patch-${VERSION}.sidebar.txt:1
PATCH_DIST_STRIP= -p1
.else
-SUPDISTFILES+= patch-1.5.17.sidebar.txt:1
+SUPDISTFILES+= patch-${VERSION}.sidebar.txt:1
.endif
.if defined(HOMESPOOL)
@@ -91,11 +91,12 @@ CONFIGURE_ARGS+= --with-domain="${DOMAIN
WRKDIST= ${WRKDIR}/${DISTNAME:S/i$//}
CONFDIR= ${SYSCONFDIR}/mutt
SUBST_VARS= CONFDIR
+MUTTRCDIR?=
post-install:
@strip ${PREFIX}/bin/mutt
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mutt
- ${INSTALL_DATA} ${WRKSRC}/Muttrc \
+ ${INSTALL_DATA} ${WRKSRC}/${MUTTRCDIR}Muttrc \
${PREFIX}/share/examples/mutt/Muttrc.sample
${INSTALL_DATA} ${WRKSRC}/mime.types \
${PREFIX}/share/examples/mutt/mime.types.sample
Index: snapshot/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- snapshot/Makefile 9 May 2008 17:46:51 -0000 1.47
+++ snapshot/Makefile 18 May 2008 22:26:59 -0000
@@ -2,9 +2,8 @@
COMMENT= tty-based e-mail client, development version
-VERSION= 1.5.17
+VERSION= 1.5.18
DISTNAME= mutt-${VERSION}
-PKGNAME= ${DISTNAME}p0
MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
WANTLIB= z
@@ -22,5 +21,8 @@ LIB_DEPENDS= qdbm.>=14::databases/qdbm
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
.endif
+
+WANTLIB= c crypto des ssl z
+MUTTRCDIR= doc/
.include <bsd.port.mk>
Index: snapshot/distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- snapshot/distinfo 11 Nov 2007 10:09:43 -0000 1.26
+++ snapshot/distinfo 18 May 2008 22:26:59 -0000
@@ -1,15 +1,15 @@
-MD5 (mutt-1.5.17.tar.gz) = STh0WL4MtSuFrg1zr2marg==
-MD5 (patch-1.5.17.rr.compressed.1.gz) = JnOj0acokBizjUkBkswoJQ==
-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) = OeJE0r+ebbX5ydiPK2TYqn6muHs=
-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) = HyixonCHEzKgxNuvEd1xMkMbmNs=
-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) =
CnEA9ZnizwiKDRXMJ6Gc44oN87+38C3WzoonZS/NToo=
-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) = 10589
-SIZE (patch-1.5.17.sidebar.txt) = 50165
+MD5 (mutt-1.5.18.tar.gz) = J8MANxIBibn5wNPnY2G4+A==
+MD5 (patch-1.5.18.rr.compressed.1.gz) = k88UXqhLBeOoshfChB5caQ==
+MD5 (patch-1.5.18.sidebar.txt) = p5r8gAQljOVeVI0U12f+5A==
+RMD160 (mutt-1.5.18.tar.gz) = HIWV9m65qpTAGmAgviCnXAyNLRQ=
+RMD160 (patch-1.5.18.rr.compressed.1.gz) = VV+dKFuPdwbUR4kgTT7RhNlZCzI=
+RMD160 (patch-1.5.18.sidebar.txt) = tAb7RYTsN9/OvyrV37Qw+zimy5c=
+SHA1 (mutt-1.5.18.tar.gz) = qDWhkzKXSU8sbGi5ozTMHXGpXlo=
+SHA1 (patch-1.5.18.rr.compressed.1.gz) = 7nFhH68wNI9oXtTBikQGuMNPkec=
+SHA1 (patch-1.5.18.sidebar.txt) = CMenjEnsnTkjU31qct6kU0+exdI=
+SHA256 (mutt-1.5.18.tar.gz) = i7bWnqLHIDC2bsm7S9QAe6bY3F9g/f3ntxLieE4Iv7M=
+SHA256 (patch-1.5.18.rr.compressed.1.gz) =
yovuAdAv6ukwCWFa7VHPPaiLtH5qeJcm4yNvOxDfdSU=
+SHA256 (patch-1.5.18.sidebar.txt) =
uGl/kfevGYoTS9eUVhzd7tR5uvUPW+k2im0doESleeU=
+SIZE (mutt-1.5.18.tar.gz) = 3602632
+SIZE (patch-1.5.18.rr.compressed.1.gz) = 10577
+SIZE (patch-1.5.18.sidebar.txt) = 51767
Index: snapshot/patches/patch-Makefile_in
===================================================================
RCS file: snapshot/patches/patch-Makefile_in
diff -N snapshot/patches/patch-Makefile_in
--- snapshot/patches/patch-Makefile_in 11 Nov 2007 10:09:43 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2007/11/11 10:09:43 sthen Exp $
---- 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:
-
--install-data-am: install-data-local
-+install-data-am: Muttrc
-
- install-exec-am: install-binPROGRAMS install-binSCRIPTS
- @$(NORMAL_INSTALL)
Index: snapshot/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- snapshot/patches/patch-configure_ac 11 Nov 2007 10:09:43 -0000 1.2
+++ snapshot/patches/patch-configure_ac 18 May 2008 22:26:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.2 2007/11/11 10:09:43 sthen Exp $
---- 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
+--- configure.ac.orig Thu Apr 17 23:22:08 2008
++++ configure.ac Sat May 17 22:34:14 2008
+@@ -537,7 +537,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.7
diff -u -p -r1.7 patch-doc_Makefile_in
--- snapshot/patches/patch-doc_Makefile_in 11 Nov 2007 10:09:43 -0000
1.7
+++ snapshot/patches/patch-doc_Makefile_in 18 May 2008 22:26:59 -0000
@@ -1,19 +1,19 @@
$OpenBSD: patch-doc_Makefile_in,v 1.7 2007/11/11 10:09:43 sthen Exp $
---- 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
+--- doc/Makefile.in.orig Sun Apr 20 04:08:50 2008
++++ doc/Makefile.in Sat May 17 22:54:18 2008
+@@ -491,7 +491,7 @@ uninstall-am: uninstall-info-am uninstall-local
--makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
-+makedoc-all: mutt.1 muttrc.man
+ all: makedoc-all
+
+-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked
manual.txt
++makedoc-all: mutt.1 muttrc.man stamp-doc-rc
install-data-local: makedoc-all instdoc
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -475,8 +475,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked manual.txt
+@@ -592,8 +592,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-
- muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head
muttrc.man.tail
- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \
+ muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head
muttrc.man.tail
+ $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m | \
- cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
- > muttrc.man
+ cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail | \
Index: snapshot/patches/patch-imap_browse_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-imap_browse_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-imap_browse_c
--- snapshot/patches/patch-imap_browse_c 6 Feb 2008 15:01:56 -0000
1.3
+++ snapshot/patches/patch-imap_browse_c 18 May 2008 22:26:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-imap_browse_c,v 1.3 2008/02/06 15:01:56 okan Exp $
---- imap/browse.c.orig Mon May 28 19:19:39 2007
-+++ imap/browse.c Tue Feb 5 17:42:51 2008
-@@ -313,7 +313,9 @@ int imap_mailbox_rename(const char* mailbox)
+--- imap/browse.c.orig Sat May 17 19:52:24 2008
++++ imap/browse.c Sat May 17 22:34:14 2008
+@@ -318,7 +318,9 @@ int imap_mailbox_rename(const char* mailbox)
}
snprintf(buf, sizeof (buf), _("Rename mailbox %s to: "), mx.mbox);
Index: snapshot/patches/patch-lib_c
===================================================================
RCS file: snapshot/patches/patch-lib_c
diff -N snapshot/patches/patch-lib_c
--- snapshot/patches/patch-lib_c 11 Nov 2007 10:09:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-lib_c,v 1.1 2007/11/11 10:09:43 sthen Exp $
---- 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/patches/patch-smime_keys_pl
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-smime_keys_pl,v
retrieving revision 1.2
diff -u -p -r1.2 patch-smime_keys_pl
--- snapshot/patches/patch-smime_keys_pl 7 Feb 2005 17:16:16 -0000
1.2
+++ snapshot/patches/patch-smime_keys_pl 18 May 2008 22:26:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-smime_keys_pl,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- smime_keys.pl.orig Thu Feb 3 09:22:41 2005
-+++ smime_keys.pl Thu Feb 3 09:23:05 2005
-@@ -52,7 +52,7 @@ sub do_verify($$$ );
+--- smime_keys.pl.orig Sat May 17 04:20:44 2008
++++ smime_keys.pl Sat May 17 22:34:14 2008
+@@ -53,7 +53,7 @@ sub do_verify($$$ );
# Get the directories mutt uses for certificate/key storage.
my $mutt = $ENV{MUTT_CMDLINE} || 'mutt';
