mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

- Update to 1.5.20 and update the sidebar patch.

Browse Source 
PR:		ports/135926
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com> (maintainer)
This commit is contained in:
Wesley Shields 2009-06-22 22:52:30 +00:00
parent 4dda26cd41
commit b243fcf219
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=236495
8 changed files with 3225 additions and 2475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mail/mutt-devel/Makefile
View File

@ -114,8 +114,8 @@
#
PORTNAME= mutt-devel
PORTVERSION= 1.5.19
PORTREVISION?= 2
PORTVERSION= 1.5.20
PORTREVISION?= 0
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@ -130,7 +130,6 @@ MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \
ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www.spinnaker.de/mutt/compressed/:rr \
http://cedricduval.free.fr/mutt/patches/download/:cd \
http://lunar-linux.org/~tchan/mutt/:tchan
DISTNAME= mutt-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@ -141,7 +140,6 @@ PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
ftp://ftp3.mutt.org.ua/pub/mutt/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 \
@ -175,8 +173,6 @@ SCRIPTS_ENV= WRKDIR="${WRKDIR}"
.include <bsd.port.pre.mk>
CD_PATCH_VERSION= 1.5.5.1
CD_IFDEF_PATCH_VERSION= 1.5.4
DW_PATCH_VERSION= 1.5.6
AC_PATCH_VERSION= 1.5.9
VC_PATCH_VERSION= 1.5.16
@ -184,15 +180,9 @@ DW_MBOX_PATCH_VERSION= 1.5.18
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
.endif
.if !defined(CD_PATCH_VERSION)
CD_PATCH_VERSION= ${PORTVERSION}
.endif
.if !defined(RR_PATCH_VERSION)
RR_PATCH_VERSION= ${PORTVERSION}
.endif
.if !defined(CD_IFDEF_PATCH_VERSION)
CD_IFDEF_PATCH_VERSION= ${CD_PATCH_VERSION}
.endif
.if !defined(DW_PATCH_VERSION)
DW_PATCH_VERSION= ${PORTVERSION}
.endif
@ -321,7 +311,7 @@ post-patch::
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
.endif
.if defined(WITH_MUTT_SIGNATURE_MENU)
IGNORE= The WITH_MUTT_SIGNATURE_MENU does not work at the moment.
IGNORE= The WITH_MUTT_SIGNATURE_MENU does not work at the moment
XML_NEEDED= yes
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
@ -425,25 +415,21 @@ PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
XML_NEEDED= yes
.endif
.if defined(WITH_MUTT_IFDEF_PATCH)
DISTFILES+= patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd
#XML_NEEDED= yes
pre-patch::
@${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1 > ${WRKDIR}/patch-ifdef
@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.sgml.head$$/,/^diff/d' \
${WRKDIR}/patch-ifdef
@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef
post-patch::
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
.endif
.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
IGNORE= The WITH_MUTT_MBOX_HOOK_PATCH does not work at the moment
#PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
.endif
.if defined(WITH_MUTT_SIDEBAR_PATCH)
XML_NEEDED= yes
.if defined(WITH_MUTT_NNTP)
post-patch::
@${PATCH} ${PATCH_ARGS} -p0 < ${PATCHDIR}/extra-patch-sidebar-nntp
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
.else
post-patch::
@${PATCH} ${PATCH_ARGS} -p0 < ${PATCHDIR}/extra-patch-sidebar
@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
.endif
.endif
.if defined(WITH_MUTT_GREETING_PATCH)

30
mail/mutt-devel/distinfo
View File

@ -1,21 +1,21 @@
MD5 (mutt/mutt-1.5.19.tar.gz) = 73b3747bc7f7c805921e8d24ebac693f
SHA256 (mutt/mutt-1.5.19.tar.gz) = b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
SIZE (mutt/mutt-1.5.19.tar.gz) = 3558746
MD5 (mutt/patch-1.5.19.rr.compressed.gz) = 3f0aa26613fc20c7c6f21995730c1fd5
SHA256 (mutt/patch-1.5.19.rr.compressed.gz) = d04a7c129d11e0e8a71ecf4992986f97df17843777b3f70136a2c88464977533
SIZE (mutt/patch-1.5.19.rr.compressed.gz) = 10143
MD5 (mutt/patch-1.5.19.vvv.nntp.gz) = 1e2ad0cb9b918f8382537752df0c9958
SHA256 (mutt/patch-1.5.19.vvv.nntp.gz) = 213c944d196eee81fd402e35a1d04b745e01bd63971f4319645b65cf9e61e4ef
SIZE (mutt/patch-1.5.19.vvv.nntp.gz) = 55132
MD5 (mutt/mutt-1.5.20.tar.gz) = 027cdd9959203de0c3c64149a7ee351c
SHA256 (mutt/mutt-1.5.20.tar.gz) = 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
SIZE (mutt/mutt-1.5.20.tar.gz) = 3635047
MD5 (mutt/patch-1.5.20.rr.compressed.gz) = 5e608027bda1fddc2bc38c03a560f0a9
SHA256 (mutt/patch-1.5.20.rr.compressed.gz) = 87a7eed23ee234fcb3564e13bb034a3bfe858fb69677c7f8e7321446acf01034
SIZE (mutt/patch-1.5.20.rr.compressed.gz) = 10190
MD5 (mutt/patch-1.5.20.vvv.nntp.gz) = 80355166f8ae9bff064124f2d2e6870f
SHA256 (mutt/patch-1.5.20.vvv.nntp.gz) = ea199ed303519ed816bded493cc4fe2985b497ec29b1c1c201f1428b1354260b
SIZE (mutt/patch-1.5.20.vvv.nntp.gz) = 55449
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.19.vvv.initials.gz) = 10fa7e4ccfb121c699ec79157231d4f7
SHA256 (mutt/patch-1.5.19.vvv.initials.gz) = f803dfb7dd747c2dc749bb4fe1364234c361cb0740e8072063101ab622ffa9e0
SIZE (mutt/patch-1.5.19.vvv.initials.gz) = 685
MD5 (mutt/patch-1.5.19.vvv.quote.gz) = ce3e7f010058948ed11f5b3daa55829c
SHA256 (mutt/patch-1.5.19.vvv.quote.gz) = 2dc24cfe09c98197e0bef8c05aba78aba9348f5dda55c8b167d982ed47bdc683
SIZE (mutt/patch-1.5.19.vvv.quote.gz) = 1756
MD5 (mutt/patch-1.5.20.vvv.initials.gz) = c71ebc64f20f516f45168530d57f6c21
SHA256 (mutt/patch-1.5.20.vvv.initials.gz) = fc2cf1dadfab02545116fc70855cfe14f4efd8e1a32b9a6c366fc5e09bdafd23
SIZE (mutt/patch-1.5.20.vvv.initials.gz) = 690
MD5 (mutt/patch-1.5.20.vvv.quote.gz) = 1d6213598d354942006f17b2c46720f2
SHA256 (mutt/patch-1.5.20.vvv.quote.gz) = 7f3ea7999f00738c2dab0e67d69d76d354d14d0615c00784233e6d1149cb749d
SIZE (mutt/patch-1.5.20.vvv.quote.gz) = 1772
MD5 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = ae70a6668e297bdc804b2673221b4727
SHA256 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 12b9f41476850a5e2eed2334be9326e4905e8a6d786740689b6966a5d285070c
SIZE (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 6812

79
mail/mutt-devel/files/extra-patch-ifdef Normal file
View File

@ -0,0 +1,79 @@
--- mutt-1.5.4.orig/init.c 2003-03-04 08:49:48.000000000 +0100
+++ mutt-1.5.4/init.c 2003-07-22 20:14:47.000000000 +0200
@@ -349,6 +349,52 @@ static void remove_from_list (LIST **l,
}
}
+static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
+{
+ int i, j, res = 0;
+ BUFFER token;
+
+ memset (&token, 0, sizeof (token));
+ mutt_extract_token (tmp, s, 0);
+
+ /* is the item defined as a variable or a function? */
+ if (!(res = (mutt_option_index (tmp->data) != -1)))
+ for (i = 0; !res && i < MENU_MAX; i++)
+ {
+ struct binding_t *b = km_get_table (Menus[i].value);
+
+ if (!b)
+ continue;
+
+ for (j = 0; b[j].name; j++)
+ if (!ascii_strncasecmp (tmp->data, b[j].name, mutt_strlen (tmp->data))
+ && (mutt_strlen (b[j].name) == mutt_strlen (tmp->data)))
+ {
+ res = 1;
+ break;
+ }
+ }
+
+ if (!MoreArgs (s))
+ {
+ snprintf (err->data, err->dsize, _("ifdef: too few arguments"));
+ return (-1);
+ }
+ mutt_extract_token (tmp, s, M_TOKEN_SPACE);
+
+ if (res)
+ {
+ if (mutt_parse_rc_line (tmp->data, &token, err) == -1)
+ {
+ mutt_error ("Erreur: %s", err->data);
+ FREE (&token.data);
+ return (-1);
+ }
+ FREE (&token.data);
+ }
+ return 0;
+}
+
static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
{
do
diff -pruN mutt-1.5.4.orig/init.h mutt-1.5.4/init.h
--- mutt-1.5.4.orig/init.h.orig 2009-06-22 15:48:16.000000000 +0200
+++ mutt-1.5.4/init.h 2009-06-22 15:49:28.000000000 +0200
@@ -3658,6 +3658,7 @@
static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+static int parse_ifdef (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -3715,6 +3716,7 @@
{ "hdr_order", parse_list, UL &HeaderOrderList },
#ifdef HAVE_ICONV
{ "iconv-hook", mutt_parse_hook, M_ICONVHOOK },
+ { "ifdef", parse_ifdef, 0 },
#endif
{ "ignore", parse_ignore, 0 },
{ "lists", parse_lists, 0 },
diff -pruN mutt-1.5.4.orig/PATCHES mutt-1.5.4/PATCHES
--- mutt-1.5.4.orig/PATCHES 2003-03-19 22:33:37.000000000 +0100
+++ mutt-1.5.4/PATCHES 2003-07-22 20:14:47.000000000 +0200
@@ -1,0 +1 @@
+patch-1.5.4.cd.ifdef.1

2570
mail/mutt-devel/files/extra-patch-sidebar
View File

File diff suppressed because it is too large Load Diff

2955
mail/mutt-devel/files/extra-patch-sidebar-nntp
View File

File diff suppressed because it is too large Load Diff

8
mail/mutt-devel/files/patch-doc-manual.xml.head
View File

@ -1,5 +1,5 @@
--- doc/manual.xml.head.orig Sun Nov 4 13:58:04 2007
+++ doc/manual.xml.head Sun Nov 4 14:08:23 2007
--- doc/manual.xml.head.orig 2009-06-22 08:35:06.000000000 +0200
+++ doc/manual.xml.head 2009-06-22 08:37:31.000000000 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
@ -8,12 +8,12 @@
<book>
<bookinfo>
@@ -6160,7 +6160,7 @@
@@ -7271,7 +7271,7 @@
<para>
The built-in SMTP support supports encryption (the <literal>smtps</literal> protocol
using SSL or TLS) as well as SMTP authentication using SASL. The authentication mechanisms
-for SASL are specified in <link linkend="smtp-authenticators">&dollar;smtp&lowbar;authenticators</link>
+for SASL are specified in <literal>&dollar;smtp&lowbar;authenticators</literal>
defaulting to an empty list which makes mutt try all available methods
defaulting to an empty list which makes Mutt try all available methods
from most-secure to least-secure.
</para>

25
mail/mutt-devel/files/patch-examples
View File

@ -68,23 +68,22 @@
into your system's global Muttrc, which normally resides in /etc or
/usr/local/etc.
--- doc/manual.txt.orig 2009-01-06 01:37:18.000000000 +0100
+++ doc/manual.txt 2009-02-06 13:32:18.000000000 +0100
@@ -2982,9 +2982,10 @@
--- doc/manual.txt.orig 2009-06-14 20:54:56.000000000 +0200
+++ doc/manual.txt 2009-06-22 15:11:26.000000000 +0200
@@ -3225,9 +3225,9 @@
shows that arguments can be quoted: the script will receive the expanded string
between the single quotes as the only argument.
-A practical example is the mutt_xtitle script installed in the samples
-subdirectory of the mutt documentation: it can be used as filter for
-subdirectory of the Mutt documentation: it can be used as filter for
-$status_format to set the current terminal's title, if supported.
+A practical example is the mutt_xtitle script installed in the
+share/examples/mutt/ subdirectory of the mutt documentation: it can be used as
+share/examples/mutt/ subdirectory of the Mutt documentation: it can be used as
+filter for $status_format to set the current terminal's title, if supported.
+
Chapter 4. Advanced Usage
29.4. Padding
@@ -7576,8 +7577,8 @@
@@ -7740,8 +7740,8 @@
For examples on how to configure these formats for the various versions of PGP
which are floating around, see the pgp and gpg sample configuration files in
@ -93,11 +92,11 @@
+the share/examples/mutt/ subdirectory which has been installed on your system.
+(PGP only)
3.170. pgp_getkeys_command
3.158. pgp_decrypt_command
@@ -7809,9 +7810,9 @@
or file, this expands to ?-CApath $smime_ca_location? or ?-CAfile
$smime_ca_location?.
@@ -8751,9 +8751,9 @@
| |$smime_ca_location?. |
+-----------------------------------------------------------------------------+
-For examples on how to configure these formats, see the smime.rc in the samples
-/ subdirectory which has been installed on your system alongside the
@ -106,5 +105,5 @@
+share/examples/mutt/ subdirectory which has been installed on your system.
+(S/MIME only)
3.189. smime_verify_command
3.244. smime_decrypt_use_default_key

1
mail/mutt-devel/scripts/generate-plist
View File

@ -134,6 +134,7 @@ EOF
echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
echo "%%DOCSDIR%%/html/optionalfeatures.html" >> $tmp_first
echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
echo "%%DOCSDIR%%/html/security.html" >> $tmp_first
echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first
if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
echo "%%DOCSDIR%%/html/compressed-folders.html" >> $tmp_first