Update to 0.3.1. Avoid using urllib, because it causes a core dump.

Next release will not use urllib.

Diffuse 0.3.1 - 2009-03-05
- fixed a typo that broke the 'Find...' dialogue

Diffuse 0.3.0 - 2009-03-03
- new Windows installer
- notification on focus change when files change on disk
- menu items for adjusting indentation
- syntax highlighting for Objective-C++
- '-c' option now works with CVS-style revision numbers
- window title now describes current tab
- search settings now persist across sessions
- minor bug fixes

4 files changed, 21 insertions, 22 deletions

diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 50c3a14ad0c..6fc4989615a 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/03/07 03:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/04/06 10:13:28 wiz Exp $
 #
 
-DISTNAME=	diffuse-0.2.15
-PKGREVISION=	2
+DISTNAME=	diffuse-0.3.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=diffuse/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +18,7 @@ USE_DIRS=	xdg-1.4 gnome2-1.6
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/applications
 INSTALLATION_DIRS+=	share/diffuse/syntax share/examples/diffuse
 INSTALLATION_DIRS+=	share/gnome/help/diffuse share/pixmaps
+INSTALLATION_DIRS+=	share/gnome/help/diffuse/C share/omf/diffuse
 
 CONF_FILES+=	${PREFIX}/share/examples/diffuse/diffuserc \
 		${PKG_SYSCONFDIR}/diffuserc
@@ -43,10 +43,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/diffuse ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/diffuse.png \
 		${DESTDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gnome/help/diffuse/C
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/diffuse/C/diffuse.xml \
 		${DESTDIR}${PREFIX}/share/gnome/help/diffuse/C
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/omf/diffuse
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/diffuse/diffuse-C.omf \
 		${DESTDIR}${PREFIX}/share/omf/diffuse
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/diffuse.desktop \
diff --git a/devel/diffuse/PLIST b/devel/diffuse/PLIST
index 9bc24690b67..044e56e9fc1 100644
--- a/devel/diffuse/PLIST
+++ b/devel/diffuse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/01/20 19:16:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/04/06 10:13:28 wiz Exp $
 bin/diffuse
 man/man1/diffuse.1
 share/applications/diffuse.desktop
@@ -14,6 +14,7 @@ share/diffuse/syntax/java.syntax
 share/diffuse/syntax/javascript.syntax
 share/diffuse/syntax/jsp.syntax
 share/diffuse/syntax/makefile.syntax
+share/diffuse/syntax/objective-c++.syntax
 share/diffuse/syntax/octave.syntax
 share/diffuse/syntax/pascal.syntax
 share/diffuse/syntax/patch.syntax
diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
index 15d5360bb02..7e3f69c0253 100644
--- a/devel/diffuse/distinfo
+++ b/devel/diffuse/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/01/20 19:16:15 drochner Exp $
+$NetBSD: distinfo,v 1.3 2009/04/06 10:13:28 wiz Exp $
 
-SHA1 (diffuse-0.2.15.tar.bz2) = 4f5869ec8aed35d875566e7fc52fa7e981dcf8a2
-RMD160 (diffuse-0.2.15.tar.bz2) = ad87a8c30ec9915d5d632429b41c666494863eb7
-Size (diffuse-0.2.15.tar.bz2) = 67417 bytes
-SHA1 (patch-aa) = 6f654f2866b536baf83c434a3ab855537ca349e1
+SHA1 (diffuse-0.3.1.tar.bz2) = e7cfcb8c066c0f1ac57425966668f3e8a5d76c3a
+RMD160 (diffuse-0.3.1.tar.bz2) = 7fc0f785794923994efef5dfd15185ad6d0310aa
+Size (diffuse-0.3.1.tar.bz2) = 88923 bytes
+SHA1 (patch-aa) = 1a98c5d6b9b61ee611ad8748bdb7d8f531bf286e
diff --git a/devel/diffuse/patches/patch-aa b/devel/diffuse/patches/patch-aa
index a3413b124f1..fc85365debe 100644
--- a/devel/diffuse/patches/patch-aa
+++ b/devel/diffuse/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2009/01/20 19:16:15 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2009/04/06 10:13:28 wiz Exp $
 
---- src/usr/bin/diffuse.orig	2009-01-19 17:58:19.000000000 +0100
+--- src/usr/bin/diffuse.orig	2009-03-30 09:58:33.000000000 +0000
 +++ src/usr/bin/diffuse
-@@ -177,6 +177,8 @@ def getExePath(s):
- # find the help directory for the current locale
- def getLocalisedDir(s):
-     lang = locale.getdefaultlocale()[0]
-+    if not lang:
-+	lang = 'C'
-     path = os.path.join(s, lang)
-     if os.path.exists(path):
-         return path
+@@ -100,7 +100,7 @@ import shlex
+ import stat
+ import string
+ import subprocess
+-import urllib
++#import urllib
+ import webbrowser
+ 
+ # platform tests