Attachment #29599 for bug #50199

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

Lines 47-52 Link Here

(-)./Makefile (-25 / +40 lines)
47	# If you want to enable extended quoting functions define:	47	# If you want to enable extended quoting functions define:
48	# WITH_MUTT_QUOTE_PATCH	48	# WITH_MUTT_QUOTE_PATCH
49	#	49	#
		50	# If you want to make SMIME outlook compatible define:
		51	# WITH_MUTT_SMIME_OUTLOOK_COMPAT
		52	#
50	# If you want to use the rethreading functions define:	53	# If you want to use the rethreading functions define:
51	# WITH_MUTT_EDIT_THREADS	54	# WITH_MUTT_EDIT_THREADS
52	#	55	#
Lines 97-110 Link Here
97		100
98	.include <bsd.port.pre.mk>	101	.include <bsd.port.pre.mk>
99		102
100	.if defined(WITH_MUTT_COMPRESSED_FOLDERS)	103	CD_PATCH_VERSION= 1.5.3
101	PATCH_SITES+= http://www.spinnaker.de/mutt/compressed/:spinnaker	104	.if !defined(VVV_PATCH_VERSION)
102	.endif	105	VVV_PATCH_VERSION= ${PORTVERSION}
103	.if defined(WITH_MUTT_NNTP) \|\| defined(WITH_MUTT_QUOTE_PATCH)	106	.endif
104	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${PATCH_VERSION}/:vvv \	107	.if !defined(CD_PATCH_VERSION)
105	http://www2.mutt.org.ua/download/mutt-${PATCH_VERSION}/:vvv \	108	CD_PATCH_VERSION= ${PORTVERSION}
106	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/:vvv \	109	.endif
107	ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/:vvv	110	.if !defined(DW_PATCH_VERSION)
		111	DW_PATCH_VERSION= ${PORTVERSION}
		112	.endif
		113
		114	.if defined(WITH_MUTT_COMPRESSED_FOLDERS) \|\| defined(WITH_MUTT_NNTP) \|\| \
		115	defined(WITH_MUTT_QUOTE_PATCH)
		116	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		117	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		118	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
		119	ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv
108	.endif	120	.endif
109		121
110	.if defined(WITH_MUTT_EDIT_THREADS) \|\| defined(WITH_MUTT_SIGNATURE_MENU) \|\| \	122	.if defined(WITH_MUTT_EDIT_THREADS) \|\| defined(WITH_MUTT_SIGNATURE_MENU) \|\| \
Lines 125-139 Link Here
125	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \	137	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
126	${BUILD_WRKSRC}/Makefile	138	${BUILD_WRKSRC}/Makefile
127		139
128	PATCH_VERSION= 1.5.3
129	.if !defined(PATCH_VERSION)
130	PATCH_VERSION= ${PORTVERSION}
131	.endif
132
133	.if defined(PACKAGE_BUILDING)	140	.if defined(PACKAGE_BUILDING)
134	WITH_MUTT_SSL= yes	141	WITH_MUTT_SSL= yes
135	WITH_MUTT_NCURSES= yes	142	WITH_MUTT_NCURSES= yes
136	WITH_MUTT_HTML= yes	143	WITH_MUTT_HTML= yes
		144	WITH_MUTT_COMPRESSED_FOLDERS= yes
		145	WITH_MUTT_QUOTE_PATCH= yes
		146	WITH_MUTT_SMIME_OUTLOOK_COMPAT= yes
		147	WITH_MUTT_PGP_PATCH= yes
137	BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell	148	BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
138	RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \	149	RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \
139	urlview:${PORTSDIR}/textproc/urlview	150	urlview:${PORTSDIR}/textproc/urlview
Lines 178-183 Link Here
178	.if defined(WITH_MUTT_CYRUS_SASL)	189	.if defined(WITH_MUTT_CYRUS_SASL)
179	LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl	190	LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl
180	.endif	191	.endif
		192	.if defined(WITH_MUTT_SMIME_OUTLOOK_COMPAT)
		193	pre-configure::
		194	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
		195	.endif
		196
181	.if defined(WITH_MUTT_PGP_PATCH)	197	.if defined(WITH_MUTT_PGP_PATCH)
182	SGML_NEEDED= yes	198	SGML_NEEDED= yes
183	pre-configure::	199	pre-configure::
Lines 202-238 Link Here
202	PATCH_DIST_STRIP= -p1	218	PATCH_DIST_STRIP= -p1
203		219
204	.if defined(WITH_MUTT_COMPRESSED_FOLDERS)	220	.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
205	PATCHFILES+= patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker	221	PATCHFILES+= patch-${VVV_PATCH_VERSION}.rr.compressed.gz:vvv
206	CONFIGURE_ARGS+= --enable-compressed	222	CONFIGURE_ARGS+= --enable-compressed
207	SGML_NEEDED= yes	223	SGML_NEEDED= yes
208	.endif	224	.endif
209	.if defined(WITH_MUTT_NNTP)	225	.if defined(WITH_MUTT_NNTP)
210	.error The WITH_MUTT_NNTP is not available at the moment.	226	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
211	PATCHFILES+= patch-${PATCH_VERSION}.vvv.nntp.gz:vvv
212	CONFIGURE_ARGS+= --enable-nntp	227	CONFIGURE_ARGS+= --enable-nntp
213	SGML_NEEDED= yes	228	SGML_NEEDED= yes
214	.endif	229	.endif
215	.if defined(WITH_MUTT_QUOTE_PATCH)	230	.if defined(WITH_MUTT_QUOTE_PATCH)
216	PATCHFILES+= patch-${PATCH_VERSION}.vvv.initials.gz:vvv \	231	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
217	patch-${PATCH_VERSION}.vvv.quote.gz:vvv	232	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
218	SGML_NEEDED= yes	233	SGML_NEEDED= yes
219	.endif	234	.endif
220	.if defined(WITH_MUTT_EDIT_THREADS)	235	.if defined(WITH_MUTT_EDIT_THREADS)
221	PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.3:cd	236	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.edit_threads.9.3:cd
222	CONFIGURE_ARGS+= --enable-imap-edit-threads	237	CONFIGURE_ARGS+= --enable-imap-edit-threads
223	SGML_NEEDED= yes	238	SGML_NEEDED= yes
224	.endif	239	.endif
225	.if defined(WITH_MUTT_SIGNATURE_MENU)	240	.if defined(WITH_MUTT_SIGNATURE_MENU)
226	.error The WITH_MUTT_SIGNATURE_MENU is not available at the moment.	241	.error The WITH_MUTT_SIGNATURE_MENU is not available at the moment.
227	PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1:cd	242	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd
228	SGML_NEEDED= yes	243	SGML_NEEDED= yes
229	.endif	244	.endif
230	.if defined(WITH_MUTT_IFDEF_PATCH)	245	.if defined(WITH_MUTT_IFDEF_PATCH)
231	PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1:cd	246	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.ifdef.1:cd
232	SGML_NEEDED= yes	247	SGML_NEEDED= yes
233	.endif	248	.endif
234	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)	249	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
235	PATCHFILES+= p0-patch-${PATCH_VERSION}.dw.mbox-hook.1:dw	250	PATCHFILES+= p0-patch-${DW_PATCH_VERSION}.dw.mbox-hook.1:dw
236	.endif	251	.endif
237		252
238	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}	253	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}

Lines 1-9 Link Here

(-)./distinfo (-5 / +5 lines)
1	MD5 (mutt/mutt-1.5.4i.tar.gz) = 3d4088f25892af6d71148eef26604f33	1	MD5 (mutt/mutt-1.5.4i.tar.gz) = 3d4088f25892af6d71148eef26604f33
2	MD5 (mutt/patch-1.5.4.rr.compressed.1.gz) = e2c0b3bb0be0e19a4a6cda01078e3eae	2	MD5 (mutt/patch-1.5.4.rr.compressed.gz) = a7b37150c35ea65049b3cd1edab5079d
3	MD5 (mutt/patch-1.5.3.vvv.nntp.gz) = 6399a40b4a7ce3448b0329ceec38f35b	3	MD5 (mutt/patch-1.5.4.vvv.nntp.gz) = d0cb0f609aa0461d1b17137bd49c14cb
4	MD5 (mutt/patch-1.5.3.vvv.initials.gz) = 9397128c901c32b6de585ef089ead87f	4	MD5 (mutt/patch-1.5.4.vvv.initials.gz) = d92517da934f5c32692aecf7ece596b7
5	MD5 (mutt/patch-1.5.3.vvv.quote.gz) = dc24cc5765dfbbf98a9c2027d950c07a	5	MD5 (mutt/patch-1.5.4.vvv.quote.gz) = 80d91491679b426b0f670fa965ae3777
6	MD5 (mutt/patch-1.5.3.cd.edit_threads.9.3) = 753a19d8efdece04cd521c3a3079dc9f	6	MD5 (mutt/patch-1.5.3.cd.edit_threads.9.3) = 753a19d8efdece04cd521c3a3079dc9f
7	MD5 (mutt/patch-1.5.3.cd.signatures_menu.2.1) = 6db636f0004e73ee2d9f577acd4ed380	7	MD5 (mutt/patch-1.5.3.cd.signatures_menu.2.1) = 6db636f0004e73ee2d9f577acd4ed380
8	MD5 (mutt/patch-1.5.3.cd.ifdef.1) = 01b47e075364834b82da053cac4eb69f	8	MD5 (mutt/patch-1.5.3.cd.ifdef.1) = 01b47e075364834b82da053cac4eb69f
9	MD5 (mutt/p0-patch-1.5.3.dw.mbox-hook.1) = 09f9b4229a2d63c81cfee7e1d811f84f	9	MD5 (mutt/p0-patch-1.5.4.dw.mbox-hook.1) = 326f415380cc377c99d2232f16267ffe




 
 The meaning of "key id" is to be taken broadly in this context:  You
 can either put a numerical key ID here, an e-mail address, or even
