fix some installation problems, and make it work with default 'C' locale

4 files changed, 26 insertions, 6 deletions

diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index d5eb522dff3..884622d8422 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/01/04 18:00:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/01/20 19:16:15 drochner Exp $
 #
 
 DISTNAME=	diffuse-0.2.15
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=diffuse/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,8 +40,10 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/diffuse ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/diffuse.png \
 		${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 \
@@ -53,7 +56,8 @@ do-install:
 		${DESTDIR}${PREFIX}/share/examples/diffuse
 
 .include "../../lang/python/application.mk"
-.include "../../textproc/rarian/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.10
 .include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/diffuse/PLIST b/devel/diffuse/PLIST
index fe53b8f0360..9bc24690b67 100644
--- a/devel/diffuse/PLIST
+++ b/devel/diffuse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/09 14:19:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/20 19:16:15 drochner Exp $
 bin/diffuse
 man/man1/diffuse.1
 share/applications/diffuse.desktop
@@ -28,11 +28,13 @@ share/diffuse/syntax/verilog.syntax
 share/diffuse/syntax/vhdl.syntax
 share/diffuse/syntax/xml.syntax
 share/examples/diffuse/diffuserc
-share/gnome/help/diffuse/C
-share/omf/diffuse
+share/gnome/help/diffuse/C/diffuse.xml
+share/omf/diffuse/diffuse-C.omf
 share/pixmaps/diffuse.png
 @comment in xdg-dirs: @dirrm share/pixmaps
+@dirrm share/omf/diffuse
 @comment in rarian: @dirrm share/omf
+@dirrm share/gnome/help/diffuse/C
 @dirrm share/gnome/help/diffuse
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/examples/diffuse
diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
index b2fbf523d4a..15d5360bb02 100644
--- a/devel/diffuse/distinfo
+++ b/devel/diffuse/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/09 14:19:21 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/01/20 19:16:15 drochner 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
diff --git a/devel/diffuse/patches/patch-aa b/devel/diffuse/patches/patch-aa
new file mode 100644
index 00000000000..a3413b124f1
--- /dev/null
+++ b/devel/diffuse/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2009/01/20 19:16:15 drochner Exp $
+
+--- src/usr/bin/diffuse.orig	2009-01-19 17:58:19.000000000 +0100
++++ 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