From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 1 21:10:05 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 480C816A408 for ; Thu, 1 Mar 2007 21:10:05 +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 0EBFF13C48E for ; Thu, 1 Mar 2007 21:10:05 +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 l21LA4Im064989 for ; Thu, 1 Mar 2007 21:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l21LA4B8064986; Thu, 1 Mar 2007 21:10:04 GMT (envelope-from gnats) Resent-Date: Thu, 1 Mar 2007 21:10:04 GMT Resent-Message-Id: <200703012110.l21LA4B8064986@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 EB3EA16A406 for ; Thu, 1 Mar 2007 21:08:21 +0000 (UTC) (envelope-from udo.schweigert@siemens.com) Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2]) by mx1.freebsd.org (Postfix) with ESMTP id 6935C13C4B4 for ; Thu, 1 Mar 2007 21:08:21 +0000 (UTC) (envelope-from udo.schweigert@siemens.com) Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.6/8.12.6) with ESMTP id l21KpIgi020033 for ; Thu, 1 Mar 2007 21:51:18 +0100 Received: from mars.cert.siemens.com (mars.cert.siemens.com [139.25.19.9]) by mail1.siemens.de (8.12.6/8.12.6) with ESMTP id l21KpIiZ014818 for ; Thu, 1 Mar 2007 21:51:18 +0100 Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64]) by mars.cert.siemens.com (8.14.0/8.14.0/$SiemensCERT: mail/cert.mc.pre, v 1.68 2006/12/29 07:12:05 mailadm Exp $) with ESMTP id l21KpI90016822 for ; Thu, 1 Mar 2007 21:51:18 +0100 (CET) Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64]) by alaska.cert.siemens.com (8.14.0/8.14.0/$Ust: hosts/alaska/mail/config.mc, v 1.20 2006/06/21 05:39:02 ust Exp $) with ESMTP id l21KpIRL093629 for ; Thu, 1 Mar 2007 21:51:18 +0100 (CET) (envelope-from ust@alaska.cert.siemens.com) Received: (from ust@localhost) by alaska.cert.siemens.com (8.14.0/8.14.0/$Ust: hosts/alaska/mail/submit.mc,v 1.6 2004/08/29 16:18:57 ust Exp $) id l21KpIss067983; Thu, 1 Mar 2007 21:51:18 +0100 (CET) (envelope-from ust) Message-Id: <200703012051.l21KpIss067983@alaska.cert.siemens.com> Date: Thu, 1 Mar 2007 21:51:18 +0100 (CET) From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109730: 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: Thu, 01 Mar 2007 21:10:05 -0000 >Number: 109730 >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: Thu Mar 01 21:10:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 6.2-RELEASE-p1 i386 >Organization: >Environment: >Description: Maintainer update of mail/mutt-devel: - Update the WITH_MUTT_GREETING_PATCH >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Thu Mar 1 15:35:34 2007 +++ ./Makefile Thu Mar 1 15:38:49 2007 @@ -206,11 +206,6 @@ IGNORE= cannot install: the WITH_MUTT_ASSUMED_CHARSET_PATCH and WITH_MUTT_NNTP are not compatible .endif .endif -.if defined(WITH_MUTT_GREETING_PATCH) -.if defined(WITH_MUTT_NNTP) -IGNORE= cannot install: the WITH_MUTT_GREETING_PATCH and WITH_MUTT_NNTP are not compatible -.endif -.endif .if defined (MUTT_LITE) WITHOUT_MUTT_XML= yes diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-greeting ./files/extra-patch-greeting --- /usr/ports/mail/mutt-devel/files/extra-patch-greeting Tue Jan 9 23:10:26 2007 +++ ./files/extra-patch-greeting Thu Mar 1 15:32:35 2007 @@ -1,5 +1,5 @@ ---- globals.h.orig 2006-08-11 12:07:12.000000000 +0300 -+++ globals.h 2006-12-14 12:26:14.000000000 +0200 +--- globals.h 2007-01-30 21:49:02.000000000 +0200 ++++ globals.h 2007-03-01 14:14:45.000000000 +0200 @@ -50,6 +50,7 @@ WHERE char *FolderFormat; WHERE char *ForwFmt; @@ -8,8 +8,8 @@ WHERE char *HdrFmt; WHERE char *Homedir; WHERE char *Hostname; ---- hdrline.c.orig 2006-04-28 22:43:51.000000000 +0300 -+++ hdrline.c 2006-12-14 16:47:16.000000000 +0200 +--- hdrline.c 2006-04-29 22:10:52.000000000 +0300 ++++ hdrline.c 2007-03-01 14:14:45.000000000 +0200 @@ -730,3 +730,61 @@ mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags); @@ -72,11 +72,11 @@ + + return(src); +} ---- init.h.orig 2006-08-11 12:04:04.000000000 +0300 -+++ init.h 2006-12-14 16:49:16.000000000 +0200 -@@ -710,6 +710,22 @@ - ** a regular expression that will match the whole name so mutt will expand - ** "Franklin" to "Franklin, Steve". +--- init.h 2006-11-20 19:49:08.000000000 +0200 ++++ init.h 2007-03-01 14:14:45.000000000 +0200 +@@ -695,6 +695,22 @@ + ** .pp + ** Defaults to the contents of the environment variable EMAIL. */ + { "greeting", DT_STR, R_NONE, UL &Greeting, UL "" }, + /* @@ -94,24 +94,24 @@ + ** .dt %v .dd first name of recipient + ** .de + */ - { "hdr_format", DT_SYN, R_NONE, UL "index_format", 0 }, + { "gecos_mask", DT_RX, R_NONE, UL &GecosMask, UL "^[^,]*" }, /* - */ ---- PATCHES.orig 2006-08-11 13:55:43.000000000 +0300 -+++ PATCHES 2006-12-14 15:59:14.000000000 +0200 + ** .pp +--- PATCHES 2006-10-30 04:30:55.000000000 +0200 ++++ PATCHES 2007-03-01 14:14:45.000000000 +0200 @@ -0,0 +1 @@ +vc.greeting ---- protos.h.orig 2006-07-12 02:32:28.000000000 +0300 -+++ protos.h 2006-12-14 15:43:09.000000000 +0200 -@@ -509,4 +509,5 @@ +--- protos.h 2007-01-30 21:49:03.000000000 +0200 ++++ protos.h 2007-03-01 14:14:45.000000000 +0200 +@@ -504,4 +504,5 @@ void ci_bounce_message (HEADER *, int *); int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *); - +const char *greeting_string (char *, size_t, char, const char *, const char *, + const char *, const char *, unsigned long, format_flag); ---- send.c.orig 2006-03-03 12:12:34.000000000 +0200 -+++ send.c 2006-12-14 15:57:36.000000000 +0200 +--- send.c 2006-10-03 05:48:58.000000000 +0300 ++++ send.c 2007-03-01 14:14:45.000000000 +0200 @@ -395,6 +395,18 @@ } } @@ -131,7 +131,7 @@ void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out) { char buffer[STRING]; -@@ -1268,6 +1280,7 @@ +@@ -1269,6 +1281,7 @@ if (option (OPTHDRS)) process_user_header (msg->env); >Release-Note: >Audit-Trail: >Unformatted: