Date: Sat, 13 May 2017 14:31:31 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440847 - in head/mail/mutt: . files Message-ID: <201705131431.v4DEVVPx079251@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Sat May 13 14:31:30 2017 New Revision: 440847 URL: https://svnweb.freebsd.org/changeset/ports/440847 Log: - Update VVV's patches to 1.8.2 [1] - Move dgc-deepif patch into the port as upstream disappeared - Rebase patches to eliminate offset when possible - Remove unused extra-patch-pgp-dw PR: 218834 [1] Submitted by: dereks@lifeofadishwasher.com (maintainer) Approved by: dereks@lifeofadishwasher.com (maintainer) Added: head/mail/mutt/files/patch-dgc-deepif (contents, props changed) Deleted: head/mail/mutt/files/extra-patch-pgp-dw Modified: head/mail/mutt/Makefile head/mail/mutt/distinfo head/mail/mutt/files/extra-patch-doc-ref head/mail/mutt/files/patch-doc_Muttrc head/mail/mutt/files/patch-muttlib.c head/mail/mutt/files/patch-smime-self Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Sat May 13 14:28:49 2017 (r440846) +++ head/mail/mutt/Makefile Sat May 13 14:31:30 2017 (r440847) @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= 1.8.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -17,13 +17,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ - https://web-beta.archive.org/web/20161116074212/http://home.uchicago.edu/~dgc/sw/mutt/:dgc \ - http://home.uchicago.edu/~dgc/sw/mutt/:dgc \ https://www.schrab.com/aaron/mutt/:ats \ http://vc.org.ua/mutt/:vc PATCH_DIST_STRIP= -p1 -PATCHFILES= patch-1.5.1.dgc.deepif.1:dgc \ - patch-1.7.0.ats.date_conditional.1:ats +PATCHFILES= patch-1.7.0.ats.date_conditional.1:ats MAINTAINER?= dereks@lifeofadishwasher.com COMMENT?= Small but powerful text based program for read/writing e-mail @@ -78,7 +75,7 @@ FORCEBASE64_DESC= Option to force base64 GPGME_DESC= Gpgme interface GREETING_PATCH_DESC= Greeting support HTML_DESC= HTML documentation -IDN_DESC+= International Domain Names (implies ICONV) +IDN_DESC= International Domain Names (implies ICONV) IFDEF_PATCH_DESC= ifdef feature LOCALES_FIX_DESC= Locales fix MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages @@ -145,7 +142,6 @@ NCURSES_USES= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -#NLS_CONFIGURE_OFF= --disable-nls NLS_IMPLIES= ICONV # Handle GSSAPI from various places @@ -216,7 +212,7 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-pa .include <bsd.port.options.mk> # un/comment as each VERSION is created for PORTVERSION -VVV_PATCH_VERSION= 1.8.0 +#VVV_PATCH_VERSION= 1.8.0 #GREETING_PATCH_VERSION= 1.8.1 .if !defined(VVV_PATCH_VERSION) @@ -296,11 +292,9 @@ pre-configure:: ${WRKSRC}/imap/auth_gss.c .endif -.if ${PORT_OPTIONS:MHCACHE_BDB} -CONFIGURE_SED= -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' -pre-configure:: - @${REINPLACE_CMD} -E ${CONFIGURE_SED} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.ac -.endif +pre-configure-HCACHE_BDB-on: + @${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.ac .if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML} BUILD_DEPENDS+= xsltproc:textproc/libxslt \ Modified: head/mail/mutt/distinfo ============================================================================== --- head/mail/mutt/distinfo Sat May 13 14:28:49 2017 (r440846) +++ head/mail/mutt/distinfo Sat May 13 14:31:30 2017 (r440847) @@ -1,17 +1,15 @@ -TIMESTAMP = 1492629436 +TIMESTAMP = 1494678618 SHA256 (mutt/mutt-1.8.2.tar.gz) = 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 SIZE (mutt/mutt-1.8.2.tar.gz) = 4118429 -SHA256 (mutt/patch-1.8.0.vvv.nntp.gz) = 1bd4b83708bb664749a34a188f01bc541cc7ab51628a163d87da119152ed00b9 -SIZE (mutt/patch-1.8.0.vvv.nntp.gz) = 60675 -SHA256 (mutt/patch-1.8.0.vvv.nntp_ru.gz) = ec9be57cdd516748f9ee7ee27b137d6ef7d3346258198940cb3d1eabb12d13ea -SIZE (mutt/patch-1.8.0.vvv.nntp_ru.gz) = 3465 -SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110e9c63289f03eb622773fc7a34 -SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767 +SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b +SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675 +SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c +SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465 SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415 SHA256 (mutt/mutt-1.8.2.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc SIZE (mutt/mutt-1.8.2.vc.greeting) = 4499 -SHA256 (mutt/patch-1.8.0.vvv.initials.gz) = 98c667c86028691ee0e9a8022977a7ba16972854c1f2fd87f83899c30598fedd -SIZE (mutt/patch-1.8.0.vvv.initials.gz) = 686 -SHA256 (mutt/patch-1.8.0.vvv.quote.gz) = 18d50110ab38a4338284691e081aa06b1b52301eca49633d2c7639b46acf7e2c -SIZE (mutt/patch-1.8.0.vvv.quote.gz) = 1282 +SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750 +SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686 +SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35 +SIZE (mutt/patch-1.8.2.vvv.quote.gz) = 1282 Modified: head/mail/mutt/files/extra-patch-doc-ref ============================================================================== --- head/mail/mutt/files/extra-patch-doc-ref Sat May 13 14:28:49 2017 (r440846) +++ head/mail/mutt/files/extra-patch-doc-ref Sat May 13 14:31:30 2017 (r440847) @@ -1,6 +1,6 @@ --- doc/mutt.man.orig 2009-02-06 13:52:38.000000000 +0100 +++ doc/mutt.man 2009-02-06 13:55:05.000000000 +0100 -@@ -69,7 +69,8 @@ +@@ -67,7 +67,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, Added: head/mail/mutt/files/patch-dgc-deepif ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mutt/files/patch-dgc-deepif Sat May 13 14:31:30 2017 (r440847) @@ -0,0 +1,30 @@ +--- muttlib.c.orig 2017-04-19 01:05:29 UTC ++++ muttlib.c +@@ -1369,6 +1369,12 @@ + count = 0; + while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&') + { ++ if (*src == '\\') ++ { ++ src++; ++ if (!*src) ++ break; ++ } + *cp++ = *src++; + count++; + } +@@ -1381,7 +1387,13 @@ + count = 0; + while (count < sizeof (elsestring) && *src && *src != '?') + { +- *cp++ = *src++; ++ if (*src == '\\') ++ { ++ src++; ++ if (!*src) ++ break; ++ } ++ *cp++ = *src++; + count++; + } + *cp = 0; Modified: head/mail/mutt/files/patch-doc_Muttrc ============================================================================== --- head/mail/mutt/files/patch-doc_Muttrc Sat May 13 14:28:49 2017 (r440846) +++ head/mail/mutt/files/patch-doc_Muttrc Sat May 13 14:31:30 2017 (r440847) @@ -1,6 +1,6 @@ --- doc/Muttrc.orig 2016-10-08 19:48:13 UTC +++ doc/Muttrc -@@ -626,6 +626,7 @@ attachments -I message/external-body +@@ -649,6 +649,7 @@ attachments -I message/external-body # will be saved for later references. Also see $record, # $save_name, $force_name and ``fcc-hook''. # Modified: head/mail/mutt/files/patch-muttlib.c ============================================================================== --- head/mail/mutt/files/patch-muttlib.c Sat May 13 14:28:49 2017 (r440846) +++ head/mail/mutt/files/patch-muttlib.c Sat May 13 14:31:30 2017 (r440847) @@ -1,6 +1,6 @@ --- muttlib.c.orig 2016-10-08 19:35:50 UTC +++ muttlib.c -@@ -779,16 +779,15 @@ void mutt_merge_envelopes(ENVELOPE* base +@@ -802,16 +802,15 @@ void mutt_merge_envelopes(ENVELOPE* base void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix, const char *src, int line) { Modified: head/mail/mutt/files/patch-smime-self ============================================================================== --- head/mail/mutt/files/patch-smime-self Sat May 13 14:28:49 2017 (r440846) +++ head/mail/mutt/files/patch-smime-self Sat May 13 14:31:30 2017 (r440847) @@ -16,7 +16,7 @@ # unset smime_decrypt_use_default_key --- crypt.c.orig 2016-10-08 19:35:50 UTC +++ crypt.c -@@ -231,8 +231,18 @@ int mutt_protect (HEADER *msg, char *key +@@ -229,8 +229,18 @@ int mutt_protect (HEADER *msg, char *key if ((WithCrypto & APPLICATION_SMIME) && (msg->security & APPLICATION_SMIME)) { @@ -39,7 +39,7 @@ return (-1); --- init.h.orig 2016-10-08 19:35:50 UTC +++ init.h -@@ -2971,6 +2971,11 @@ struct option_t MuttVars[] = { +@@ -2997,6 +2997,11 @@ struct option_t MuttVars[] = { ** possible \fCprintf(3)\fP-like sequences. ** (S/MIME only) */ @@ -53,7 +53,7 @@ ** .pp --- mutt.h.orig 2016-10-08 19:30:21 UTC +++ mutt.h -@@ -263,6 +263,7 @@ enum +@@ -274,6 +274,7 @@ enum OPT_FORWEDIT, OPT_FCCATTACH, OPT_INCLUDE,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705131431.v4DEVVPx079251>