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

(-)./Makefile (-7 / +8 lines)
Lines 109-116 Link Here
109
#
109
#
110
110
111
PORTNAME=	mutt-devel
111
PORTNAME=	mutt-devel
112
PORTVERSION=	1.5.16
112
PORTVERSION=	1.5.17
113
PORTREVISION?=	3
113
PORTREVISION?=	0
114
CATEGORIES+=	mail ipv6
114
CATEGORIES+=	mail ipv6
115
.if defined(WITH_MUTT_NNTP)
115
.if defined(WITH_MUTT_NNTP)
116
CATEGORIES+=	news
116
CATEGORIES+=	news
Lines 174-179 Link Here
174
CD_IFDEF_PATCH_VERSION=	1.5.4
174
CD_IFDEF_PATCH_VERSION=	1.5.4
175
DW_PATCH_VERSION=	1.5.6
175
DW_PATCH_VERSION=	1.5.6
176
AC_PATCH_VERSION=	1.5.9
176
AC_PATCH_VERSION=	1.5.9
177
VC_PATCH_VERSION=	1.5.16
177
.if !defined(VVV_PATCH_VERSION)
178
.if !defined(VVV_PATCH_VERSION)
178
VVV_PATCH_VERSION=	${PORTVERSION}
179
VVV_PATCH_VERSION=	${PORTVERSION}
179
.endif
180
.endif
Lines 403-423 Link Here
403
PATCH_DIST_STRIP=	-p1
404
PATCH_DIST_STRIP=	-p1
404
405
405
.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
406
.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
406
DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.2.gz:vvv
407
DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
407
CONFIGURE_ARGS+=	--enable-compressed
408
CONFIGURE_ARGS+=	--enable-compressed
408
XML_NEEDED=	yes
409
XML_NEEDED=	yes
409
pre-patch::
410
pre-patch::
410
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.2.gz > ${WRKDIR}/patch-compressed
411
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
411
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
412
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
412
		 ${WRKDIR}/patch-compressed
413
		 ${WRKDIR}/patch-compressed
413
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
414
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
414
.endif
415
.endif
415
.if defined(WITH_MUTT_NNTP)
416
.if defined(WITH_MUTT_NNTP)
416
DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz:vvv
417
DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
417
CONFIGURE_ARGS+=	--enable-nntp
418
CONFIGURE_ARGS+=	--enable-nntp
418
XML_NEEDED=	yes
419
XML_NEEDED=	yes
419
pre-patch::
420
pre-patch::
420
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.3.gz > ${WRKDIR}/patch-nntp
421
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
421
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
422
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
422
		${WRKDIR}/patch-nntp
423
		${WRKDIR}/patch-nntp
423
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
424
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
Lines 440-446 Link Here
440
PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
441
PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
441
.endif
442
.endif
442
.if defined(WITH_MUTT_SIDEBAR_PATCH)
443
.if defined(WITH_MUTT_SIDEBAR_PATCH)
443
SIDEBAR_PATCH=	patch-1.5.16.sidebar.20070704.txt
444
SIDEBAR_PATCH=	patch-1.5.17.sidebar.20071102.txt
444
DISTFILES+=	${SIDEBAR_PATCH}:tchan
445
DISTFILES+=	${SIDEBAR_PATCH}:tchan
445
XML_NEEDED=	yes
446
XML_NEEDED=	yes
446
pre-patch::
447
pre-patch::
(-)./distinfo (-18 / +18 lines)
Lines 1-27 Link Here
1
MD5 (mutt/mutt-1.5.16.tar.gz) = 10eff7024dbb7ce1f773d688a69ea9db
1
MD5 (mutt/mutt-1.5.17.tar.gz) = 49387458be0cb52b85ae0d73af699aae
2
SHA256 (mutt/mutt-1.5.16.tar.gz) = 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
2
SHA256 (mutt/mutt-1.5.17.tar.gz) = 17865b1a10e23ccf8757c05657c7d7f7055457f0a04eeacd9ee560eeb6defa81
3
SIZE (mutt/mutt-1.5.16.tar.gz) = 3534894
3
SIZE (mutt/mutt-1.5.17.tar.gz) = 3572651
4
MD5 (mutt/patch-1.5.16.rr.compressed.2.gz) = 555677215aae09cb48cae2dcf7a41182
4
MD5 (mutt/patch-1.5.17.rr.compressed.gz) = 4f8edaa937d308d80f0f585b1c7fe47c
5
SHA256 (mutt/patch-1.5.16.rr.compressed.2.gz) = 64e119a50a6eb72ab6893ef8a1af8d196567116c123fbce7e0afc825c19aa65e
5
SHA256 (mutt/patch-1.5.17.rr.compressed.gz) = ffef4854a558264b6873517f4b4be8e3390eeacec03f2f5aef0cf5c2d43953ad
6
SIZE (mutt/patch-1.5.16.rr.compressed.2.gz) = 10117
6
SIZE (mutt/patch-1.5.17.rr.compressed.gz) = 10124
7
MD5 (mutt/patch-1.5.16.vvv.nntp.3.gz) = 93a828111ce0b17d80ee9f6396708552
7
MD5 (mutt/patch-1.5.17.vvv.nntp.gz) = 42945bbe500e8e016d6760a05fd2e8ed
8
SHA256 (mutt/patch-1.5.16.vvv.nntp.3.gz) = fe71626d7a91f85e0434a866c7a1b31cbd6866d6d006c5214b7a39d834b5ac16
8
SHA256 (mutt/patch-1.5.17.vvv.nntp.gz) = 2bc47e018a2188d429ddf6189de83a7a4c30d55f1131dfb09d667237787a09e3
9
SIZE (mutt/patch-1.5.16.vvv.nntp.3.gz) = 55200
9
SIZE (mutt/patch-1.5.17.vvv.nntp.gz) = 55463
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.16.vvv.initials.gz) = ff11da4b723127647c986cd027f7fdd2
13
MD5 (mutt/patch-1.5.17.vvv.initials.gz) = 08849d642e467bbd17eb7411ba63bf48
14
SHA256 (mutt/patch-1.5.16.vvv.initials.gz) = c6788b1092c0ab4f8d28d5e570804bbedf880a4172452b8231da5bed65bb74de
14
SHA256 (mutt/patch-1.5.17.vvv.initials.gz) = 6b1829032a8cfc527f7d1abc6f7a2af6c8fdb8cd080b03a96f94e72cc75ad29c
15
SIZE (mutt/patch-1.5.16.vvv.initials.gz) = 679
15
SIZE (mutt/patch-1.5.17.vvv.initials.gz) = 679
16
MD5 (mutt/patch-1.5.16.vvv.quote.gz) = 41f8945f5114687974e2a86bcf415f27
16
MD5 (mutt/patch-1.5.17.vvv.quote.gz) = d93d91a70d9c25ca917d56738dd57246
17
SHA256 (mutt/patch-1.5.16.vvv.quote.gz) = b08db26c185693aefd0d398eef9cfd8a90a01d627dc5e2223cee2076d2ed0ef3
17
SHA256 (mutt/patch-1.5.17.vvv.quote.gz) = fc68dac081bea1b5a9d345c75e2861db2cdc00341fd17b6f0ccd454c02bc4767
18
SIZE (mutt/patch-1.5.16.vvv.quote.gz) = 2036
18
SIZE (mutt/patch-1.5.17.vvv.quote.gz) = 2105
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/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0
22
MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0
23
SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986
23
SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986
24
SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526
24
SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526
25
MD5 (mutt/patch-1.5.16.sidebar.20070704.txt) = e6e1a6e258ec6ce6ee489b0f3ff8e2cf
25
MD5 (mutt/patch-1.5.17.sidebar.20071102.txt) = 93890c4a5bc1628018a701946a0c3ff5
26
SHA256 (mutt/patch-1.5.16.sidebar.20070704.txt) = 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
26
SHA256 (mutt/patch-1.5.17.sidebar.20071102.txt) = 1d8dda9fed1e1592ff9004e2c776c2f4a84e4e75ca872542e8e07113516fc27b
27
SIZE (mutt/patch-1.5.16.sidebar.20070704.txt) = 51103
27
SIZE (mutt/patch-1.5.17.sidebar.20071102.txt) = 50439
(-)./files/patch-doc-manual.xml.head (-3 / +12 lines)
Lines 1-10 Link Here
1
--- doc/manual.xml.head.orig	Mon Jul 17 15:23:46 2006
1
--- doc/manual.xml.head.orig	Sun Nov  4 13:58:04 2007
2
+++ doc/manual.xml.head	Mon Jul 17 15:30:23 2006
2
+++ doc/manual.xml.head	Sun Nov  4 14:08:23 2007
3
@@ -1,6 +1,6 @@
3
@@ -1,6 +1,6 @@
4
 <?xml version="1.0" standalone="no"?>
4
 <?xml version="1.0" standalone="no"?>
5
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
5
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
6
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
6
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
7
+  "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
7
+  "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
8
 <book>
8
 <book>
9
 
9
 
10
 <bookinfo>
10
 <bookinfo>
11
@@ -6160,7 +6160,7 @@
12
 <para>
13
 The built-in SMTP support supports encryption (the <literal>smtps</literal> protocol
14
 using SSL or TLS) as well as SMTP authentication using SASL. The authentication mechanisms
15
-for SASL are specified in <link linkend="smtp-authenticators">&dollar;smtp&lowbar;authenticators</link>
16
+for SASL are specified in <literal>&dollar;smtp&lowbar;authenticators</literal>
17
 defaulting to an empty list which makes mutt try all available methods
18
 from most-secure to least-secure.
19
 </para>
(-)./files/patch-examples (-22 / +40 lines)
Lines 77-103 Link Here
77
 
77
 
