From owner-freebsd-ports Sat Dec 21 10:14:38 2002 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19C8237B415; Sat, 21 Dec 2002 10:14:35 -0800 (PST) Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AF1343EE8; Sat, 21 Dec 2002 10:14:33 -0800 (PST) (envelope-from udo.schweigert@siemens.com) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.11.6/8.11.6) with ESMTP id gBLIEQO03963; Sat, 21 Dec 2002 19:14:26 +0100 (MET) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail2.siemens.de (8.11.6/8.11.6) with ESMTP id gBLIEQg24428; Sat, 21 Dec 2002 19:14:26 +0100 (MET) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) by mars.cert.siemens.de (8.12.6/8.12.6/Siemens CERT [ $Revision: 1.33 ]) with ESMTP id gBLIEQOs025513; Sat, 21 Dec 2002 19:14:26 +0100 (CET) (envelope-from ust@alaska.cert.siemens.de) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.14 ]) with ESMTP id gBLIEQOn062701; Sat, 21 Dec 2002 19:14:26 +0100 (CET) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.3 ]) id gBLIEQPM026959; Sat, 21 Dec 2002 19:14:26 +0100 (CET) (envelope-from ust) Date: Sat, 21 Dec 2002 19:14:26 +0100 From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: Re: ports/46043: maintainer-update of mail/mutt-devel Message-ID: <20021221181426.GA59858@alaska.cert.siemens.de> Mail-Followup-To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org References: <200212062335.gB6NZNt7085149@alaska.cert.siemens.de> <200212062340.gB6Ne3vg065597@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200212062340.gB6Ne3vg065597@freefall.freebsd.org> X-Operating-System: FreeBSD 4.7-STABLE User-Agent: Mutt/1.5.3i Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org And again a new version of the port. We now have mutt-1.5.3. (patch against the current version in the ports-tree) diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Mon Nov 11 00:09:28 2002 +++ ./Makefile Sat Dec 21 19:03:46 2002 @@ -67,15 +67,15 @@ # WITH_MUTT_IFDEF_PATCH PORTNAME= mutt-devel -PORTVERSION= 1.5.1 -PORTREVISION?= 4 +PORTVERSION= 1.5.3 +#PORTREVISION?= 0 CATEGORIES+= mail .if defined(WITH_MUTT_NNTP) CATEGORIES+= news .endif MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \ ftp://ftp.parodius.com/pub/mutt/devel/ \ - ftp://ftp.mutt.org/pub/mutt/devel/ + ftp://ftp.mutt.org/mutt/devel/ DISTNAME= mutt-${PORTVERSION}i MAINTAINER= udo.schweigert@siemens.com @@ -178,9 +178,10 @@ LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl .endif .if defined(WITH_MUTT_PGP_PATCH) -SGML_NEEDED= yes -pre-configure:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw +.error The WITH_MUTT_PGP_PATCH option is currently not available +#SGML_NEEDED= yes +#pre-configure:: +# ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw .endif .if defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT) pre-configure:: @@ -220,20 +221,24 @@ SGML_NEEDED= yes .endif .if defined(WITH_MUTT_EDIT_THREADS) -PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 +.error The WITH_MUTT_EDIT_THREADS option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 CONFIGURE_ARGS+= --enable-imap-edit-threads SGML_NEEDED= yes .endif .if defined(WITH_MUTT_SIGNATURE_MENU) -PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 +.error The WITH_MUTT_SIGNATURE_MENU option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 SGML_NEEDED= yes .endif .if defined(WITH_MUTT_IFDEF_PATCH) -PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 +.error The WITH_MUTT_IFDEF_PATCH option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 SGML_NEEDED= yes .endif .if defined(WITH_MUTT_MBOX_HOOK_PATCH) -PATCHFILES+= patch-1.5.1.dw.mbox-hook.1 +.error The WITH_MUTT_MBOX_HOOK_PATCH option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.dw.mbox-hook.1 .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo Mon Sep 2 21:26:04 2002 +++ ./distinfo Sat Dec 21 17:52:45 2002 @@ -1,9 +1,5 @@ -MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da -MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8 -MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d -MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e -MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318 -MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f -MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3 -MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90 -MD5 (mutt/patch-1.5.1.dw.mbox-hook.1) = 2a04bc3bae302ed106c1f320398b902f +MD5 (mutt/mutt-1.5.3i.tar.gz) = 38a3dec075c7954a5fe62ce178310d22 +MD5 (mutt/patch-1.5.3.rr.compressed.gz) = 029b7bf58f53f4c7dcd542beac0c4757 +MD5 (mutt/patch-1.5.3.vvv.nntp.gz) = 6399a40b4a7ce3448b0329ceec38f35b +MD5 (mutt/patch-1.5.3.vvv.initials.gz) = 9397128c901c32b6de585ef089ead87f +MD5 (mutt/patch-1.5.3.vvv.quote.gz) = dc24cc5765dfbbf98a9c2027d950c07a diff -ru /usr/ports/mail/mutt-devel/files/patch-05 ./files/patch-05 --- /usr/ports/mail/mutt-devel/files/patch-05 Sun Jun 16 15:05:26 2002 +++ ./files/patch-05 Tue Dec 17 19:59:39 2002 @@ -63,8 +63,8 @@ { case -1: /* abort - don't resort */ return -1; ---- compose.c.orig Tue Mar 26 23:03:26 2002 -+++ compose.c Thu May 2 09:21:11 2002 +--- compose.c.orig Wed Dec 11 12:20:04 2002 ++++ compose.c Tue Dec 17 19:57:50 2002 @@ -173,7 +173,7 @@ char input_signas[SHORT_STRING]; @@ -78,14 +78,14 @@ char *p; switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "), -- _("ewsabf"))) -+ N_("ewsabf"))) +- _("eswabf"))) ++ N_("eswabf"))) { case 1: /* (e)ncrypt */ msg->security |= SMIMEENCRYPT; @@ -239,7 +239,7 @@ msg->security |= SMIMEENCRYPT; - switch (mutt_multi_choice (_("1: DES, 2: Tripple-DES, 3: RC2-40," + switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40," " 4: RC2-64, 5: RC2-128, or (f)orget it? "), - _("12345f"))) { + N_("12345f"))) { diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Mon Sep 2 21:26:05 2002 +++ ./scripts/generate-plist Tue Dec 17 20:05:05 2002 @@ -63,6 +63,7 @@ share/doc/mutt/ABOUT-NLS share/doc/mutt/COPYRIGHT share/doc/mutt/ChangeLog +share/doc/mutt/ChangeLog.old share/doc/mutt/GPL share/doc/mutt/INSTALL share/doc/mutt/NEWS @@ -121,7 +122,7 @@ fi if [ "$MUTT_HTML" = "yes" ]; then - html=361 + html=363 if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then html=$(($html + 5)) fi To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message