diff options
| -rw-r--r-- | mail/mutt-devel/Makefile | 19 | ||||
| -rw-r--r-- | mail/mutt-devel/distinfo | 36 | ||||
| -rw-r--r-- | mail/mutt-devel/files/extra-patch-greeting | 141 | ||||
| -rw-r--r-- | mail/mutt-devel/files/patch-02 | 16 |
4 files changed, 38 insertions, 174 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index cca41cc6879..e85f16473a2 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -106,8 +106,8 @@ # PORTNAME= mutt-devel -PORTVERSION= 1.5.15 -PORTREVISION?= 1 +PORTVERSION= 1.5.16 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -136,7 +136,8 @@ PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://cedricduval.free.fr/mutt/patches/download/:cd \ http://home.woolridge.ca/mutt/patches/:dw \ http://www.spinnaker.de/mutt/compressed/:rr \ - http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp + http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp \ + http://vc.org.ua/mutt/:vc MAINTAINER?= udo.schweigert@siemens.com COMMENT?= The Mongrel of Mail User Agents (development version) @@ -190,10 +191,14 @@ DW_MBOX_PATCH_VERSION= ${DW_PATCH_VERSION} .if !defined(AC_PATCH_VERSION) AC_PATCH_VERSION= ${PORTVERSION} .endif +.if !defined(VC_PATCH_VERSION) +VC_PATCH_VERSION= ${PORTVERSION} +.endif .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE) WITH_MUTT_IMAP_HEADER_CACHE= yes .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) +IGNORE= the WITH_MUTT_SIDEBAR_PATCH does not work at the moment .if defined(WITH_MUTT_NNTP) IGNORE= cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible .endif @@ -335,11 +340,6 @@ post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply .endif -.if defined(WITH_MUTT_GREETING_PATCH) -post-patch:: - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-greeting -.endif - .if defined(WITHOUT_MUTT_FLOCK) CONFIGURE_ARGS+= --disable-flock .else @@ -433,6 +433,9 @@ pre-patch:: ${WRKDIR}/patch-sidebar @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar .endif +.if defined(WITH_MUTT_GREETING_PATCH) +PATCHFILES+= mutt-${VC_PATCH_VERSION}.vc.greeting:vc +.endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index d6f20aad7cf..2cce123ea8d 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -1,24 +1,24 @@ -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.2.gz) = f4724392ca865125bc2be80b643d175c -SHA256 (mutt/patch-1.5.15.vvv.nntp.2.gz) = ed0dc2337148ab4a884a94fd9472a76a13f74659372facef771f8b0eda5e4846 -SIZE (mutt/patch-1.5.15.vvv.nntp.2.gz) = 55116 +MD5 (mutt/mutt-1.5.16.tar.gz) = 10eff7024dbb7ce1f773d688a69ea9db +SHA256 (mutt/mutt-1.5.16.tar.gz) = 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83 +SIZE (mutt/mutt-1.5.16.tar.gz) = 3534894 +MD5 (mutt/patch-1.5.16.rr.compressed.gz) = 37c6bc11b35ef49d098de891c51a810c +SHA256 (mutt/patch-1.5.16.rr.compressed.gz) = fc0cc13df532eef75e7c39849f7de0898af7f57fc0566786e71d8142e022cc3b +SIZE (mutt/patch-1.5.16.rr.compressed.gz) = 10110 +MD5 (mutt/patch-1.5.16.vvv.nntp.2.gz) = bc0358da1d71ddd0b3c8bc11bd32259a +SHA256 (mutt/patch-1.5.16.vvv.nntp.2.gz) = dd9153f35099fd7686698541ff40fdcc79cea9e9154ca2000b9e818573c968da +SIZE (mutt/patch-1.5.16.vvv.nntp.2.gz) = 55176 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.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/patch-1.5.16.vvv.initials.gz) = ff11da4b723127647c986cd027f7fdd2 +SHA256 (mutt/patch-1.5.16.vvv.initials.gz) = c6788b1092c0ab4f8d28d5e570804bbedf880a4172452b8231da5bed65bb74de +SIZE (mutt/patch-1.5.16.vvv.initials.gz) = 679 +MD5 (mutt/patch-1.5.16.vvv.quote.gz) = 41f8945f5114687974e2a86bcf415f27 +SHA256 (mutt/patch-1.5.16.vvv.quote.gz) = b08db26c185693aefd0d398eef9cfd8a90a01d627dc5e2223cee2076d2ed0ef3 +SIZE (mutt/patch-1.5.16.vvv.quote.gz) = 2036 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.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 +MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0 +SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986 +SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526 diff --git a/mail/mutt-devel/files/extra-patch-greeting b/mail/mutt-devel/files/extra-patch-greeting deleted file mode 100644 index 0449b046305..00000000000 --- a/mail/mutt-devel/files/extra-patch-greeting +++ /dev/null @@ -1,141 +0,0 @@ ---- 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; - WHERE char *Fqdn; -+WHERE char *Greeting; - WHERE char *HdrFmt; - WHERE char *Homedir; - WHERE char *Hostname; ---- 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); - } -+ -+/* %n = recipient name -+ * %u = user (login) name of recipient -+ * %v = first name of recipient */ -+const char * -+greeting_string (char *dest, -+ size_t destlen, -+ char op, -+ const char *src, -+ const char *prefix, -+ const char *ifstring, -+ const char *elsestring, -+ unsigned long data, -+ format_flag flags) -+{ -+ HEADER *hdr = (HEADER *)data; -+ char *p, buf2[SHORT_STRING]; -+ -+ dest[0] = '\0'; -+ switch (op) -+ { -+ case 'n': -+ mutt_format_s (dest, destlen, prefix, mutt_get_name (hdr->env->to)); -+ break; -+ -+ case 'u': -+ if (hdr->env->to) -+ { -+ strfcpy (buf2, mutt_addr_for_display (hdr->env->to), sizeof (buf2)); -+ if ((p = strpbrk (buf2, "%@"))) -+ *p = '\0'; -+ } -+ else -+ buf2[0] = '\0'; -+ mutt_format_s (dest, destlen, prefix, buf2); -+ break; -+ -+ case 'v': -+ if (hdr->env->to) -+ mutt_format_s (buf2, sizeof (buf2), prefix, mutt_get_name (hdr->env->to)); -+ else if (hdr->env->cc) -+ mutt_format_s (buf2, sizeof (buf2), prefix, mutt_get_name (hdr->env->cc)); -+ else -+ *buf2 = '\0'; -+ if ((p = strpbrk (buf2, " %@"))) -+ *p = '\0'; -+ mutt_format_s (dest, destlen, prefix, buf2); -+ break; -+ -+ default: -+ snprintf (dest, destlen, "%%%s%c", prefix, op); -+ break; -+ } -+ if (flags & M_FORMAT_OPTIONAL) -+ mutt_FormatString (dest, destlen, elsestring, greeting_string, data, flags); -+ -+ return(src); -+} ---- 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 "" }, -+ /* -+ ** .pp -+ ** When set, this is the string that will precede every message as a -+ ** greeting phrase to the recipients. -+ ** .pp -+ ** ``Format strings'' are similar to the strings used in the ``C'' -+ ** function printf to format output (see the man page for more detail). -+ ** The following sequences are defined in Mutt: -+ ** .pp -+ ** .dl -+ ** .dt %n .dd recipient name -+ ** .dt %u .dd user (login) name of recipient -+ ** .dt %v .dd first name of recipient -+ ** .de -+ */ - { "gecos_mask", DT_RX, R_NONE, UL &GecosMask, UL "^[^,]*" }, - /* - ** .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 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 2006-10-03 05:48:58.000000000 +0300 -+++ send.c 2007-03-01 14:14:45.000000000 +0200 -@@ -395,6 +395,18 @@ - } - } - -+void mutt_make_greeting (HEADER *hdr, FILE *out, int flags) -+{ -+ char buffer[STRING]; -+ if (Greeting) -+ { -+ mutt_FormatString(buffer, sizeof(buffer), Greeting, greeting_string, -+ (unsigned long) hdr, flags); -+ fputs(buffer, out); -+ fputc ('\n', out); -+ } -+} -+ - void mutt_make_post_indent (CONTEXT *ctx, HEADER *cur, FILE *out) - { - char buffer[STRING]; -@@ -1269,6 +1281,7 @@ - if (option (OPTHDRS)) - process_user_header (msg->env); - -+ mutt_make_greeting(msg, tempfp, flags); - - if (option (OPTSIGONTOP) && (! (flags & (SENDMAILX | SENDKEY)) && Editor && mutt_strcmp (Editor, "builtin") != 0)) - append_signature (tempfp); diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02 index 72f183c35ca..ff8bd8eafb4 100644 --- a/mail/mutt-devel/files/patch-02 +++ b/mail/mutt-devel/files/patch-02 @@ -1,7 +1,7 @@ ---- doc/Makefile.am.orig Tue Mar 6 17:39:29 2007 -+++ doc/Makefile.am Tue Mar 6 17:40:41 2007 -@@ -42,7 +42,7 @@ - all: ../makedoc$(EXEEXT) +--- doc/Makefile.am.orig Wed Jun 13 10:15:07 2007 ++++ doc/Makefile.am Wed Jun 13 10:17:15 2007 +@@ -41,7 +41,7 @@ + all: $(MAKE) makedoc-all -makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt @@ -9,7 +9,7 @@ install-data-local: makedoc-all instdoc $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -63,9 +63,6 @@ +@@ -62,9 +62,6 @@ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ done -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) @@ -19,11 +19,13 @@ uninstall-local: for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \ -@@ -82,7 +79,7 @@ +@@ -81,9 +78,7 @@ check: manual.txt: manual.html -- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@ +- -lynx -dump -nolist -with_backspaces $^ > $@ || \ +- w3m -dump $^ > $@ || \ +- elinks -dump -no-numbering -no-references $^ > $@ + -lynx -dump -nolist -with_backspaces manual.html > $@ manual.html: $(srcdir)/html.xsl stamp-doc-xml |