Added CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/doc/html to

install the documentation into right place.

7 files changed, 71 insertions, 68 deletions

diff --git a/doc/TODO b/doc/TODO
index 0eb5d8ee45c..43c0244dfb4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.3543 2005/05/25 14:51:01 wiz Exp $
+$NetBSD: TODO,v 1.3544 2005/05/25 19:47:14 martti Exp $
 
 Suggested new packages
 ======================
@@ -1304,8 +1304,7 @@ Suggested cleanups in pkgsrc
 	  reports if any of the packages do not honor these
 	  configuration options and/or do not ship with pregenerated
 	  html documents.
-	  Affects: sysutils/gnome-vfs,
-	  x11/libxfce4gui, x11/libxfce4mcs, x11/libxfce4util
+	  Affects: sysutils/gnome-vfs
 
 	o Make packages utilize USE_X11 instead of USE_X11BASE if
 	  there is no good reason to install them into X11BASE.
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 58587b09925..45d08bb24af 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/30 07:04:06 martti Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/25 19:47:14 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,6 +7,8 @@ PKGNAME=	libxfce4gui-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 widget library
 
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 PKGCONFIG_OVERRIDE=	libxfcegui4/libxfcegui4-1.0.pc.in
 
 .include "../../databases/dbh/buildlink3.mk"
diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index e6868f1a69f..f099a196f50 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/18 06:10:30 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/05/25 19:47:14 martti Exp $
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libxfcegui4.mo
@@ -82,27 +82,27 @@ lib/pkgconfig/libxfcegui4-1.0.pc
 lib/xfce4/modules/libxfce4_combo.la
 lib/xfce4/modules/libxfce4_mime.la
 lib/xfce4/modules/libxfce4_mime_icons.la
-share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
-share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
-share/gtk-doc/html/libxfcegui4/XfceFramebox.html
-share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
-share/gtk-doc/html/libxfcegui4/home.png
-share/gtk-doc/html/libxfcegui4/index.html
-share/gtk-doc/html/libxfcegui4/index.sgml
-share/gtk-doc/html/libxfcegui4/left.png
-share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
-share/gtk-doc/html/libxfcegui4/reference.html
-share/gtk-doc/html/libxfcegui4/right.png
-share/gtk-doc/html/libxfcegui4/up.png
+share/doc/html/libxfcegui4/XfceAboutDialog.html
+share/doc/html/libxfcegui4/XfceAppMenuItem.html
+share/doc/html/libxfcegui4/XfceFramebox.html
+share/doc/html/libxfcegui4/XfceIconTheme.html
+share/doc/html/libxfcegui4/home.png
+share/doc/html/libxfcegui4/index.html
+share/doc/html/libxfcegui4/index.sgml
+share/doc/html/libxfcegui4/left.png
+share/doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html
+share/doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html
+share/doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
+share/doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
+share/doc/html/libxfcegui4/libxfcegui4-core.html
+share/doc/html/libxfcegui4/libxfcegui4-dialogs.html
+share/doc/html/libxfcegui4/libxfcegui4-fundamentals.html
+share/doc/html/libxfcegui4/libxfcegui4-netk.html
+share/doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
+share/doc/html/libxfcegui4/libxfcegui4.devhelp
+share/doc/html/libxfcegui4/reference.html
+share/doc/html/libxfcegui4/right.png
+share/doc/html/libxfcegui4/up.png
 share/xfce4/hicolor-index.theme
 share/xfce4/mime/applications.xml
 share/xfce4/mime/freedesktop.org.xml
@@ -115,5 +115,5 @@ share/xfce4/xfce-svg-test.svg
 @dirrm include/xfce4/libxfcegui4
 @dirrm lib/xfce4/modules
 @dirrm lib/xfce4
-@dirrm share/gtk-doc/html/libxfcegui4
+@dirrm share/doc/html/libxfcegui4
 @unexec ${RMDIR} %D/share/xfce4/mime 2>/dev/null || ${TRUE}
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index d36f7a2be03..baa98adeff0 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/25 19:47:14 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,6 +6,8 @@ DISTNAME=	libxfce4mcs-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 settings management library
 
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 PKGCONFIG_OVERRIDE=	libxfce4mcs/libxfce4mcs-client-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	libxfce4mcs/libxfce4mcs-manager-1.0.pc.in
 
diff --git a/x11/libxfce4mcs/PLIST b/x11/libxfce4mcs/PLIST
index 3c554c05e91..1cb715ffdec 100644
--- a/x11/libxfce4mcs/PLIST
+++ b/x11/libxfce4mcs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/01/17 12:56:13 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/05/25 19:47:14 martti Exp $
 include/xfce4/libxfce4mcs/mcs-client.h
 include/xfce4/libxfce4mcs/mcs-common.h
 include/xfce4/libxfce4mcs/mcs-manager.h
@@ -6,16 +6,16 @@ lib/libxfce4mcs-client.la
 lib/libxfce4mcs-manager.la
 lib/pkgconfig/libxfce4mcs-client-1.0.pc
 lib/pkgconfig/libxfce4mcs-manager-1.0.pc
-share/gtk-doc/html/libxfce4mcs/ch01.html
-share/gtk-doc/html/libxfce4mcs/home.png
-share/gtk-doc/html/libxfce4mcs/index.html
-share/gtk-doc/html/libxfce4mcs/index.sgml
-share/gtk-doc/html/libxfce4mcs/left.png
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-client.html
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
-share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
-share/gtk-doc/html/libxfce4mcs/right.png
-share/gtk-doc/html/libxfce4mcs/up.png
-@dirrm share/gtk-doc/html/libxfce4mcs
+share/doc/html/libxfce4mcs/ch01.html
+share/doc/html/libxfce4mcs/home.png
+share/doc/html/libxfce4mcs/index.html
+share/doc/html/libxfce4mcs/index.sgml
+share/doc/html/libxfce4mcs/left.png
+share/doc/html/libxfce4mcs/libxfce4mcs-mcs-client.html
+share/doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
+share/doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
+share/doc/html/libxfce4mcs/libxfce4mcs.devhelp
+share/doc/html/libxfce4mcs/right.png
+share/doc/html/libxfce4mcs/up.png
+@dirrm share/doc/html/libxfce4mcs
 @dirrm include/xfce4/libxfce4mcs
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 7f59bbe7e07..d62d0c71993 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/25 19:47:14 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,6 +6,8 @@ DISTNAME=	libxfce4util-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 basic library
 
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 PKGCONFIG_OVERRIDE=	libxfce4util/libxfce4util-1.0.pc.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST
index c90ec6b892e..bb6266b69a9 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/04/15 04:23:20 martti Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/05/25 19:47:14 martti Exp $
 include/xfce4/libxfce4util/debug.h
 include/xfce4/libxfce4util/i18n.h
 include/xfce4/libxfce4util/libxfce4util-config.h
@@ -15,28 +15,28 @@ include/xfce4/libxfce4util/xfce-resource.h
 lib/libxfce4util.la
 lib/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
-share/gtk-doc/html/libxfce4util/home.png
-share/gtk-doc/html/libxfce4util/index.html
-share/gtk-doc/html/libxfce4util/index.sgml
-share/gtk-doc/html/libxfce4util/left.png
-share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
-share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-core.html
-share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
-share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
-share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
-share/gtk-doc/html/libxfce4util/reference.html
-share/gtk-doc/html/libxfce4util/right.png
-share/gtk-doc/html/libxfce4util/up.png
+share/doc/html/libxfce4util/home.png
+share/doc/html/libxfce4util/index.html
+share/doc/html/libxfce4util/index.sgml
+share/doc/html/libxfce4util/left.png
+share/doc/html/libxfce4util/libxfce4util-Desktop-entries.html
+share/doc/html/libxfce4util/libxfce4util-File-Utilities.html
+share/doc/html/libxfce4util/libxfce4util-Internationalisation.html
+share/doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
+share/doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
+share/doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
+share/doc/html/libxfce4util/libxfce4util-Standard-Macros.html
+share/doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
+share/doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
+share/doc/html/libxfce4util/libxfce4util-core.html
+share/doc/html/libxfce4util/libxfce4util-datatypes.html
+share/doc/html/libxfce4util/libxfce4util-fundamentals.html
+share/doc/html/libxfce4util/libxfce4util-utilities.html
+share/doc/html/libxfce4util/libxfce4util.devhelp
+share/doc/html/libxfce4util/reference.html
+share/doc/html/libxfce4util/right.png
+share/doc/html/libxfce4util/up.png
 share/xfce4/m4/X11.m4
 share/xfce4/m4/debug.m4
 share/xfce4/m4/depends.m4
@@ -44,7 +44,5 @@ share/xfce4/m4/i18n.m4
 @dirrm include/xfce4/libxfce4util
 @dirrm include/xfce4
 @dirrm share/xfce4/m4
-@dirrm share/gtk-doc/html/libxfce4util
+@dirrm share/doc/html/libxfce4util
 @unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE}