From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 9 15:50:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 08E3116A404 for ; Mon, 9 Apr 2007 15:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id C9BCA13C465 for ; Mon, 9 Apr 2007 15:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l39Fo12U049876 for ; Mon, 9 Apr 2007 15:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l39Fo1Hr049874; Mon, 9 Apr 2007 15:50:01 GMT (envelope-from gnats) Resent-Date: Mon, 9 Apr 2007 15:50:01 GMT Resent-Message-Id: <200704091550.l39Fo1Hr049874@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Udo Schweigert Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C2C616A406 for ; Mon, 9 Apr 2007 15:47:02 +0000 (UTC) (envelope-from udo.schweigert@siemens.com) Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by mx1.freebsd.org (Postfix) with ESMTP id 9ABBF13C465 for ; Mon, 9 Apr 2007 15:47:01 +0000 (UTC) (envelope-from udo.schweigert@siemens.com) Received: from mail2.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.6/8.12.6) with ESMTP id l39Fl0cQ015225 for ; Mon, 9 Apr 2007 17:47:00 +0200 Received: from mars.cert.siemens.com (mars.cert.siemens.com [139.25.19.9]) by mail2.siemens.de (8.12.6/8.12.6) with ESMTP id l39Fkx4t024959 for ; Mon, 9 Apr 2007 17:46:59 +0200 Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64]) by mars.cert.siemens.com (8.14.1/8.14.1/$SiemensCERT: mail/cert.mc.pre, v 1.68 2006/12/29 07:12:05 mailadm Exp $) with ESMTP id l39FkxKn016845 for ; Mon, 9 Apr 2007 17:46:59 +0200 (CEST) Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64]) by alaska.cert.siemens.com (8.14.1/8.14.1/$Ust: hosts/alaska/mail/config.mc, v 1.20 2006/06/21 05:39:02 ust Exp $) with ESMTP id l39FkxAo067456 for ; Mon, 9 Apr 2007 17:46:59 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.com) Received: (from ust@localhost) by alaska.cert.siemens.com (8.14.1/8.14.1/$Ust: hosts/alaska/mail/submit.mc,v 1.6 2004/08/29 16:18:57 ust Exp $) id l39FkxJp061803; Mon, 9 Apr 2007 17:46:59 +0200 (CEST) (envelope-from ust) Message-Id: <200704091546.l39FkxJp061803@alaska.cert.siemens.com> Date: Mon, 9 Apr 2007 17:46:59 +0200 (CEST) From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/111414: maintainer-update of mail/mutt-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Udo Schweigert List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2007 15:50:02 -0000 >Number: 111414 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 09 15:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: >Description: Maintainer update of mail/mutt-devel: - Update to 1.5.15 - assumed_charset is now part of the main distribution. - signature-menu will be updated later, doesn't work at the moment >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Wed Mar 7 06:08:37 2007 +++ ./Makefile Mon Apr 9 16:59:41 2007 @@ -101,16 +101,13 @@ # If you want to enable the reverse_reply option define: # WITH_MUTT_REVERSE_REPLY_PATCH # -# If you want to enable the assumed_charset option define: -# WITH_MUTT_ASSUMED_CHARSET_PATCH -# # If you want to enable the `greeting' option define: # WITH_MUTT_GREETING_PATCH # PORTNAME= mutt-devel -PORTVERSION= 1.5.14 -PORTREVISION?= 1 +PORTVERSION= 1.5.15 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -201,11 +198,6 @@ IGNORE= cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible .endif .endif -.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH) -.if defined(WITH_MUTT_NNTP) -IGNORE= cannot install: the WITH_MUTT_ASSUMED_CHARSET_PATCH and WITH_MUTT_NNTP are not compatible -.endif -.endif .if defined (MUTT_LITE) WITHOUT_MUTT_XML= yes @@ -319,6 +311,7 @@ @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook .endif .if defined(WITH_MUTT_SIGNATURE_MENU) +IGNORE= The WITH_MUTT_SIGNATURE_MENU does not work at the moment. XML_NEEDED= yes post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu @@ -431,7 +424,7 @@ PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) -SIDEBAR_PATCH= patch-1.5.14.sidebar.20070223.txt +SIDEBAR_PATCH= patch-1.5.15.sidebar.20070408.txt DISTFILES+= ${SIDEBAR_PATCH}:tchan XML_NEEDED= yes pre-patch:: @@ -439,9 +432,6 @@ @${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \ ${WRKDIR}/patch-sidebar @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar -.endif -.if defined(WITH_MUTT_ASSUMED_CHARSET_PATCH) -PATCHFILES+= patch-${AC_PATCH_VERSION}.tt.assumed_charset.2.gz:jp .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo Thu Mar 1 15:35:34 2007 +++ ./distinfo Mon Apr 9 17:00:17 2007 @@ -1,27 +1,27 @@ -MD5 (mutt/mutt-1.5.14.tar.gz) = 6d33b4f0074e39772021d947c49b30c6 -SHA256 (mutt/mutt-1.5.14.tar.gz) = 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a -SIZE (mutt/mutt-1.5.14.tar.gz) = 3441678 -MD5 (mutt/patch-1.5.14.rr.compressed.gz) = 383897af9c41a95a3c36d76ee206811d -SHA256 (mutt/patch-1.5.14.rr.compressed.gz) = 34b6f642d1daab31acb655d008ccba92aefadc4730c3b12ee64265285f8f34d7 -SIZE (mutt/patch-1.5.14.rr.compressed.gz) = 10168 -MD5 (mutt/patch-1.5.14.vvv.nntp.gz) = 3c1554f33161329225900fee899cd2b8 -SHA256 (mutt/patch-1.5.14.vvv.nntp.gz) = 415fe575b895a79ddf91ff81566a88b12268076ccf870b1306741e4dfbe781ee -SIZE (mutt/patch-1.5.14.vvv.nntp.gz) = 54928 +MD5 (mutt/mutt-1.5.15.tar.gz) = b2c1eb45fd958f6589ee52a98f2a3ce1 +SHA256 (mutt/mutt-1.5.15.tar.gz) = 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a +SIZE (mutt/mutt-1.5.15.tar.gz) = 3517899 +MD5 (mutt/patch-1.5.15.rr.compressed.gz) = b2c3af62e5469826e445113bc85ce0c3 +SHA256 (mutt/patch-1.5.15.rr.compressed.gz) = 4542be2062337224783631f5730d97a5a351a69737bf772b81010e5be16277f7 +SIZE (mutt/patch-1.5.15.rr.compressed.gz) = 10084 +MD5 (mutt/patch-1.5.15.vvv.nntp.gz) = 758a2822791eed6da8bb48a862b5758f +SHA256 (mutt/patch-1.5.15.vvv.nntp.gz) = 762a56acc0ca85bd9b224713c2ece006233d30b0a4a1725e58a0f0f2af6827e8 +SIZE (mutt/patch-1.5.15.vvv.nntp.gz) = 54495 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373 SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545 -MD5 (mutt/patch-1.5.14.vvv.initials.gz) = 60ca699e3959db53dec418ca08d028e1 -SHA256 (mutt/patch-1.5.14.vvv.initials.gz) = 0c71d08ff4fa82208f59567c6f2666a58a5bd2664c0ef57f5ababedb0f0bb0f8 -SIZE (mutt/patch-1.5.14.vvv.initials.gz) = 692 -MD5 (mutt/patch-1.5.14.vvv.quote.gz) = fb4bf5bd63d219205447009c2270676b -SHA256 (mutt/patch-1.5.14.vvv.quote.gz) = 0b64a611a638ecf1298db85b614454630ffedf26095c9b7c2a77b47db5a5bd9f -SIZE (mutt/patch-1.5.14.vvv.quote.gz) = 1962 +MD5 (mutt/patch-1.5.15.vvv.initials.gz) = 414606ce18de730d1bb6478899532644 +SHA256 (mutt/patch-1.5.15.vvv.initials.gz) = 9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1 +SIZE (mutt/patch-1.5.15.vvv.initials.gz) = 684 +MD5 (mutt/patch-1.5.15.vvv.quote.gz) = 93276f86e544e69a0e83808279f3b175 +SHA256 (mutt/patch-1.5.15.vvv.quote.gz) = 4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5 +SIZE (mutt/patch-1.5.15.vvv.quote.gz) = 1585 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406 SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405 -MD5 (mutt/patch-1.5.14.sidebar.20070223.txt) = b4cb93ec7053ca2be1f4253d8c545937 -SHA256 (mutt/patch-1.5.14.sidebar.20070223.txt) = 56c5fc62a50ef2031736e6e4aee81931444e4545b86f05636496284e4a88f331 -SIZE (mutt/patch-1.5.14.sidebar.20070223.txt) = 50978 -MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63 -SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e -SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555 +MD5 (mutt/patch-1.5.15.rr.compressed.gz) = b2c3af62e5469826e445113bc85ce0c3 +SHA256 (mutt/patch-1.5.15.rr.compressed.gz) = 4542be2062337224783631f5730d97a5a351a69737bf772b81010e5be16277f7 +SIZE (mutt/patch-1.5.15.rr.compressed.gz) = 10084 +MD5 (mutt/patch-1.5.15.sidebar.20070408.txt) = 8fcae5ea38eac45616762d76f7cadacf +SHA256 (mutt/patch-1.5.15.sidebar.20070408.txt) = 3b61cd21cbe5bd5851a5441ce049ace3329f710bf5224064a6293d379d14c5f8 +SIZE (mutt/patch-1.5.15.sidebar.20070408.txt) = 51101 diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-aspell ./files/extra-patch-aspell --- /usr/ports/mail/mutt-devel/files/extra-patch-aspell Tue Nov 9 19:57:39 2004 +++ ./files/extra-patch-aspell Mon Apr 9 15:33:37 2007 @@ -1,5 +1,5 @@ ---- Muttrc.head.in.orig Thu Jan 24 13:10:47 2002 -+++ Muttrc.head.in Tue Nov 9 08:53:14 2004 +--- Muttrc.head.orig Thu Jan 24 13:10:47 2002 ++++ Muttrc.head Tue Nov 9 08:53:14 2004 @@ -19,6 +19,8 @@ macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-doc-ref ./files/extra-patch-doc-ref --- /usr/ports/mail/mutt-devel/files/extra-patch-doc-ref Wed Sep 24 17:27:28 2003 +++ ./files/extra-patch-doc-ref Mon Apr 9 15:40:17 2007 @@ -1,12 +1,12 @@ ---- doc/mutt.man.orig Mon Jul 13 12:50:38 1998 -+++ doc/mutt.man Thu Oct 1 22:15:40 1998 -@@ -20,7 +20,8 @@ - .SH DESCRIPTION - Mutt is a small but very powerful text based program for reading electronic - mail under unix operating systems, including support color terminals, MIME, --and a threaded sorting mode. -+and a threaded sorting mode. Details of how to use all of this is +--- doc/mutt.man.orig Wed Apr 4 07:37:13 2007 ++++ doc/mutt.man Mon Apr 9 15:39:36 2007 +@@ -57,7 +57,8 @@ + .PP + Mutt is a small but very powerful text based program for reading and sending electronic + mail under unix operating systems, including support for color terminals, MIME, +-OpenPGP, and a threaded sorting mode. ++OpenPGP, and a threaded sorting mode. Details of how to use all of this is +available in \fI${DOCSDIR}\fP. .SH OPTIONS - .IP "-a \fIfile\fP" - Attach a file to your message using MIME. + .PP + .IP "-A \fIalias\fP" diff -ru /usr/ports/mail/mutt-devel/files/patch-examples ./files/patch-examples --- /usr/ports/mail/mutt-devel/files/patch-examples Thu Mar 1 15:35:34 2007 +++ ./files/patch-examples Mon Apr 9 15:24:51 2007 @@ -48,14 +48,14 @@ ** (S/MIME only) */ { "smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0}, ---- Makefile.am.orig Wed Aug 30 14:30:28 2006 -+++ Makefile.am Wed Aug 30 14:31:49 2006 +--- Makefile.am.orig Mon Apr 9 15:21:50 2007 ++++ Makefile.am Mon Apr 9 15:24:06 2007 @@ -13,7 +13,7 @@ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@ --BUILT_SOURCES = keymap_defs.h patchlist.c -+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc +-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h ++BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h Muttrc bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = $(BUILT_SOURCES) \ diff -ru /usr/ports/mail/mutt-devel/files/patch-hcache-db ./files/patch-hcache-db --- /usr/ports/mail/mutt-devel/files/patch-hcache-db Tue Feb 8 16:07:15 2005 +++ ./files/patch-hcache-db Mon Apr 9 15:29:17 2007 @@ -1,11 +1,18 @@ ---- configure.in.orig2 Tue Feb 8 09:02:55 2005 -+++ configure.in Tue Feb 8 09:04:01 2005 -@@ -811,7 +811,7 @@ +--- configure.ac.orig2 Mon Apr 9 15:24:59 2007 ++++ configure.ac Mon Apr 9 15:28:42 2007 +@@ -886,12 +886,12 @@ + test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + for d in $ac_bdb_prefix; do + bdbpfx="$bdbpfx $d" +- for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do ++ for v in BerkeleyDB.4.2; do bdbpfx="$bdbpfx $d/$v" done done -- BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" -+ BDB_VERSIONS="db-4.2 db4.2 db42 ''" - AC_MSG_CHECKING([for BerkeleyDB > 4.0]) +- BDB_VERSIONS="db-4 db4 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" +- AC_MSG_CHECKING([for BerkeleyDB > 4.0]) ++ BDB_VERSIONS="db-4.2 db4.2 db42 ''" ++ AC_MSG_CHECKING([for BerkeleyDB = 4.2]) for d in $bdbpfx; do BDB_INCLUDE_DIR="" + BDB_LIB_DIR="" diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Thu Mar 1 15:35:34 2007 +++ ./scripts/generate-plist Mon Apr 9 17:21:03 2007 @@ -38,10 +38,10 @@ share/locale/da/LC_MESSAGES/mutt.mo share/locale/de/LC_MESSAGES/mutt.mo share/locale/el/LC_MESSAGES/mutt.mo -share/locale/eu/LC_MESSAGES/mutt.mo share/locale/eo/LC_MESSAGES/mutt.mo share/locale/es/LC_MESSAGES/mutt.mo share/locale/et/LC_MESSAGES/mutt.mo +share/locale/eu/LC_MESSAGES/mutt.mo share/locale/fr/LC_MESSAGES/mutt.mo share/locale/ga/LC_MESSAGES/mutt.mo share/locale/gl/LC_MESSAGES/mutt.mo @@ -92,6 +92,7 @@ %%EXAMPLESDIR%%/colors.default %%EXAMPLESDIR%%/colors.linux %%EXAMPLESDIR%%/gpg.rc +%%EXAMPLESDIR%%/mutt_xtitle %%EXAMPLESDIR%%/pgp2.rc %%EXAMPLESDIR%%/pgp6.rc %%EXAMPLESDIR%%/sample.mailcap >Release-Note: >Audit-Trail: >Unformatted: