fix help file installation in the !gnome case, problem found by

Lubomir Sedlacik
(no PKGREVISION bump because the default case is not affected)
Help display seems fundamentally broken to me in the !gnome case;
the code looks for an "index.html" which is not installed (and which
no make rule is present for).

6 files changed, 82 insertions, 39 deletions

diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index f72555f34d8..fe945b8f596 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/05/02 16:23:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/06/11 16:55:35 drochner Exp $
 bin/dia
 lib/dia/libaadl_objects.la
 lib/dia/libbondgraph_objects.la
@@ -1542,34 +1542,34 @@ share/dia/xslt/dia-uml2java.xsl
 share/dia/xslt/dia-uml2owl.xsl
 share/dia/xslt/dia-uml2python.xsl
 share/dia/xslt/stylesheets.xml
-share/gnome/help/dia/C
-share/gnome/help/dia/en/authors.xml
-share/gnome/help/dia/en/dia.xml
-share/gnome/help/dia/en/entities.xml
-share/gnome/help/dia/en/graphics/greendots.png
-share/gnome/help/dia/en/graphics/home_network.png
-share/gnome/help/dia/en/graphics/line_icon.png
-share/gnome/help/dia/en/graphics/line_props.png
-share/gnome/help/dia/en/intro.xml
-share/gnome/help/dia/en/license.xml
-share/gnome/help/dia/en/usage-canvas.xml
-share/gnome/help/dia/en/usage-customization.xml
-share/gnome/help/dia/en/usage-layers.xml
-share/gnome/help/dia/en/usage-loadsave.xml
-share/gnome/help/dia/en/usage-objects-basic.xml
-share/gnome/help/dia/en/usage-objects-selecting.xml
-share/gnome/help/dia/en/usage-objects-special.xml
-share/gnome/help/dia/en/usage-objects.xml
-share/gnome/help/dia/en/usage-quickstart.xml
-share/gnome/help/dia/eu/dia.xml
-share/gnome/help/dia/eu/graphics/greendots.png
-share/gnome/help/dia/eu/graphics/home_network.png
-share/gnome/help/dia/eu/graphics/line_icon.png
-share/gnome/help/dia/eu/graphics/line_props.png
-share/gnome/help/dia/pl/dia.xml
-share/gnome/help/dia/pl/graphics/greendots.png
-share/gnome/help/dia/pl/graphics/home_network.png
-share/gnome/help/dia/pl/graphics/line_props.png
+${DIA_HELPDIR}/C
+${DIA_HELPDIR}/en/authors.xml
+${DIA_HELPDIR}/en/dia.xml
+${DIA_HELPDIR}/en/entities.xml
+${DIA_HELPDIR}/en/graphics/greendots.png
+${DIA_HELPDIR}/en/graphics/home_network.png
+${DIA_HELPDIR}/en/graphics/line_icon.png
+${DIA_HELPDIR}/en/graphics/line_props.png
+${DIA_HELPDIR}/en/intro.xml
+${DIA_HELPDIR}/en/license.xml
+${DIA_HELPDIR}/en/usage-canvas.xml
+${DIA_HELPDIR}/en/usage-customization.xml
+${DIA_HELPDIR}/en/usage-layers.xml
+${DIA_HELPDIR}/en/usage-loadsave.xml
+${DIA_HELPDIR}/en/usage-objects-basic.xml
+${DIA_HELPDIR}/en/usage-objects-selecting.xml
+${DIA_HELPDIR}/en/usage-objects-special.xml
+${DIA_HELPDIR}/en/usage-objects.xml
+${DIA_HELPDIR}/en/usage-quickstart.xml
+${DIA_HELPDIR}/eu/dia.xml
+${DIA_HELPDIR}/eu/graphics/greendots.png
+${DIA_HELPDIR}/eu/graphics/home_network.png
+${DIA_HELPDIR}/eu/graphics/line_icon.png
+${DIA_HELPDIR}/eu/graphics/line_props.png
+${DIA_HELPDIR}/pl/dia.xml
+${DIA_HELPDIR}/pl/graphics/greendots.png
+${DIA_HELPDIR}/pl/graphics/home_network.png
+${DIA_HELPDIR}/pl/graphics/line_props.png
 share/locale/am/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
 share/locale/be/LC_MESSAGES/dia.mo
@@ -1631,13 +1631,13 @@ share/pixmaps/dia_gnome_icon.png
 @exec ${MKDIR} %D/share/oaf
 @dirrm share/oaf
 @comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/gnome/help/dia/pl/graphics
-@dirrm share/gnome/help/dia/pl
-@dirrm share/gnome/help/dia/eu/graphics
-@dirrm share/gnome/help/dia/eu
-@dirrm share/gnome/help/dia/en/graphics
-@dirrm share/gnome/help/dia/en
-@dirrm share/gnome/help/dia
+@dirrm ${DIA_HELPDIR}/pl/graphics
+@dirrm ${DIA_HELPDIR}/pl
+@dirrm ${DIA_HELPDIR}/eu/graphics
+@dirrm ${DIA_HELPDIR}/eu
+@dirrm ${DIA_HELPDIR}/en/graphics
+@dirrm ${DIA_HELPDIR}/en
+@dirrm ${DIA_HELPDIR}
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/dia/xslt
 @dirrm share/dia/sheets/UML
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 3776412458d..2718ac41098 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.17 2006/05/31 17:50:12 drochner Exp $
+$NetBSD: distinfo,v 1.18 2006/06/11 16:55:35 drochner Exp $
 
 SHA1 (dia-0.95-1.tar.gz) = eb00a1a2a2b7b3dd966e4375557b770cf75ffb34
 RMD160 (dia-0.95-1.tar.gz) = c903b34fa4f7f2e2ff7e9ec8497608d92c76d7b1
 Size (dia-0.95-1.tar.gz) = 6035584 bytes
 SHA1 (patch-aa) = f556878638291a696894181c5a6907e688589530
 SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
+SHA1 (patch-ca) = 48617d334d852253f858176bbe9222f61d379c37
+SHA1 (patch-cb) = fab6a63d25781fa9ab7c6a4f6e5ff43ff29aec6e
+SHA1 (patch-cc) = f2c58551d31ec577d25f9dfc62f48f28845d2dd7
diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk
index c38917a58b3..e235c47289b 100644
--- a/graphics/dia/options.mk
+++ b/graphics/dia/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $
+# $NetBSD: options.mk,v 1.4 2006/06/11 16:55:35 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dia
 #PKG_SUPPORTED_OPTIONS=	gnome cairo
@@ -13,9 +13,11 @@ CONFIGURE_ARGS+=	--enable-gnome
 .  include "../../devel/libgnome/buildlink3.mk"
 .  include "../../devel/libgnomeui/buildlink3.mk"
 PLIST_SUBST+=		GNOME_OPTION=
+PLIST_SUBST+=		DIA_HELPDIR=share/gnome/help/dia
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 PLIST_SUBST+=		GNOME_OPTION='@comment '
+PLIST_SUBST+=		DIA_HELPDIR=share/dia/help
 .endif
 
 # Disabled, freedesktop is down.
@@ -27,4 +29,3 @@ PLIST_SUBST+=		CAIRO_OPTION=
 CONFIGURE_ARGS+=	--without-cairo
 PLIST_SUBST+=		CAIRO_OPTION='@comment '
 .endif
-
diff --git a/graphics/dia/patches/patch-ca b/graphics/dia/patches/patch-ca
new file mode 100644
index 00000000000..1fc28f07955
--- /dev/null
+++ b/graphics/dia/patches/patch-ca
@@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1 2006/06/11 16:55:35 drochner Exp $
+
+--- doc/en/Makefile.in.orig	2006-06-11 17:34:55.000000000 +0200
++++ doc/en/Makefile.in
+@@ -326,7 +326,7 @@ docname = dia
+ lang = en
+ omffile = 
+ entities = 
+-@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang)
+ 
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
diff --git a/graphics/dia/patches/patch-cb b/graphics/dia/patches/patch-cb
new file mode 100644
index 00000000000..5ffe4c94d62
--- /dev/null
+++ b/graphics/dia/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2006/06/11 16:55:35 drochner Exp $
+
+--- doc/eu/Makefile.in.orig	2006-06-11 17:35:09.000000000 +0200
++++ doc/eu/Makefile.in
+@@ -326,7 +326,7 @@ docname = dia
+ lang = eu
+ omffile = 
+ entities = 
+-@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang)
+ 
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
diff --git a/graphics/dia/patches/patch-cc b/graphics/dia/patches/patch-cc
new file mode 100644
index 00000000000..0c2184fa56d
--- /dev/null
+++ b/graphics/dia/patches/patch-cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-cc,v 1.1 2006/06/11 16:55:35 drochner Exp $
+
+--- doc/pl/Makefile.in.orig	2006-06-11 17:35:25.000000000 +0200
++++ doc/pl/Makefile.in
+@@ -322,7 +322,7 @@ docname = dia
+ lang = pl
+ omffile = 
+ entities = 
+-@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang)
+ 
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.