Attachment 49891 Details for Bug 76128 – file.diff

[patch] file.diff

file.diff (text/plain), 3.62 KB, created by Udo.Schweigert on 2005-01-12 08:10:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Udo.Schweigert

Created: 2005-01-12 08:10:21 UTC

Size: 3.62 KB

patch

obsolete

>diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
>--- /usr/ports/mail/mutt-devel/Makefile	Sun Jan  9 06:11:20 2005
>+++ ./Makefile	Wed Jan 12 08:38:21 2005
>@@ -87,6 +87,10 @@
> #
> # If you want to have the Maildir mtime patch define:
> #  WITH_MUTT_MAILDIR_MTIME_PATCH
>+#
>+# If you want to have the Mailbox Sidebar patch define:
>+#  WITH_MUTT_SIDEBAR_PATCH
>+#
> 
> PORTNAME=	mutt-devel
> PORTVERSION=	1.5.6
>@@ -107,7 +111,8 @@
> 		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://home.woolridge.ca/mutt/patches/:dw \
>+		http://thomer.com/mutt/:thomer
> 
> MAINTAINER?=	udo.schweigert@siemens.com
> COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
>@@ -160,6 +165,17 @@
> .if defined(WITH_MUTT_IMAP_HEADER_CACHE)
> WITH_MUTT_MAILDIR_HEADER_CACHE=	yes
> .endif
>+.if defined(WITH_MUTT_SIDEBAR_PATCH)
>+.if defined(WITH_MUTT_NNTP)
>+.error The WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
>+.endif
>+.if defined(WITH_MUTT_MAILDIR_MTIME_PATCH)
>+.error The WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_MAILDIR_MTIME_PATCH are not compatible
>+.endif
>+.if defined(WITH_MUTT_SIGNATURE_MENU)
>+.error The WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_SIGNATURE_MENU are not compatible
>+.endif
>+.endif
> 
> # XXX
> # this should be done automagically by aclocal but ....
>@@ -332,6 +348,9 @@
> .if defined(WITH_MUTT_MBOX_HOOK_PATCH)
> PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
> .endif
>+.if defined(WITH_MUTT_SIDEBAR_PATCH)
>+PATCHFILES+=	patch-1.5.6i.sidebar.20041122.txt:thomer
>+.endif
> 
> WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
> MAN1=		mutt.1 mutt_dotlock.1
>@@ -361,6 +380,9 @@
> .if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
> SCRIPTS_ENV+=	MUTT_MAILDIR_HEADER_CACHE="yes"
> CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --with-bdb
>+.endif
>+.if defined(WITH_MUTT_SIDEBAR_PATCH)
>+SCRIPTS_ENV+=	MUTT_SIDEBAR_PATCH="yes"
> .endif
> .if defined(WITH_MUTT_EDIT_THREADS)
> SCRIPTS_ENV+=	MUTT_EDIT_THREADS="yes"
>diff -ru  /usr/ports/mail/mutt-devel/distinfo ./distinfo
>--- /usr/ports/mail/mutt-devel/distinfo	Tue Feb 10 19:27:50 2004
>+++ ./distinfo	Wed Jan 12 08:38:21 2005
>@@ -16,3 +16,5 @@
> SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
> MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
> SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
>+MD5 (mutt/patch-1.5.6i.sidebar.20041122.txt) = 3c5f1be18b9fb2be693c8c717f6b940c
>+SIZE (mutt/patch-1.5.6i.sidebar.20041122.txt) = 46178
>diff -ru  /usr/ports/mail/mutt-devel/files/patch-crypt.c ./files/patch-crypt.c
>--- /usr/ports/mail/mutt-devel/files/patch-crypt.c	Thu Jan  1 01:00:00 1970
>+++ ./files/patch-crypt.c	Wed Jan 12 08:37:54 2005
>@@ -0,0 +1,11 @@
>+--- crypt.c.orig	Tue Jan 11 16:20:48 2005
>++++ crypt.c	Tue Jan 11 16:21:10 2005
>+@@ -596,6 +596,8 @@
>+     }
>+     else if (a->encoding == ENC8BIT)
>+       a->encoding = ENCQUOTEDPRINTABLE;
>++    else if (a->encoding == ENC7BIT)
>++      /* empty */ ;
>+     else if (a->encoding == ENCBINARY)
>+       a->encoding = ENCBASE64;
>+     else if (a->content && a->encoding != ENCBASE64 &&
>diff -ru  /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist
>--- /usr/ports/mail/mutt-devel/scripts/generate-plist	Sun Jan  9 06:11:20 2005
>+++ ./scripts/generate-plist	Wed Jan 12 08:38:21 2005
>@@ -147,6 +147,9 @@
>     if [ "$MUTT_MAILDIR_HEADER_CACHE" = "yes" ]; then
>       html=$(($html + 3))
>     fi
>+    if [ "$MUTT_SIDEBAR_PATCH" = "yes" ]; then
>+      html=$(($html + 2))
>+    fi
>     if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then
>       html=$(($html + 1))
>     fi

Actions: View | Diff

Attachments on bug 76128: 49891