--- doc/muttrc.man.head.orig	Sun Dec 22 20:50:22 2002
+++ doc/muttrc.man.head	Sat Mar 22 23:43:27 2003
@@ -288,3 +288,6 @@
 specify the ID of the public key to be used when encrypting messages
 to a certain recipient.  The meaning of "key ID" is to be taken
 broadly: This can be a different e-mail address, a numerical key ID,
-or even just an arbitrary search string.
+or even just an arbitrary search string.  You may use multiple

+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for
+recipient.
 .TP
 \fBpush\fP \fIstring\fP
 This command adds the named \fIstring\fP to the keyboard buffer.
--- hook.c	Tue Jan 21 13:25:21 2003
+++ hook.c	Thu Mar 20 21:38:47 2003
@@ -117,7 +117,11 @@

Line 0 Link Here

(-)./files/extra-patch-smime-outlook (+11 lines)
	1	--- crypt.c.orig Fri Mar 7 09:23:44 2003
	2	+++ crypt.c Fri Mar 21 00:06:48 2003
	3	@@ -440,7 +440,7 @@
	4	{
	5	len++;
	6	if (!ascii_strcasecmp ((t+len), "p7m"))
	7	-#if 0
	8	+#if 1
	9	return SMIMEENCRYPT;
	10	#else
	11	/* Not sure if this is the correct thing to do, but

Return to bug 50199

Lines 17-27 Link Here

(-)./files/extra-patch-pgp-dw (-7 / +3 lines)
17		17
18	The meaning of "key id" is to be taken broadly in this context: You	18	The meaning of "key id" is to be taken broadly in this context: You
19	can either put a numerical key ID here, an e-mail address, or even	19	can either put a numerical key ID here, an e-mail address, or even
20	--- doc/muttrc.man.head Sun Dec 22 20:50:22 2002	20	--- doc/muttrc.man.head.orig Sun Dec 22 20:50:22 2002
21	+++ doc/muttrc.man.head Thu Mar 20 21:38:47 2003	21	+++ doc/muttrc.man.head Sat Mar 22 23:43:27 2003
22	@@ -286,7 +286,10 @@	22	@@ -288,3 +288,6 @@
23	specify the ID of the public key to be used when encrypting messages
24	to a certain recipient. The meaning of "key ID" is to be taken
25	broadly: This can be a different e-mail address, a numerical key ID,	23	broadly: This can be a different e-mail address, a numerical key ID,
26	-or even just an arbitrary search string.	24	-or even just an arbitrary search string.
27	+or even just an arbitrary search string. You may use multiple	25	+or even just an arbitrary search string. You may use multiple
Lines 29-36 Link Here
29	+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for	27	+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for
30	+recipient.	28	+recipient.
31	.TP	29	.TP
32	\fBpush\fP \fIstring\fP
33	This command adds the named \fIstring\fP to the keyboard buffer.
34	--- hook.c Tue Jan 21 13:25:21 2003	30	--- hook.c Tue Jan 21 13:25:21 2003
35	+++ hook.c Thu Mar 20 21:38:47 2003	31	+++ hook.c Thu Mar 20 21:38:47 2003
36	@@ -117,7 +117,11 @@	32	@@ -117,7 +117,11 @@