View | Details | Raw Unified | Return to bug 113718
Collapse All | Expand All

(-)./Makefile (-8 / +11 lines)
Lines 106-113 Link Here
106
#
106
#
107
107
108
PORTNAME=	mutt-devel
108
PORTNAME=	mutt-devel
109
PORTVERSION=	1.5.15
109
PORTVERSION=	1.5.16
110
PORTREVISION?=	1
110
PORTREVISION?=	0
111
CATEGORIES+=	mail ipv6
111
CATEGORIES+=	mail ipv6
112
.if defined(WITH_MUTT_NNTP)
112
.if defined(WITH_MUTT_NNTP)
113
CATEGORIES+=	news
113
CATEGORIES+=	news
Lines 136-142 Link Here
136
		http://cedricduval.free.fr/mutt/patches/download/:cd \
136
		http://cedricduval.free.fr/mutt/patches/download/:cd \
137
		http://home.woolridge.ca/mutt/patches/:dw \
137
		http://home.woolridge.ca/mutt/patches/:dw \
138
		http://www.spinnaker.de/mutt/compressed/:rr \
138
		http://www.spinnaker.de/mutt/compressed/:rr \
139
		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp
139
		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp \
140
		http://vc.org.ua/mutt/:vc
140
141
141
MAINTAINER?=	udo.schweigert@siemens.com
142
MAINTAINER?=	udo.schweigert@siemens.com
142
COMMENT?=	The Mongrel of Mail User Agents (development version)
143
COMMENT?=	The Mongrel of Mail User Agents (development version)
Lines 190-199 Link Here
190
.if !defined(AC_PATCH_VERSION)
191
.if !defined(AC_PATCH_VERSION)
191
AC_PATCH_VERSION=	${PORTVERSION}
192
AC_PATCH_VERSION=	${PORTVERSION}
192
.endif
193
.endif
194
.if !defined(VC_PATCH_VERSION)
195
VC_PATCH_VERSION=	${PORTVERSION}
196
.endif
193
.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
197
.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
194
WITH_MUTT_IMAP_HEADER_CACHE=	yes
198
WITH_MUTT_IMAP_HEADER_CACHE=	yes
195
.endif
199
.endif
196
.if defined(WITH_MUTT_SIDEBAR_PATCH)
200
.if defined(WITH_MUTT_SIDEBAR_PATCH)
201
IGNORE=	the WITH_MUTT_SIDEBAR_PATCH does not work at the moment
197
.if defined(WITH_MUTT_NNTP)
202
.if defined(WITH_MUTT_NNTP)
198
IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
203
IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
199
.endif
204
.endif
Lines 335-345 Link Here
335
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
340
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
336
.endif
341
.endif
337
342
338
.if defined(WITH_MUTT_GREETING_PATCH)
339
post-patch::
340
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-greeting
341
.endif
342
343
.if defined(WITHOUT_MUTT_FLOCK)
343
.if defined(WITHOUT_MUTT_FLOCK)
344
CONFIGURE_ARGS+=	--disable-flock
344
CONFIGURE_ARGS+=	--disable-flock
345
.else
345
.else
Lines 432-437 Link Here
432
	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \
432
	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \
433
		 ${WRKDIR}/patch-sidebar
433
		 ${WRKDIR}/patch-sidebar
