Update to 0.4.0:

Diffuse 0.4.0 - 2009-08-17
- changed the default hotkeys for merging to reflect the direction text "moves"
- added format menu with new items for changing case, sorting, and manipulating white space
- replaced 'Hide end of line characters' preference with 'Show white space characters'
- errors are now reported in a dialogue instead of printing to stderr
- optimised redraws when only the cursor position has changed
- input methods that use pre-editing can now be used when editing text
- dead keys can now be used when editing text
- updated Monotone support to use 'mtn automate inventory'
- Git support now handles files flagged as 'unmerged'
- graceful handling of and non-zero exit codes from 'git status'
- added version control section to the manual
- minor bug fixes

4 files changed, 8 insertions, 22 deletions

diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index f1eb5f00bb6..d0645131716 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/08/17 18:33:22 hasso Exp $
+# $NetBSD: Makefile,v 1.14 2009/08/20 09:06:40 wiz Exp $
 #
 
-DISTNAME=	diffuse-0.3.4
+DISTNAME=	diffuse-0.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=diffuse/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/diffuse/PLIST b/devel/diffuse/PLIST
index 8ff59839b00..1559fe54fea 100644
--- a/devel/diffuse/PLIST
+++ b/devel/diffuse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/08/06 21:52:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/08/20 09:06:40 wiz Exp $
 bin/diffuse
 man/man1/diffuse.1
 share/applications/diffuse.desktop
@@ -7,6 +7,7 @@ share/diffuse/syntax/c++.syntax
 share/diffuse/syntax/csh.syntax
 share/diffuse/syntax/csharp.syntax
 share/diffuse/syntax/css.syntax
+share/diffuse/syntax/fortran.syntax
 share/diffuse/syntax/gettext.syntax
 share/diffuse/syntax/glsl.syntax
 share/diffuse/syntax/html.syntax
diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
index 1013f322d5d..1945614965c 100644
--- a/devel/diffuse/distinfo
+++ b/devel/diffuse/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/08/06 21:52:07 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/08/20 09:06:40 wiz Exp $
 
-SHA1 (diffuse-0.3.4.tar.bz2) = f221d248b44d978fc031cb739e382d9058ca4efc
-RMD160 (diffuse-0.3.4.tar.bz2) = 54f8ffaed9bc2153e1ed3acb64a3e9fd000ee2a1
-Size (diffuse-0.3.4.tar.bz2) = 102845 bytes
-SHA1 (patch-aa) = d314791a740b878af9041c70920562fa6385708d
+SHA1 (diffuse-0.4.0.tar.bz2) = d143c5415c71ac07e9b57ff8b3b79f196bf810ca
+RMD160 (diffuse-0.4.0.tar.bz2) = 91cd8f13e40eb25bccab57c47ea3311e53ed38d9
+Size (diffuse-0.4.0.tar.bz2) = 109438 bytes
diff --git a/devel/diffuse/patches/patch-aa b/devel/diffuse/patches/patch-aa
deleted file mode 100644
index 14c8d685187..00000000000
--- a/devel/diffuse/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/08/06 21:52:07 wiz Exp $
-
---- src/usr/bin/diffuse.orig	2009-07-03 23:11:09.000000000 +0000
-+++ src/usr/bin/diffuse
-@@ -3368,7 +3368,9 @@ class FileDiffViewer(gtk.Table):
-             # middle mouse button, paste primary selection
-             if self.mode == CHAR_MODE and f == self.current_pane:
-                 self.button_press(f, x, y, False)
-+		self.openUndoBlock()
-                 gtk.clipboard_get(gtk.gdk.SELECTION_PRIMARY).request_text(self.receive_clipboard_text_cb)
-+		self.closeUndoBlock()
-         elif event.button == 3:
-             # right mouse button, raise context sensitive menu
-             can_align = (self.mode == LINE_MODE and (f == self.current_pane + 1 or f == self.current_pane - 1))