Maintainer-update of mail/mutt-devel: - Update to mutt-1.5.2 - Fix a MASTER_SITES directory Some of the knobs are currently not available due to lacking patches (but the more important ones are there).
On Fri, Dec 06, 2002 at 15:40:03 -0800, FreeBSD-gnats-submit@FreeBSD.org wrote: Please also close ports/46046 after commit. Best regards -- Udo Schweigert, Siemens AG | Voice : +49 89 636 42170 CT IC CERT, Siemens CERT | Fax : +49 89 636 41166 D-81730 Muenchen / Germany | email : udo.schweigert@siemens.com
Meanwhile two new patches for the WITH_MUTT_.. knobs arrived. Please use the patch attached when commiting. Best regards -- Udo Schweigert, Siemens AG | Voice : +49 89 636 42170 CT IC CERT, Siemens CERT | Fax : +49 89 636 41166 D-81730 Muenchen / Germany | email : udo.schweigert@siemens.com diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Mon Nov 11 00:09:28 2002 +++ ./Makefile Mon Dec 9 10:44:40 2002 @@ -67,15 +67,15 @@ # WITH_MUTT_IFDEF_PATCH PORTNAME= mutt-devel -PORTVERSION= 1.5.1 -PORTREVISION?= 4 +PORTVERSION= 1.5.2 +#PORTREVISION?= 0 CATEGORIES+= mail .if defined(WITH_MUTT_NNTP) CATEGORIES+= news .endif MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \ ftp://ftp.parodius.com/pub/mutt/devel/ \ - ftp://ftp.mutt.org/pub/mutt/devel/ + ftp://ftp.mutt.org/mutt/devel/ DISTNAME= mutt-${PORTVERSION}i MAINTAINER= udo.schweigert@siemens.com @@ -220,20 +220,23 @@ SGML_NEEDED= yes .endif .if defined(WITH_MUTT_EDIT_THREADS) -PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 +.error The WITH_MUTT_EDIT_THREADS option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 CONFIGURE_ARGS+= --enable-imap-edit-threads SGML_NEEDED= yes .endif .if defined(WITH_MUTT_SIGNATURE_MENU) -PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 +.error The WITH_MUTT_SIGNATURE_MENU option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 SGML_NEEDED= yes .endif .if defined(WITH_MUTT_IFDEF_PATCH) -PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 +.error The WITH_MUTT_IFDEF_PATCH option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 SGML_NEEDED= yes .endif .if defined(WITH_MUTT_MBOX_HOOK_PATCH) -PATCHFILES+= patch-1.5.1.dw.mbox-hook.1 +PATCHFILES+= patch-${PATCH_VERSION}.dw.mbox-hook.1 .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo Mon Sep 2 21:26:04 2002 +++ ./distinfo Mon Dec 9 10:40:10 2002 @@ -1,9 +1,6 @@ -MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da -MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8 -MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d -MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e -MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318 -MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f -MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3 -MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90 -MD5 (mutt/patch-1.5.1.dw.mbox-hook.1) = 2a04bc3bae302ed106c1f320398b902f +MD5 (mutt/mutt-1.5.2i.tar.gz) = d4bdf72fee7b438159048a206a7c2c34 +MD5 (mutt/patch-1.5.2.rr.compressed.gz) = 18733d9d257ebafefb65c723c1447832 +MD5 (mutt/patch-1.5.2.vvv.nntp.gz) = 6b57686dc851079f1565cde2f2034e55 +MD5 (mutt/patch-1.5.2.vvv.initials.gz) = cecf088758e0b18f1b6902db268b842d +MD5 (mutt/patch-1.5.2.vvv.quote.gz) = 17b56c38941de0a46e629d8bd859ff0b +MD5 (mutt/patch-1.5.2.dw.mbox-hook.1) = 4b5b9860f684e2b2d94032a51f51704c diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-pgp-dw ./files/extra-patch-pgp-dw --- /usr/ports/mail/mutt-devel/files/extra-patch-pgp-dw Mon Sep 2 21:26:04 2002 +++ ./files/extra-patch-pgp-dw Sun Dec 8 19:14:10 2002 @@ -1,19 +1,19 @@ -Base: http://home.woolridge.ca/mutt/patches/patch-1.5.1.dw.pgp-hook.3 ---- PATCHES 24 Jan 2002 12:10:47 -0000 3.0 -+++ PATCHES 31 Aug 2002 22:01:56 -0000 +Base: http://home.woolridge.ca/mutt/patches/patch-1.5.2.dw.pgp-hook.3 +--- PATCHES 11 Nov 2002 20:33:06 -0000 3.4 ++++ PATCHES 8 Dec 2002 03:21:13 -0000 @@ -0,0 +1 @@ -+patch-1.5.1.dw.pgp-hook.3 ---- hook.c 5 Feb 2002 21:30:31 -0000 3.3 -+++ hook.c 31 Aug 2002 22:01:56 -0000 ++patch-1.5.2.dw.pgp-hook.3 +--- hook.c 24 Jul 2002 09:20:21 -0000 3.4 ++++ hook.c 8 Dec 2002 03:21:13 -0000 @@ -118,7 +118,11 @@ int mutt_parse_hook (BUFFER *buf, BUFFER ptr->rx.not == not && !mutt_strcmp (pattern.data, ptr->rx.pattern)) { +#ifdef M_CRYPTHOOK -+ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_CRYPTHOOK)) ++ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK)) +#else - if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK)) -+#endif /* M_CRYPTHOOK */ + if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) ++#endif { /* these hooks allow multiple commands with the same * pattern, so if we've already seen this pattern/command pair, just @@ -45,9 +45,9 @@ } #endif /* HAVE_PGP */ ---- init.h 25 Apr 2002 13:26:26 -0000 3.15 -+++ init.h 31 Aug 2002 22:01:57 -0000 -@@ -1180,6 +1180,16 @@ struct option_t MuttVars[] = { +--- init.h 11 Nov 2002 19:52:18 -0000 3.27 ++++ init.h 8 Dec 2002 03:21:14 -0000 +@@ -1195,6 +1195,16 @@ struct option_t MuttVars[] = { #if defined(HAVE_PGP) || defined(HAVE_SMIME) # ifdef HAVE_PGP @@ -64,7 +64,7 @@ { "pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0 }, # endif { "crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0 }, -@@ -1205,6 +1215,17 @@ struct option_t MuttVars[] = { +@@ -1220,6 +1230,17 @@ struct option_t MuttVars[] = { ** requested as well. IF ``$$smime_is_default'' is set, then ** OpenSSL is used instead to create S/MIME messages and settings can ** be overridden by use of the \fIsmime-menu\fP. @@ -82,9 +82,9 @@ */ #ifdef HAVE_PGP { "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1}, ---- mutt.h 20 Apr 2002 08:11:13 -0000 3.8 -+++ mutt.h 31 Aug 2002 22:01:58 -0000 -@@ -422,6 +422,7 @@ enum +--- mutt.h 9 Sep 2002 20:20:20 -0000 3.11 ++++ mutt.h 8 Dec 2002 03:21:15 -0000 +@@ -431,6 +431,7 @@ enum /* PGP options */ #if defined(HAVE_PGP) || defined(HAVE_SMIME) @@ -92,7 +92,7 @@ OPTCRYPTAUTOSIGN, OPTCRYPTAUTOENCRYPT, OPTCRYPTREPLYENCRYPT, -@@ -433,6 +434,7 @@ enum +@@ -442,6 +443,7 @@ enum OPTASKCERTLABEL, OPTSDEFAULTDECRYPTKEY, #endif @@ -100,8 +100,8 @@ #ifdef HAVE_PGP OPTPGPIGNORESUB, OPTPGPLONGIDS, ---- pgp.c 4 Apr 2002 06:50:12 -0000 3.13 -+++ pgp.c 31 Aug 2002 22:01:58 -0000 +--- pgp.c 11 Nov 2002 19:50:23 -0000 3.14 ++++ pgp.c 8 Dec 2002 03:21:15 -0000 @@ -1037,6 +1037,8 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS char *keyID, *keylist = NULL, *t; size_t keylist_size = 0; @@ -243,7 +243,7 @@ } rfc822_free_address (&tmp); --- pgpkey.c 24 Jan 2002 12:10:51 -0000 3.0 -+++ pgpkey.c 31 Aug 2002 22:01:58 -0000 ++++ pgpkey.c 8 Dec 2002 03:21:15 -0000 @@ -435,6 +435,11 @@ static int pgp_id_matches_addr (ADDRESS return rv; } @@ -305,8 +305,8 @@ { char *s = ""; char buff[LONG_STRING]; ---- protos.h 29 Apr 2002 17:12:00 -0000 3.7 -+++ protos.h 31 Aug 2002 22:01:59 -0000 +--- protos.h 13 Nov 2002 10:07:03 -0000 3.11 ++++ protos.h 8 Dec 2002 03:21:16 -0000 @@ -130,7 +130,7 @@ char *mutt_get_body_charset (char *, siz char *mutt_get_name (ADDRESS *); char *mutt_get_parameter (const char *, PARAMETER *); @@ -316,11 +316,11 @@ #endif /* HAVE_PGP */ char *mutt_make_date (char *, size_t); ---- doc/manual.sgml.head 25 Apr 2002 13:28:23 -0000 3.3 -+++ doc/manual.sgml.head 31 Aug 2002 22:02:00 -0000 -@@ -1388,7 +1388,9 @@ recipient's public key can't be deduced +--- doc/manual.sgml.head 5 Dec 2002 22:30:02 -0000 3.16 ++++ doc/manual.sgml.head 8 Dec 2002 03:21:17 -0000 +@@ -1423,7 +1423,9 @@ recipient's public key can't be deduced or because, for some reasons, you need to override the key Mutt would - normally use. The pgp-hook command provides a method by which you can + normally use. The crypt-hook command provides a method by which you can specify the ID of the public key to be used when encrypting messages to -a certain recipient. +a certain recipient. You may use multiple pgp-hook's with the same @@ -329,9 +329,9 @@ <sect1>Adding key sequences to the keyboard buffer<label id="push"> <p> ---- doc/muttrc.man.head.orig2 Mon Sep 2 17:36:11 2002 -+++ doc/muttrc.man.head Mon Sep 2 17:37:22 2002 -@@ -272,5 +272,7 @@ +--- doc/muttrc.man.head 9 Sep 2002 19:29:26 -0000 3.5 ++++ doc/muttrc.man.head 8 Dec 2002 03:21:17 -0000 +@@ -285,5 +285,7 @@ in the order in which they occur in the The pgp-hook command provides a method by which you can specify the ID of the public key to be used when encrypting messages -to a certain recipient. @@ -339,4 +339,4 @@ +same \fIpattern\fP; multiple matching \fBpgp-hook\fPs result in the use +of multiple \fIkey-id\fPs for recipient. .PP - .nf + .nF diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Mon Sep 2 21:26:05 2002 +++ ./scripts/generate-plist Fri Dec 6 23:16:14 2002 @@ -121,7 +121,7 @@ fi if [ "$MUTT_HTML" = "yes" ]; then - html=361 + html=363 if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then html=$(($html + 5)) fi
And again a new version of the port. We now have mutt-1.5.3. (patch against the current version in the ports-tree) diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Mon Nov 11 00:09:28 2002 +++ ./Makefile Sat Dec 21 19:03:46 2002 @@ -67,15 +67,15 @@ # WITH_MUTT_IFDEF_PATCH PORTNAME= mutt-devel -PORTVERSION= 1.5.1 -PORTREVISION?= 4 +PORTVERSION= 1.5.3 +#PORTREVISION?= 0 CATEGORIES+= mail .if defined(WITH_MUTT_NNTP) CATEGORIES+= news .endif MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \ ftp://ftp.parodius.com/pub/mutt/devel/ \ - ftp://ftp.mutt.org/pub/mutt/devel/ + ftp://ftp.mutt.org/mutt/devel/ DISTNAME= mutt-${PORTVERSION}i MAINTAINER= udo.schweigert@siemens.com @@ -178,9 +178,10 @@ LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl .endif .if defined(WITH_MUTT_PGP_PATCH) -SGML_NEEDED= yes -pre-configure:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw +.error The WITH_MUTT_PGP_PATCH option is currently not available +#SGML_NEEDED= yes +#pre-configure:: +# ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-dw .endif .if defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT) pre-configure:: @@ -220,20 +221,24 @@ SGML_NEEDED= yes .endif .if defined(WITH_MUTT_EDIT_THREADS) -PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 +.error The WITH_MUTT_EDIT_THREADS option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2 CONFIGURE_ARGS+= --enable-imap-edit-threads SGML_NEEDED= yes .endif .if defined(WITH_MUTT_SIGNATURE_MENU) -PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 +.error The WITH_MUTT_SIGNATURE_MENU option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1 SGML_NEEDED= yes .endif .if defined(WITH_MUTT_IFDEF_PATCH) -PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 +.error The WITH_MUTT_IFDEF_PATCH option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1 SGML_NEEDED= yes .endif .if defined(WITH_MUTT_MBOX_HOOK_PATCH) -PATCHFILES+= patch-1.5.1.dw.mbox-hook.1 +.error The WITH_MUTT_MBOX_HOOK_PATCH option is currently not available +#PATCHFILES+= patch-${PATCH_VERSION}.dw.mbox-hook.1 .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo Mon Sep 2 21:26:04 2002 +++ ./distinfo Sat Dec 21 17:52:45 2002 @@ -1,9 +1,5 @@ -MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da -MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8 -MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d -MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e -MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318 -MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f -MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3 -MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90 -MD5 (mutt/patch-1.5.1.dw.mbox-hook.1) = 2a04bc3bae302ed106c1f320398b902f +MD5 (mutt/mutt-1.5.3i.tar.gz) = 38a3dec075c7954a5fe62ce178310d22 +MD5 (mutt/patch-1.5.3.rr.compressed.gz) = 029b7bf58f53f4c7dcd542beac0c4757 +MD5 (mutt/patch-1.5.3.vvv.nntp.gz) = 6399a40b4a7ce3448b0329ceec38f35b +MD5 (mutt/patch-1.5.3.vvv.initials.gz) = 9397128c901c32b6de585ef089ead87f +MD5 (mutt/patch-1.5.3.vvv.quote.gz) = dc24cc5765dfbbf98a9c2027d950c07a diff -ru /usr/ports/mail/mutt-devel/files/patch-05 ./files/patch-05 --- /usr/ports/mail/mutt-devel/files/patch-05 Sun Jun 16 15:05:26 2002 +++ ./files/patch-05 Tue Dec 17 19:59:39 2002 @@ -63,8 +63,8 @@ { case -1: /* abort - don't resort */ return -1; ---- compose.c.orig Tue Mar 26 23:03:26 2002 -+++ compose.c Thu May 2 09:21:11 2002 +--- compose.c.orig Wed Dec 11 12:20:04 2002 ++++ compose.c Tue Dec 17 19:57:50 2002 @@ -173,7 +173,7 @@ char input_signas[SHORT_STRING]; @@ -78,14 +78,14 @@ char *p; switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "), -- _("ewsabf"))) -+ N_("ewsabf"))) +- _("eswabf"))) ++ N_("eswabf"))) { case 1: /* (e)ncrypt */ msg->security |= SMIMEENCRYPT; @@ -239,7 +239,7 @@ msg->security |= SMIMEENCRYPT; - switch (mutt_multi_choice (_("1: DES, 2: Tripple-DES, 3: RC2-40," + switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40," " 4: RC2-64, 5: RC2-128, or (f)orget it? "), - _("12345f"))) { + N_("12345f"))) { diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Mon Sep 2 21:26:05 2002 +++ ./scripts/generate-plist Tue Dec 17 20:05:05 2002 @@ -63,6 +63,7 @@ share/doc/mutt/ABOUT-NLS share/doc/mutt/COPYRIGHT share/doc/mutt/ChangeLog +share/doc/mutt/ChangeLog.old share/doc/mutt/GPL share/doc/mutt/INSTALL share/doc/mutt/NEWS @@ -121,7 +122,7 @@ fi if [ "$MUTT_HTML" = "yes" ]; then - html=361 + html=363 if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then html=$(($html + 5)) fi
Responsible Changed From-To: freebsd-ports->obraun I'll handle this!
State Changed From-To: open->closed Committed, thanks!