434
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar
434
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar
435
.endif
436
.if defined(WITH_MUTT_GREETING_PATCH)
437
PATCHFILES+=	mutt-${VC_PATCH_VERSION}.vc.greeting:vc
435
.endif
438
.endif
436
439
437
WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
440
WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
(-)./distinfo (-18 / +21 lines)
Lines 1-24 Link Here
1
MD5 (mutt/mutt-1.5.15.tar.gz) = b2c1eb45fd958f6589ee52a98f2a3ce1
1
MD5 (mutt/mutt-1.5.16.tar.gz) = 10eff7024dbb7ce1f773d688a69ea9db
2
SHA256 (mutt/mutt-1.5.15.tar.gz) = 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
2
SHA256 (mutt/mutt-1.5.16.tar.gz) = 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
3
SIZE (mutt/mutt-1.5.15.tar.gz) = 3517899
3
SIZE (mutt/mutt-1.5.16.tar.gz) = 3534894
4
MD5 (mutt/patch-1.5.15.rr.compressed.gz) = b2c3af62e5469826e445113bc85ce0c3
4
MD5 (mutt/patch-1.5.16.rr.compressed.gz) = 37c6bc11b35ef49d098de891c51a810c
5
SHA256 (mutt/patch-1.5.15.rr.compressed.gz) = 4542be2062337224783631f5730d97a5a351a69737bf772b81010e5be16277f7
5
SHA256 (mutt/patch-1.5.16.rr.compressed.gz) = fc0cc13df532eef75e7c39849f7de0898af7f57fc0566786e71d8142e022cc3b
6
SIZE (mutt/patch-1.5.15.rr.compressed.gz) = 10084
6
SIZE (mutt/patch-1.5.16.rr.compressed.gz) = 10110
7
MD5 (mutt/patch-1.5.15.vvv.nntp.2.gz) = f4724392ca865125bc2be80b643d175c
7
MD5 (mutt/patch-1.5.16.vvv.nntp.2.gz) = bc0358da1d71ddd0b3c8bc11bd32259a
8
SHA256 (mutt/patch-1.5.15.vvv.nntp.2.gz) = ed0dc2337148ab4a884a94fd9472a76a13f74659372facef771f8b0eda5e4846
8
SHA256 (mutt/patch-1.5.16.vvv.nntp.2.gz) = dd9153f35099fd7686698541ff40fdcc79cea9e9154ca2000b9e818573c968da
9
SIZE (mutt/patch-1.5.15.vvv.nntp.2.gz) = 55116
9
SIZE (mutt/patch-1.5.16.vvv.nntp.2.gz) = 55176
10
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
10
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
11
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
11
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
12
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
12
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
13
MD5 (mutt/patch-1.5.15.vvv.initials.gz) = 414606ce18de730d1bb6478899532644
13
MD5 (mutt/patch-1.5.16.vvv.initials.gz) = ff11da4b723127647c986cd027f7fdd2
14
SHA256 (mutt/patch-1.5.15.vvv.initials.gz) = 9385915adb106abba6f1576be58901f368688b1d55ef454e3993394828ee17e1
14
SHA256 (mutt/patch-1.5.16.vvv.initials.gz) = c6788b1092c0ab4f8d28d5e570804bbedf880a4172452b8231da5bed65bb74de
15
SIZE (mutt/patch-1.5.15.vvv.initials.gz) = 684
15
SIZE (mutt/patch-1.5.16.vvv.initials.gz) = 679
16
MD5 (mutt/patch-1.5.15.vvv.quote.gz) = 93276f86e544e69a0e83808279f3b175
16
MD5 (mutt/patch-1.5.16.vvv.quote.gz) = 41f8945f5114687974e2a86bcf415f27
17
SHA256 (mutt/patch-1.5.15.vvv.quote.gz) = 4afe6cc178b08ebd735d04053198f6539c87a0cdc1c5a8a51affc3598504e3a5
17
SHA256 (mutt/patch-1.5.16.vvv.quote.gz) = b08db26c185693aefd0d398eef9cfd8a90a01d627dc5e2223cee2076d2ed0ef3
18
SIZE (mutt/patch-1.5.15.vvv.quote.gz) = 1585
18
SIZE (mutt/patch-1.5.16.vvv.quote.gz) = 2036
19
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
19
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
20
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
20
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
21
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
21
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
22
MD5 (mutt/patch-1.5.15.sidebar.20070408.txt) = 8fcae5ea38eac45616762d76f7cadacf
22
MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0
23
SHA256 (mutt/patch-1.5.15.sidebar.20070408.txt) = 3b61cd21cbe5bd5851a5441ce049ace3329f710bf5224064a6293d379d14c5f8
23
SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986
24
SIZE (mutt/patch-1.5.15.sidebar.20070408.txt) = 51101
24
SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526
25
MD5 (mutt/patch-1.5.16.rr.compressed.gz) = 37c6bc11b35ef49d098de891c51a810c
26
SHA256 (mutt/patch-1.5.16.rr.compressed.gz) = fc0cc13df532eef75e7c39849f7de0898af7f57fc0566786e71d8142e022cc3b
27
SIZE (mutt/patch-1.5.16.rr.compressed.gz) = 10110
(-)./files/extra-patch-greeting (-141 lines)
Lines 1-141 Link Here
1
--- globals.h	2007-01-30 21:49:02.000000000 +0200
2
+++ globals.h	2007-03-01 14:14:45.000000000 +0200
3
@@ -50,6 +50,7 @@
4
 WHERE char *FolderFormat;
