remove --with-html-dor so that the gtk-doc files are found by devhelp,

bump PKGREVISION

6 files changed, 66 insertions, 74 deletions

diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 1a29543a42e..27e6de0dafa 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2006/06/11 14:34:13 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/08/11 09:43:09 drochner Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	libxfcegui4-${XFCE4_VERSION}
 PKGNAME=	libxfce4gui-${XFCE4_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 COMMENT=	Xfce widget library
 
 USE_TOOLS+=	msgfmt
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc/html
 
 PKGCONFIG_OVERRIDE=	libxfcegui4/libxfcegui4-1.0.pc.in
 
diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST
index 994c2b5c9ed..de596bc8f8a 100644
--- a/x11/libxfce4gui/PLIST
+++ b/x11/libxfce4gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:48 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/08/11 09:43:09 drochner Exp $
 include/xfce4/libxfcegui4/dialogs.h
 include/xfce4/libxfcegui4/gtk_style.h
 include/xfce4/libxfcegui4/gtktoxevent.h
@@ -50,27 +50,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/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/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/locale/af/LC_MESSAGES/libxfcegui4.mo
 share/locale/be/LC_MESSAGES/libxfcegui4.mo
 share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo
@@ -122,5 +122,5 @@ share/xfce4/xfce-svg-test.svg
 @dirrm include/xfce4/libxfcegui4
 @dirrm lib/xfce4/modules
 @dirrm lib/xfce4
-@dirrm share/doc/html/libxfcegui4
+@dirrm share/gtk-doc/html/libxfcegui4
 @unexec ${RMDIR} %D/share/xfce4/mime 2>/dev/null || ${TRUE}
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 23669d36939..0d18f6cc1e7 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: Makefile,v 1.11 2006/08/11 09:43:09 drochner Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	libxfce4mcs-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Xfce settings management library
 
-#PKGREVISION=	1
-
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/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 d33d5db6952..5e3319cb9a0 100644
--- a/x11/libxfce4mcs/PLIST
+++ b/x11/libxfce4mcs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/11/09 06:42:59 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/08/11 09:43:09 drochner Exp $
 include/xfce4/libxfce4mcs/mcs-client-enum-types.h
 include/xfce4/libxfce4mcs/mcs-client.h
 include/xfce4/libxfce4mcs/mcs-common.h
@@ -7,16 +7,16 @@ lib/libxfce4mcs-client.la
 lib/libxfce4mcs-manager.la
 lib/pkgconfig/libxfce4mcs-client-1.0.pc
 lib/pkgconfig/libxfce4mcs-manager-1.0.pc
-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
+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
 @dirrm include/xfce4/libxfce4mcs
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 7c49be91003..e819973bb85 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: Makefile,v 1.11 2006/08/11 09:43:09 drochner Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	4.2.3.2
 
 DISTNAME=	libxfce4util-${XFCE4_VERSION}
-#PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Xfce basic library
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/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 f0e94b4b8c9..c55ab719df6 100644
--- a/x11/libxfce4util/PLIST
+++ b/x11/libxfce4util/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/11/09 06:42:59 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/08/11 09:43:09 drochner Exp $
 include/xfce4/libxfce4util/debug.h
 include/xfce4/libxfce4util/i18n.h
 include/xfce4/libxfce4util/libxfce4util-config.h
@@ -16,28 +16,28 @@ include/xfce4/libxfce4util/xfce-resource.h
 lib/libxfce4util.la
 lib/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
-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/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/xfce4/m4/X11.m4
 share/xfce4/m4/debug.m4
 share/xfce4/m4/depends.m4
@@ -45,5 +45,5 @@ share/xfce4/m4/i18n.m4
 @dirrm include/xfce4/libxfce4util
 @dirrm include/xfce4
 @dirrm share/xfce4/m4
-@dirrm share/doc/html/libxfce4util
+@dirrm share/gtk-doc/html/libxfce4util
 @unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE}