Attachment #27081 for bug #46043

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




#  WITH_MUTT_IFDEF_PATCH

PORTNAME=	mutt-devel
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/mutt/devel/
DISTNAME=	mutt-${PORTVERSION}i

MAINTAINER=	udo.schweigert@siemens.com

SGML_NEEDED=	yes
.endif
.if defined(WITH_MUTT_EDIT_THREADS)
.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)
.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)
.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)
.error The WITH_MUTT_MBOX_HOOK_PATCH option is currently not available
#PATCHFILES+=	patch-1.5.1.dw.mbox-hook.1
.endif

WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}

Lines 1-9 Link Here

(-)./distinfo (-9 / +5 lines)
1	MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da	1	MD5 (mutt/mutt-1.5.2i.tar.gz) = d4bdf72fee7b438159048a206a7c2c34
2	MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8	2	MD5 (mutt/patch-1.5.2.rr.compressed.gz) = 18733d9d257ebafefb65c723c1447832
3	MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d	3	MD5 (mutt/patch-1.5.2.vvv.nntp.gz) = 6b57686dc851079f1565cde2f2034e55
4	MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e	4	MD5 (mutt/patch-1.5.2.vvv.initials.gz) = cecf088758e0b18f1b6902db268b842d
5	MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318	5	MD5 (mutt/patch-1.5.2.vvv.quote.gz) = 17b56c38941de0a46e629d8bd859ff0b
6	MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f
7	MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3
8	MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90
9	MD5 (mutt/patch-1.5.1.dw.mbox-hook.1) = 2a04bc3bae302ed106c1f320398b902f




+++ PATCHES	31 Aug 2002 22:01:56 -0000
@@ -0,0 +1 @@
+patch-1.5.1.dw.pgp-hook.3
--- hook.c.orig	Wed Jul 24 11:01:29 2002
+++ hook.c	Fri Dec  6 23:47:52 2002
@@ -118,7 +118,11 @@
 	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_REPLYHOOK | M_CRYPTHOOK))
+#else
       if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
