cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Mutt to 1.5.17, fix WANTLIB for 1.5.xx (adding qdbm in 1.5.16

Browse Source 
brought in a dependency on libz).

feedback/ok bernd@, simon@
This commit is contained in:
sthen 2007-11-11 10:09:43 +00:00
parent a92a19efa9
commit df4efa83a9
11 changed files with 69 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/mutt/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.24 2007/06/21 17:26:29 bernd Exp $
# $OpenBSD: Makefile.inc,v 1.25 2007/11/11 10:09:43 sthen Exp $
CATEGORIES= mail
@ -20,8 +20,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto des ssl
FLAVORS+= slang mixmaster compressed
FLAVOR?=
@ -78,10 +76,10 @@ CONFIGURE_ARGS+= --without-idn
.endif
.if ${FLAVOR:L:Msidebar}
PATCHFILES+= patch-1.5.16.sidebar.txt:1
PATCHFILES+= patch-1.5.17.sidebar.txt:1
PATCH_DIST_STRIP= -p1
.else
SUPDISTFILES+= patch-1.5.16.sidebar.txt:1
SUPDISTFILES+= patch-1.5.17.sidebar.txt:1
.endif
.if defined(HOMESPOOL)

9
mail/mutt/snapshot/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.44 2007/09/16 00:17:05 merdely Exp $
# $OpenBSD: Makefile,v 1.45 2007/11/11 10:09:43 sthen Exp $
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 \
@ -24,4 +23,6 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
.endif
WANTLIB= c crypto des ssl z
.include <bsd.port.mk>

30
mail/mutt/snapshot/distinfo
View File

@ -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) = 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

8
mail/mutt/snapshot/patches/patch-Makefile_in
View File

@ -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
$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:

12
mail/mutt/snapshot/patches/patch-browser_c
View File

@ -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
$OpenBSD: patch-browser_c,v 1.5 2007/11/11 10:09:43 sthen Exp $
--- 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/21 17:26:29 bernd Exp $
#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/21 17:26:29 bernd Exp $
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/21 17:26:29 bernd Exp $
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);

8
mail/mutt/snapshot/patches/patch-configure_ac
View File

@ -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
$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
AC_SUBST(docdir)
if test x$mutt_cv_setgid = xyes; then

10
mail/mutt/snapshot/patches/patch-doc_Makefile_in
View File

@ -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
$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
@ -10,7 +10,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.6 2007/06/21 17:26:29 bernd Exp $
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 | \

17
mail/mutt/snapshot/patches/patch-lib_c Normal file
View File

@ -0,0 +1,17 @@
$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)

3
mail/mutt/snapshot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2007/06/21 17:26:29 bernd Exp $
@comment $OpenBSD: PLIST,v 1.17 2007/11/11 10:09:43 sthen Exp $
@pkgpath mail/mutt/snapshot,hcache
bin/flea
bin/mutt
@ -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/

4
mail/mutt/stable/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2007/09/16 00:17:05 merdely Exp $
# $OpenBSD: Makefile,v 1.34 2007/11/11 10:09:43 sthen Exp $
COMMENT= tty-based e-mail client
@ -6,4 +6,6 @@ VERSION= 1.4.2.3
DISTNAME= mutt-${VERSION}
MASTER_SITES= ${MASTER_SITES_MUTT}
WANTLIB= c crypto des ssl
.include <bsd.port.mk>

10
mail/mutt/stable/distinfo
View File

@ -1,15 +1,15 @@
MD5 (mutt-1.4.2.3.tar.gz) = 3LlGYYJ90JD6gT5z4SLqDA==
MD5 (patch-1.4.2.3.rr.compressed.1.gz) = 5oGEW+UVoC9GB9tm177ZGQ==
MD5 (patch-1.5.16.sidebar.txt) = Me9/WpVI767ssby2uePkYw==
MD5 (patch-1.5.17.sidebar.txt) = Q+L7L33eFleUG0hbZkQ/1g==
RMD160 (mutt-1.4.2.3.tar.gz) = WeZsMIzUln5YetHcc912x/DQbvE=
RMD160 (patch-1.4.2.3.rr.compressed.1.gz) = jNJD5iMjfOuSzaUBeqaccviYZEU=
RMD160 (patch-1.5.16.sidebar.txt) = 9b71caq/743Qw+ISBv5gWnKmgKg=
RMD160 (patch-1.5.17.sidebar.txt) = vo7hGr4ulyFhsLredWXBwro6LHk=
SHA1 (mutt-1.4.2.3.tar.gz) = sj5Ghz8CR+haRBfPM41k6mmMmyw=
SHA1 (patch-1.4.2.3.rr.compressed.1.gz) = mvc6oKN/H5LM8B1TepshZH9jbwQ=
SHA1 (patch-1.5.16.sidebar.txt) = zoKMAsbqbwNxarkkdEMsGaY3HJA=
SHA1 (patch-1.5.17.sidebar.txt) = 26vlHrPQkujVEIOa64sWkGJF9vQ=
SHA256 (mutt-1.4.2.3.tar.gz) = Gkkg5e/M1qg5Mq9CI8tWiVYVj2Lp9ZV5isxABKymrOU=
SHA256 (patch-1.4.2.3.rr.compressed.1.gz) = YnUw8z8J5xqlCHxqQIQ4ommT74hGrAhBn29tFj2egic=
SHA256 (patch-1.5.16.sidebar.txt) = DaSKRzkuYBWofGE3mdqri+RRWD69cF63iF5/rjBeraM=
SHA256 (patch-1.5.17.sidebar.txt) = 5I6ZGd2xzRcy9dzeHxmiQ15C/7HkW1+vSq3XpcHSpVQ=
SIZE (mutt-1.4.2.3.tar.gz) = 2646433
SIZE (patch-1.4.2.3.rr.compressed.1.gz) = 13401
SIZE (patch-1.5.16.sidebar.txt) = 42221
SIZE (patch-1.5.17.sidebar.txt) = 50165