diff --git a/mail/mutt/stable/Makefile b/mail/mutt/stable/Makefile index 3fdeea8fe59..8dcc9fb1a43 100644 --- a/mail/mutt/stable/Makefile +++ b/mail/mutt/stable/Makefile @@ -1,92 +1,10 @@ -# $OpenBSD: Makefile,v 1.19 2004/02/16 02:39:10 jolan Exp $ +# $OpenBSD: Makefile,v 1.20 2004/02/19 20:43:22 brad Exp $ COMMENT= "tty-based e-mail client" -VERSION= 1.4.1 -DISTNAME= mutt-${VERSION}i -PKGNAME= ${DISTNAME}p0 -CATEGORIES= mail -MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ - ftp://ftp.gbnet.net/pub/mutt-international/ \ - ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ - ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ -MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/ - -HOMEPAGE= http://www.mutt.org/ - -MODULES= gettext +VERSION= 1.4.2 +MASTER_SITES= ${MASTER_SITES_MUTT} MAINTAINER= Federico Schwindt -# GPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -FLAVORS= slang mixmaster compressed -FLAVOR?= - -# XXX workaround sparc64 gcc optimization bug -.if ${MACHINE_ARCH:Msparc64} -PATCH_LIST= gcc-* patch-* -.endif - -BUILD_DEPENDS= ::devel/automake - -CONFIGURE_STYLE= autoconf old -CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \ - --with-docdir="${PREFIX}/share/doc/mutt" \ - --enable-flock --disable-fcntl \ - --enable-external_dotlock \ - --enable-imap --enable-pop --with-ssl \ - --with-gss --sysconfdir=${CONFDIR} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - ISPELL="${LOCALBASE}/bin/ispell" - -.if ${FLAVOR:L:Mslang} -LIB_DEPENDS+= slang.14::devel/libslang -CONFIGURE_ARGS+= --with-slang="${PREFIX}" -.else -CONFIGURE_ARGS+= --with-curses -.endif - -# compressed folder support provided by -# http://www.spinnaker.de/mutt/compressed/ -.if ${FLAVOR:L:Mcompressed} -PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 -PATCH_DIST_STRIP=-p1 -CONFIGURE_ARGS+= --enable-compressed -CONFIGURE_STYLE+= automake -.else -SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0 -.endif - -.if ${FLAVOR:L:Mmixmaster} -CONFIGURE_ARGS+= --with-mixmaster="${LOCALBASE}/sbin/mixmaster" -RUN_DEPENDS+= ::mail/mixmaster -.endif - -.if defined(HOMESPOOL) -CONFIGURE_ARGS+= --with-homespool="${HOMESPOOL}" -.endif - -.if defined(DOMAIN) -CONFIGURE_ARGS+= --with-domain="${DOMAIN}" -.endif - -WRKDIST= ${WRKDIR}/${DISTNAME:S/i$//} -CONFDIR= ${SYSCONFDIR}/mutt -SUBST_VARS= CONFDIR - -post-install: - @strip ${PREFIX}/bin/mutt - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mutt - ${INSTALL_DATA} ${WRKSRC}/Muttrc \ - ${PREFIX}/share/examples/mutt/Muttrc.sample - ${INSTALL_DATA} ${WRKSRC}/mime.types \ - ${PREFIX}/share/examples/mutt/mime.types.sample - mv ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt - .include diff --git a/mail/mutt/stable/distinfo b/mail/mutt/stable/distinfo index a39c9353591..0a3f4148ca9 100644 --- a/mail/mutt/stable/distinfo +++ b/mail/mutt/stable/distinfo @@ -1,6 +1,6 @@ -MD5 (mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847 -MD5 (patch-1.4.1.rr.compressed.1.gz) = b50484f8b12328c3ee69222a3eb1da11 -RMD160 (mutt-1.4.1i.tar.gz) = 9b2a5ea848ea8c98ba83c47ee65a93344759a398 -RMD160 (patch-1.4.1.rr.compressed.1.gz) = ea1ea8253e652a5e8be35b4970e3a1090feef088 -SHA1 (mutt-1.4.1i.tar.gz) = 34622caf9d04979d8ad01219050288561998f64b -SHA1 (patch-1.4.1.rr.compressed.1.gz) = cb3550967c6e26f94f2de3b6337f73732086ab95 +MD5 (mutt-1.4.2i.tar.gz) = 6045b47cbba8170d6a9fdccc1aa817b9 +MD5 (patch-1.4.2.rr.compressed.1.gz) = 36381ca7ff377a0d79c23b89e8388171 +RMD160 (mutt-1.4.2i.tar.gz) = c44ceb3f29144468d111451c1b7402240ed9450e +RMD160 (patch-1.4.2.rr.compressed.1.gz) = d99566ea664bde7f5f19f4686638a728e04c3ee8 +SHA1 (mutt-1.4.2i.tar.gz) = 2c5859bf0400f4a23c3b49f4ceb1c9e16b2c5462 +SHA1 (patch-1.4.2.rr.compressed.1.gz) = e39fb088a899b4585ed5393877fb8654e5d943b6 diff --git a/mail/mutt/stable/patches/patch-Makefile_in b/mail/mutt/stable/patches/patch-Makefile_in index 2c59c2abc41..c648ab55112 100644 --- a/mail/mutt/stable/patches/patch-Makefile_in +++ b/mail/mutt/stable/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1 2002/06/14 17:43:51 fgsch Exp $ ---- Makefile.in.orig Wed May 29 06:31:04 2002 -+++ Makefile.in Mon Jun 10 15:47:14 2002 -@@ -217,7 +217,7 @@ DIST_SUBDIRS = m4 po intl doc contrib i +$OpenBSD: patch-Makefile_in,v 1.2 2004/02/19 20:43:22 brad Exp $ +--- Makefile.in.orig 2004-02-11 09:04:48.000000000 -0500 ++++ Makefile.in 2004-02-14 20:34:15.000000000 -0500 +@@ -216,7 +216,7 @@ DIST_SUBDIRS = m4 po intl doc contrib i SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS) diff --git a/mail/mutt/stable/patches/patch-mbox_c b/mail/mutt/stable/patches/patch-mbox_c index 1daec04c9c2..5cc7aba8554 100644 --- a/mail/mutt/stable/patches/patch-mbox_c +++ b/mail/mutt/stable/patches/patch-mbox_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-mbox_c,v 1.2 2002/06/14 17:43:51 fgsch Exp $ ---- mbox.c.orig Thu Feb 28 04:58:47 2002 -+++ mbox.c Mon Jun 10 15:47:15 2002 +$OpenBSD: patch-mbox_c,v 1.3 2004/02/19 20:43:22 brad Exp $ +--- mbox.c.orig 2002-02-28 02:59:24.000000000 -0500 ++++ mbox.c 2004-02-17 00:48:33.000000000 -0500 @@ -288,7 +288,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1)) diff --git a/mail/mutt/stable/patches/patch-menu_c b/mail/mutt/stable/patches/patch-menu_c deleted file mode 100644 index 58a0b2a1ab7..00000000000 --- a/mail/mutt/stable/patches/patch-menu_c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-menu_c,v 1.1 2004/02/11 19:19:48 sturm Exp $ ---- menu.c.orig 2002-01-28 11:18:50.000000000 +0100 -+++ menu.c 2004-02-11 20:03:43.000000000 +0100 -@@ -148,30 +148,13 @@ static void menu_make_entry (char *s, in - menu->make_entry (s, l, menu, i); - } - --void menu_pad_string (char *s, size_t l) -+void menu_pad_string (char *s, size_t n) - { -- size_t n = mutt_strlen (s); - int shift = option (OPTARROWCURSOR) ? 3 : 0; -- -- l--; /* save room for the terminal \0 */ -- if (l > COLS - shift) -- l = COLS - shift; -- -- /* Let's just pad the string anyway ... */ -- mutt_format_string (s, INT_MAX, l, l, 0, ' ', s, n, 1); -- return; -- --#if !defined (HAVE_BKGDSET) && !defined (USE_SLANG_CURSES) -- /* we have to pad the string with blanks to the end of line */ -- if (n < l) -- { -- while (n < l) -- s[n++] = ' '; -- s[n] = 0; -- } -- else --#endif -- s[l] = 0; -+ int cols = COLS - shift; -+ -+ mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1); -+ s[n - 1] = 0; - } - - void menu_redraw_full (MUTTMENU *menu)