+#endif /* M_CRYPTHOOK */
       {
 	/* these hooks allow multiple commands with the same
 	 * pattern, so if we've already seen this pattern/command pair, just
@@ -445,9 +449,25 @@
 }
 
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)

Lines 121-127 Link Here

(-)./scripts/generate-plist (-1 / +1 lines)
121	fi	121	fi
122		122
123	if [ "$MUTT_HTML" = "yes" ]; then	123	if [ "$MUTT_HTML" = "yes" ]; then
124	html=361	124	html=363
125	if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then	125	if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
126	html=$(($html + 5))	126	html=$(($html + 5))
127	fi	127	fi

Return to bug 46043

Lines 67-81 Link Here

(-)./Makefile (-7 / +11 lines)
67	# WITH_MUTT_IFDEF_PATCH	67	# WITH_MUTT_IFDEF_PATCH
68		68
69	PORTNAME= mutt-devel	69	PORTNAME= mutt-devel
70	PORTVERSION= 1.5.1	70	PORTVERSION= 1.5.2
71	PORTREVISION?= 4	71	#PORTREVISION?= 0
72	CATEGORIES+= mail	72	CATEGORIES+= mail
73	.if defined(WITH_MUTT_NNTP)	73	.if defined(WITH_MUTT_NNTP)
74	CATEGORIES+= news	74	CATEGORIES+= news
75	.endif	75	.endif
76	MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \	76	MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
77	ftp://ftp.parodius.com/pub/mutt/devel/ \	77	ftp://ftp.parodius.com/pub/mutt/devel/ \
78	ftp://ftp.mutt.org/pub/mutt/devel/	78	ftp://ftp.mutt.org/mutt/devel/
79	DISTNAME= mutt-${PORTVERSION}i	79	DISTNAME= mutt-${PORTVERSION}i
80		80
81	MAINTAINER= udo.schweigert@siemens.com	81	MAINTAINER= udo.schweigert@siemens.com
Lines 220-239 Link Here
220	SGML_NEEDED= yes	220	SGML_NEEDED= yes
221	.endif	221	.endif
222	.if defined(WITH_MUTT_EDIT_THREADS)	222	.if defined(WITH_MUTT_EDIT_THREADS)
223	PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2	223	.error The WITH_MUTT_EDIT_THREADS option is currently not available
		224	#PATCHFILES+= patch-${PATCH_VERSION}.cd.edit_threads.9.2
224	CONFIGURE_ARGS+= --enable-imap-edit-threads	225	CONFIGURE_ARGS+= --enable-imap-edit-threads
225	SGML_NEEDED= yes	226	SGML_NEEDED= yes
226	.endif	227	.endif
227	.if defined(WITH_MUTT_SIGNATURE_MENU)	228	.if defined(WITH_MUTT_SIGNATURE_MENU)
228	PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1	229	.error The WITH_MUTT_SIGNATURE_MENU option is currently not available
		230	#PATCHFILES+= patch-${PATCH_VERSION}.cd.signatures_menu.2.1
229	SGML_NEEDED= yes	231	SGML_NEEDED= yes
230	.endif	232	.endif
231	.if defined(WITH_MUTT_IFDEF_PATCH)	233	.if defined(WITH_MUTT_IFDEF_PATCH)
232	PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1	234	.error The WITH_MUTT_IFDEF_PATCH option is currently not available
		235	#PATCHFILES+= patch-${PATCH_VERSION}.cd.ifdef.1
233	SGML_NEEDED= yes	236	SGML_NEEDED= yes
234	.endif	237	.endif
235	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)	238	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
236	PATCHFILES+= patch-1.5.1.dw.mbox-hook.1	239	.error The WITH_MUTT_MBOX_HOOK_PATCH option is currently not available
		240	#PATCHFILES+= patch-1.5.1.dw.mbox-hook.1
237	.endif	241	.endif
238		242
239	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}	243	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}

Lines 3-23 Link Here

(-)./files/extra-patch-pgp-dw (-6 / +6 lines)
3	+++ PATCHES 31 Aug 2002 22:01:56 -0000	3	+++ PATCHES 31 Aug 2002 22:01:56 -0000
4	@@ -0,0 +1 @@	4	@@ -0,0 +1 @@
5	+patch-1.5.1.dw.pgp-hook.3	5	+patch-1.5.1.dw.pgp-hook.3
6	--- hook.c 5 Feb 2002 21:30:31 -0000 3.3	6	--- hook.c.orig Wed Jul 24 11:01:29 2002
7	+++ hook.c 31 Aug 2002 22:01:56 -0000	7	+++ hook.c Fri Dec 6 23:47:52 2002
8	@@ -118,7 +118,11 @@ int mutt_parse_hook (BUFFER *buf, BUFFER	8	@@ -118,7 +118,11 @@
9	ptr->rx.not == not &&	9	ptr->rx.not == not &&
10	!mutt_strcmp (pattern.data, ptr->rx.pattern))	10	!mutt_strcmp (pattern.data, ptr->rx.pattern))
11	{	11	{
12	+#ifdef M_CRYPTHOOK	12	+#ifdef M_CRYPTHOOK
13	+ if (data & (M_FOLDERHOOK \| M_SENDHOOK \| M_MESSAGEHOOK \| M_ACCOUNTHOOK \| M_CRYPTHOOK))	13	+ if (data & (M_FOLDERHOOK \| M_SENDHOOK \| M_MESSAGEHOOK \| M_ACCOUNTHOOK \| M_REPLYHOOK \| M_CRYPTHOOK))
14	+#else	14	+#else
15	if (data & (M_FOLDERHOOK \| M_SENDHOOK \| M_MESSAGEHOOK \| M_ACCOUNTHOOK))	15	if (data & (M_FOLDERHOOK \| M_SENDHOOK \| M_MESSAGEHOOK \| M_ACCOUNTHOOK \| M_REPLYHOOK))
16	+#endif /* M_CRYPTHOOK */	16	+#endif /* M_CRYPTHOOK */
17	{	17	{
18	/* these hooks allow multiple commands with the same	18	/* these hooks allow multiple commands with the same
19	* pattern, so if we've already seen this pattern/command pair, just	19	* pattern, so if we've already seen this pattern/command pair, just
20	@@ -445,9 +449,25 @@ char mutt_iconv_hook (const char chs)	20	@@ -445,9 +449,25 @@
21	}	21	}
22		22
23	#if defined(HAVE_PGP) \|\| defined(HAVE_SMIME)	23	#if defined(HAVE_PGP) \|\| defined(HAVE_SMIME)