5
 WHERE char *ForwFmt;
6
 WHERE char *Fqdn;
7
+WHERE char *Greeting;
8
 WHERE char *HdrFmt;
9
 WHERE char *Homedir;
10
 WHERE char *Hostname;
11
--- hdrline.c	2006-04-29 22:10:52.000000000 +0300
12
+++ hdrline.c	2007-03-01 14:14:45.000000000 +0200
13
@@ -730,3 +730,61 @@
14
 
15
   mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags);
16
 }
17
+
18
+/* %n = recipient name
19
+ * %u = user (login) name of recipient
20
+ * %v = first name of recipient	*/
21
+const char *
22
+greeting_string (char *dest,
23
+		size_t destlen,
24
+		char op,
25
+		const char *src,
26
+		const char *prefix,
27
+		const char *ifstring,
28
+		const char *elsestring,
29
+		unsigned long data,
30
+		format_flag flags)
31
+{
32
+  HEADER *hdr = (HEADER *)data;
33
+  char *p, buf2[SHORT_STRING];
34
+
35
+  dest[0] = '\0';
36
+  switch (op)
37
+  {
38
+    case 'n':
39
+      mutt_format_s (dest, destlen, prefix, mutt_get_name (hdr->env->to));
40
+      break;
41
+
42
+    case 'u':
43
+      if (hdr->env->to)
44
+      {
45
+	strfcpy (buf2, mutt_addr_for_display (hdr->env->to), sizeof (buf2));
46
+	if ((p = strpbrk (buf2, "%@")))
47
+	  *p = '\0';
48
+      }
49
+      else
50
+	buf2[0] = '\0';
51
+      mutt_format_s (dest, destlen, prefix, buf2);
52
+      break;
53
+
54
+    case 'v':
55
+      if (hdr->env->to)
56
+	mutt_format_s (buf2, sizeof (buf2), prefix, mutt_get_name (hdr->env->to));
57
+      else if (hdr->env->cc)
58
+	mutt_format_s (buf2, sizeof (buf2), prefix, mutt_get_name (hdr->env->cc));
59
+      else
60
+	*buf2 = '\0';
61
+      if ((p = strpbrk (buf2, " %@")))
62
+	*p = '\0';
63
+      mutt_format_s (dest, destlen, prefix, buf2);
64
+      break;
65
+
66
+    default:
67
+      snprintf (dest, destlen, "%%%s%c", prefix, op);
68
+      break;
69
+  }
70
+  if (flags & M_FORMAT_OPTIONAL)
71
+    mutt_FormatString (dest, destlen, elsestring, greeting_string, data, flags);
72
+
73
+  return(src);
74
+}
75
--- init.h	2006-11-20 19:49:08.000000000 +0200
76
+++ init.h	2007-03-01 14:14:45.000000000 +0200
77
@@ -695,6 +695,22 @@
78
   ** .pp
79
   ** Defaults to the contents of the environment variable EMAIL.
80
   */
81
+  { "greeting",		DT_STR,	 R_NONE, UL &Greeting, UL "" },
82
+  /*
83
+  ** .pp
84
+  ** When set, this is the string that will precede every message as a
85
+  ** greeting phrase to the recipients.
86
+  ** .pp
87
+  ** ``Format strings'' are similar to the strings used in the ``C''
88
+  ** function printf to format output (see the man page for more detail).
89
+  ** The following sequences are defined in Mutt:
90
+  ** .pp
91
+  ** .dl
92
+  ** .dt %n .dd recipient name
93
+  ** .dt %u .dd user (login) name of recipient
94
+  ** .dt %v .dd first name of recipient
95
+  ** .de
96
+  */
97
   { "gecos_mask",	DT_RX,	 R_NONE, UL &GecosMask, UL "^[^,]*" },