78
 into your system's global Muttrc, which normally resides in /etc or
78
 into your system's global Muttrc, which normally resides in /etc or
79
 /usr/local/etc.
79
 /usr/local/etc.
80
--- doc/manual.txt.orig	Fri Feb 23 18:15:51 2007
80
--- doc/manual.txt.orig	Thu Nov  1 22:07:09 2007
81
+++ doc/manual.txt	Wed Feb 28 14:30:48 2007
81
+++ doc/manual.txt	Sun Nov  4 13:55:21 2007
82
@@ -6219,8 +6219,8 @@
82
@@ -2617,9 +2617,10 @@
83
 
83
 shows that arguments can be quoted: the script will receive the expanded string
84
    For examples on how to configure these formats for the various
84
 between the single quotes as the only argument.
85
    versions of PGP which are floating around, see the pgp*.rc and gpg.rc
85
 
86
-   files in the samples/ subdirectory which has been installed on your
86
-A practical example is the mutt_xtitle script installed in the samples
87
-   system alongside the documentation. (PGP only)
87
-subdirectory of the mutt documentation: it can be used as filter for
88
+   files in the share/examples/mutt/ subdirectory which has been installed
88
-$status_format to set the current terminal's title, if supported.
89
+   on your system alongside the documentation. (PGP only)
89
+A practical example is the mutt_xtitle script installed in the
90
 
90
+share/examples/mutt/ subdirectory of the mutt documentation: it can be used as
91
 3.163. pgp_getkeys_command
91
+filter for $status_format to set the current terminal's title, if supported.
92
 
92
+
93
@@ -6418,8 +6418,8 @@
93
 
94
           $$ssmmiimmee__ccaa__llooccaattiioonn" or "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
94
 Chapter 4. Advanced Usage
95
 
95
 
96
    For examples on how to configure these formats, see the smime.rc in
96
@@ -6957,9 +6958,9 @@
97
-   the samples/ subdirectory which has been installed on your system
97
     One or more key IDs.
98
-   alongside the documentation. (S/MIME only)
98
 
99
+   the share/examples/mutt/ subdirectory which has been installed on your
99
 For examples on how to configure these formats for the various versions of PGP
100
+   system alongside the documentation. (S/MIME only)
100
-which are floating around, see the pgp*.rc and gpg.rc files in the samples/
101
-subdirectory which has been installed on your system alongside the
102
-documentation. (PGP only)
103
+which are floating around, see the pgp*.rc and gpg.rc files in the
104
+share/examples/mutt/ subdirectory which has been installed on your system
105
+alongside the documentation. (PGP only)
106
 
107
 3.169. pgp_getkeys_command
108
 
109
@@ -7155,9 +7156,9 @@
110
     or file, this expands to "-CApath $smime_ca_location" or "-CAfile
111
     $smime_ca_location".
112
 
113
-For examples on how to configure these formats, see the smime.rc in the samples
114
-/ subdirectory which has been installed on your system alongside the
115
-documentation. (S/MIME only)
116
+For examples on how to configure these formats, see the smime.rc in the 
117
+share/examples/mutt/ subdirectory which has been installed on your system
118
+alongside the documentation. (S/MIME only)
101
 
119
 
102
 3.182. smime_verify_command
120
 3.188. smime_verify_command
103
 
121
 
(-)./files/patch-pop_auth.c (-19 lines)
Lines 1-19 Link Here
1
--- pop_auth.c.orig	Thu Jul 17 19:42:53 2003
2
+++ pop_auth.c	Thu Jul 17 19:46:01 2003
3
@@ -206,12 +206,12 @@
4
   mutt_message _("Authenticating (APOP)...");
5
 
6
   /* Compute the authentication hash to send to the server */
7
-  MD5Init (&mdContext);
8
-  MD5Update (&mdContext, (unsigned char *)pop_data->timestamp,
9
+  MD5_Init (&mdContext);
10
+  MD5_Update (&mdContext, (unsigned char *)pop_data->timestamp,
11
 	     strlen (pop_data->timestamp));
12
-  MD5Update (&mdContext, (unsigned char *)pop_data->conn->account.pass,
13
+  MD5_Update (&mdContext, (unsigned char *)pop_data->conn->account.pass,
14
 	     strlen (pop_data->conn->account.pass));
15
-  MD5Final (digest, &mdContext);
16
+  MD5_Final (digest, &mdContext);
17
 
18
   for (i = 0; i < sizeof (digest); i++)
19
     sprintf (hash + 2 * i, "%02x", digest[i]);
(-)./scripts/generate-plist (+1 lines)
Lines 133-138 Link Here
133
    echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
133
    echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
134
    echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
134
    echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
135
    echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
135
    echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
136
    echo "%%DOCSDIR%%/html/optionalfeatures.html" >> $tmp_first
136
    echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
137
    echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
137
    echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first
138
    echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first
138
    if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
139
    if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then

Return to bug 117822