98
   /*
99
   ** .pp
100
--- PATCHES	2006-10-30 04:30:55.000000000 +0200
101
+++ PATCHES	2007-03-01 14:14:45.000000000 +0200
102
@@ -0,0 +1 @@
103
+vc.greeting
104
--- protos.h	2007-01-30 21:49:03.000000000 +0200
105
+++ protos.h	2007-03-01 14:14:45.000000000 +0200
106
@@ -504,4 +504,5 @@
107
 void ci_bounce_message (HEADER *, int *);
108
 int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *);
109
 
110
-
111
+const char *greeting_string (char *, size_t, char, const char *, const char *,
112
+		const char *, const char *, unsigned long, format_flag);
113
--- send.c	2006-10-03 05:48:58.000000000 +0300
114
+++ send.c	2007-03-01 14:14:45.000000000 +0200
115
@@ -395,6 +395,18 @@
116
   }
117
 }
118
 
119
+void mutt_make_greeting (HEADER *hdr, FILE *out, int flags)
120
+{
121
+  char buffer[STRING];
122
+  if (Greeting)
123
+  {
124
+    mutt_FormatString(buffer, sizeof(buffer), Greeting, greeting_string,
125
+		      (unsigned long) hdr, flags);
126
+    fputs(buffer, out);
127
+    fputc ('\n', out);
128
+  }
129
+}
130
+
131
 void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out)
132
 {
133
   char buffer[STRING];
134
@@ -1269,6 +1281,7 @@
135
     if (option (OPTHDRS))
136
       process_user_header (msg->env);
137
 
138
+    mutt_make_greeting(msg, tempfp, flags);
139
 
140
     if (option (OPTSIGONTOP) && (! (flags & (SENDMAILX | SENDKEY)) && Editor && mutt_strcmp (Editor, "builtin") != 0))
141
       append_signature (tempfp);
(-)./files/patch-02 (-7 / +9 lines)
Lines 1-7 Link Here
1
--- doc/Makefile.am.orig	Tue Mar  6 17:39:29 2007
1
--- doc/Makefile.am.orig	Wed Jun 13 10:15:07 2007
2
+++ doc/Makefile.am	Tue Mar  6 17:40:41 2007
2
+++ doc/Makefile.am	Wed Jun 13 10:17:15 2007
3
@@ -42,7 +42,7 @@
3
@@ -41,7 +41,7 @@
4
 all: ../makedoc$(EXEEXT)
4
 all:
5
 	$(MAKE) makedoc-all
5
 	$(MAKE) makedoc-all
6
 
6
 
7
-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
7
-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
Lines 9-15 Link Here
9
 
9
 
10
 install-data-local: makedoc-all instdoc
10
 install-data-local: makedoc-all instdoc
11
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
11
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
12
@@ -63,9 +63,6 @@
12
@@ -62,9 +62,6 @@
13
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
13
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
14
 	done
14
 	done
15
 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
15
 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
Lines 19-29 Link Here
19
 
19
 
20
 uninstall-local:
20
 uninstall-local:
21
 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
21
 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
22
@@ -82,7 +79,7 @@
22
@@ -81,9 +78,7 @@
23
 
23
 
24
 check:
24
 check:
25
 manual.txt: manual.html
25
 manual.txt: manual.html
26
-	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
26
-	-lynx -dump -nolist -with_backspaces $^ > $@ || \
27
-	w3m -dump $^ > $@ || \
28
-	elinks -dump -no-numbering -no-references $^ > $@
27
+	-lynx -dump -nolist -with_backspaces manual.html > $@
29
+	-lynx -dump -nolist -with_backspaces manual.html > $@
28
 
30
 
29
 manual.html: $(srcdir)/html.xsl stamp-doc-xml
31
 manual.html: $(srcdir)/html.xsl stamp-doc-xml

Return to bug 113718