- Move misc documentation into share/doc where it belongs;

- use USE_LIBTOOL while I here;
- make gnome-hint from gnomecore actually working;
- bump PORTREVISIONs.

14 files changed, 456 insertions, 314 deletions

diff --git a/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
new file mode 100644
index 00000000000..b98c5295317
--- /dev/null
+++ b/x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/gnome/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/gnome/Makefile.in	2002/05/01 01:50:40
+@@ -158,7 +158,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
new file mode 100644
index 00000000000..9266154be01
--- /dev/null
+++ b/x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/gnomeui/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/gnomeui/Makefile.in	2002/05/01 01:50:55
+@@ -161,7 +161,7 @@
+ CFLAGS = `gnome-config --cflags gnomeui`
+ LDFLAGS = `gnome-config --libs gnomeui`
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
new file mode 100644
index 00000000000..e7cc10f89a6
--- /dev/null
+++ b/x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/gnorba/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/gnorba/Makefile.in	2002/05/01 01:51:15
+@@ -158,7 +158,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnorba
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
new file mode 100644
index 00000000000..c03007ea3a2
--- /dev/null
+++ b/x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/zvt/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/zvt/Makefile.in	2002/05/01 01:51:06
+@@ -158,7 +158,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/zvt
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index b771d39a753..fc35a1e0891 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -202,6 +202,144 @@ lib/libzvt.a
 lib/libzvt.so
 lib/libzvt.so.5
 share/aclocal/libart.m4
+share/doc/gnomelibs/gnome-decl.txt
+share/doc/gnomelibs/gnome-sections.txt
+share/doc/gnomelibs/gnome.html
+share/doc/gnomelibs/gnome/book1.html
+share/doc/gnomelibs/gnome/gnome-gnome-config.html
+share/doc/gnomelibs/gnome/gnome-gnome-defs.html
+share/doc/gnomelibs/gnome/gnome-gnome-dentry.html
+share/doc/gnomelibs/gnome/gnome-gnome-exec.html
+share/doc/gnomelibs/gnome/gnome-gnome-fileconvert.html
+share/doc/gnomelibs/gnome/gnome-gnome-help.html
+share/doc/gnomelibs/gnome/gnome-gnome-history.html
+share/doc/gnomelibs/gnome/gnome-gnome-i18n.html
+share/doc/gnomelibs/gnome/gnome-gnome-metadata.html
+share/doc/gnomelibs/gnome/gnome-gnome-mime-info.html
+share/doc/gnomelibs/gnome/gnome-gnome-mime.html
+share/doc/gnomelibs/gnome/gnome-gnome-paper.html
+share/doc/gnomelibs/gnome/gnome-gnome-popt.html
+share/doc/gnomelibs/gnome/gnome-gnome-regex.html
+share/doc/gnomelibs/gnome/gnome-gnome-remote.html
+share/doc/gnomelibs/gnome/gnome-gnome-score.html
+share/doc/gnomelibs/gnome/gnome-gnome-sound.html
+share/doc/gnomelibs/gnome/gnome-gnome-triggers.html
+share/doc/gnomelibs/gnome/gnome-gnome-url.html
+share/doc/gnomelibs/gnome/gnome-gnome-util.html
+share/doc/gnomelibs/gnome/gnome-libgnome.html
+share/doc/gnomelibs/gnome/libgnome.html
+share/doc/gnomelibs/gnomeui-decl.txt
+share/doc/gnomelibs/gnomeui-sections.txt
+share/doc/gnomelibs/gnomeui.hierarchy
+share/doc/gnomelibs/gnomeui.html
+share/doc/gnomelibs/gnomeui.types
+share/doc/gnomelibs/gnomeui/book1.html
+share/doc/gnomelibs/gnomeui/gnome-objects.html
+share/doc/gnomelibs/gnomeui/gnomeabout.html
+share/doc/gnomelibs/gnomeui/gnomeanimator.html
+share/doc/gnomelibs/gnomeui/gnomeapp.html
+share/doc/gnomelibs/gnomeui/gnomeappbar.html
+share/doc/gnomelibs/gnomeui/gnomecalculator.html
+share/doc/gnomelibs/gnomeui/gnomecanvas.html
+share/doc/gnomelibs/gnomeui/gnomecanvasellipse.html
+share/doc/gnomelibs/gnomeui/gnomecanvasgroup.html
+share/doc/gnomelibs/gnomeui/gnomecanvasimage.html
+share/doc/gnomelibs/gnomeui/gnomecanvasitem.html
+share/doc/gnomelibs/gnomeui/gnomecanvasline.html
+share/doc/gnomelibs/gnomeui/gnomecanvaspolygon.html
+share/doc/gnomelibs/gnomeui/gnomecanvasre.html
+share/doc/gnomelibs/gnomeui/gnomecanvasrect.html
+share/doc/gnomelibs/gnomeui/gnomecanvastext.html
+share/doc/gnomelibs/gnomeui/gnomecanvaswidget.html
+share/doc/gnomelibs/gnomeui/gnomeclient.html
+share/doc/gnomelibs/gnomeui/gnomecolorpicker.html
+share/doc/gnomelibs/gnomeui/gnomedateedit.html
+share/doc/gnomelibs/gnomeui/gnomedentryedit.html
+share/doc/gnomelibs/gnomeui/gnomedialog.html
+share/doc/gnomelibs/gnomeui/gnomedock.html
+share/doc/gnomelibs/gnomeui/gnomedockband.html
+share/doc/gnomelibs/gnomeui/gnomedockitem.html
+share/doc/gnomelibs/gnomeui/gnomedocklayout.html
+share/doc/gnomelibs/gnomeui/gnomedruid.html
+share/doc/gnomelibs/gnomeui/gnomedruidpage.html
+share/doc/gnomelibs/gnomeui/gnomedruidpagefinish.html
+share/doc/gnomelibs/gnomeui/gnomedruidpagestandard.html
+share/doc/gnomelibs/gnomeui/gnomedruidpagestart.html
+share/doc/gnomelibs/gnomeui/gnomeentry.html
+share/doc/gnomelibs/gnomeui/gnomefileentry.html
+share/doc/gnomelibs/gnomeui/gnomefontpicker.html
+share/doc/gnomelibs/gnomeui/gnomefontselector.html
+share/doc/gnomelibs/gnomeui/gnomehref.html
+share/doc/gnomelibs/gnomeui/gnomeiconentry.html
+share/doc/gnomelibs/gnomeui/gnomeiconlist.html
+share/doc/gnomelibs/gnomeui/gnomeiconselection.html
+share/doc/gnomelibs/gnomeui/gnomeicontextitem.html
+share/doc/gnomelibs/gnomeui/gnomeless.html
+share/doc/gnomelibs/gnomeui/gnomemdi.html
+share/doc/gnomelibs/gnomeui/gnomemdichild.html
+share/doc/gnomelibs/gnomeui/gnomemdigenericchild.html
+share/doc/gnomelibs/gnomeui/gnomemessagebox.html
+share/doc/gnomelibs/gnomeui/gnomenumberentry.html
+share/doc/gnomelibs/gnomeui/gnomepaperselector.html
+share/doc/gnomelibs/gnomeui/gnomepixmap.html
+share/doc/gnomelibs/gnomeui/gnomepixmapentry.html
+share/doc/gnomelibs/gnomeui/gnomeprocbar.html
+share/doc/gnomelibs/gnomeui/gnomepropertybox.html
+share/doc/gnomelibs/gnomeui/gnomescores.html
+share/doc/gnomelibs/gnomeui/gnomespell.html
+share/doc/gnomelibs/gnomeui/gnomestock.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-app-helper.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-app-util.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-canvas-util.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-dialog-util.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-dns.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-geometry.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-ice.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-icon-text.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-init.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-mdi-session.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-popup-help.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-popup-menu.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-preferences.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-properties.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-property-entries.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-startup.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-types.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-uidefs.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-window-icon.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-winhints.html
+share/doc/gnomelibs/gnomeui/gnomeui-gtkcauldron.html
+share/doc/gnomelibs/gnomeui/gtkclock.html
+share/doc/gnomelibs/gnomeui/gtkdial.html
+share/doc/gnomelibs/gnomeui/gtkpixmapmenuitem.html
+share/doc/gnomelibs/gnomeui/gtkted.html
+share/doc/gnomelibs/gnomeui/libgnomeui.html
+share/doc/gnomelibs/gnorba-decl.txt
+share/doc/gnomelibs/gnorba-sections.txt
+share/doc/gnomelibs/gnorba/book1.html
+share/doc/gnomelibs/gnorba/gnorba-gnorba.html
+share/doc/gnomelibs/gnorba/gnorba-goad.html
+share/doc/gnomelibs/gnorba/libgnorba.html
+share/doc/gnomelibs/zvt-decl.txt
+share/doc/gnomelibs/zvt-sections.txt
+share/doc/gnomelibs/zvt/book1.html
+share/doc/gnomelibs/zvt/x1035.html
+share/doc/gnomelibs/zvt/x1065.html
+share/doc/gnomelibs/zvt/x1086.html
+share/doc/gnomelibs/zvt/x1106.html
+share/doc/gnomelibs/zvt/x119.html
+share/doc/gnomelibs/zvt/x98.html
+share/doc/gnomelibs/zvt/x987.html
+share/doc/gnomelibs/zvt/x995.html
+share/doc/gnomelibs/zvt/zvt-zvtterm.html
+share/doc/gnomelibs/zvt/zvtterm-future.html
+share/doc/gnomelibs/zvt/zvtterm-input-output.html
+share/doc/gnomelibs/zvt/zvtterm-notes.html
+share/doc/gnomelibs/zvt/zvtterm-properties.html
+share/doc/gnomelibs/zvt/zvtterm-reference.html
+share/doc/gnomelibs/zvt/zvtterm-window-hints.html
+share/doc/gnomelibs/zvt/zvtterm.html
+share/doc/gnomelibs/zvtterm.html
 share/doc/libart/basic-foo.html
 share/doc/libart/basic-rendering.html
 share/doc/libart/basic.html
@@ -339,144 +477,6 @@ share/gnome/help/gnome-dev-info/C/x1453.html
 share/gnome/help/gnome-dev-info/C/x2161.html
 share/gnome/help/gnome-dev-info/C/x2674.html
 share/gnome/help/gnome-dev-info/C/x671.html
-share/gnome/html/gnome-decl.txt
-share/gnome/html/gnome-sections.txt
-share/gnome/html/gnome.html
-share/gnome/html/gnome/book1.html
-share/gnome/html/gnome/gnome-gnome-config.html
-share/gnome/html/gnome/gnome-gnome-defs.html
-share/gnome/html/gnome/gnome-gnome-dentry.html
-share/gnome/html/gnome/gnome-gnome-exec.html
-share/gnome/html/gnome/gnome-gnome-fileconvert.html
-share/gnome/html/gnome/gnome-gnome-help.html
-share/gnome/html/gnome/gnome-gnome-history.html
-share/gnome/html/gnome/gnome-gnome-i18n.html
-share/gnome/html/gnome/gnome-gnome-metadata.html
-share/gnome/html/gnome/gnome-gnome-mime-info.html
-share/gnome/html/gnome/gnome-gnome-mime.html
-share/gnome/html/gnome/gnome-gnome-paper.html
-share/gnome/html/gnome/gnome-gnome-popt.html
-share/gnome/html/gnome/gnome-gnome-regex.html
-share/gnome/html/gnome/gnome-gnome-remote.html
-share/gnome/html/gnome/gnome-gnome-score.html
-share/gnome/html/gnome/gnome-gnome-sound.html
-share/gnome/html/gnome/gnome-gnome-triggers.html
-share/gnome/html/gnome/gnome-gnome-url.html
-share/gnome/html/gnome/gnome-gnome-util.html
-share/gnome/html/gnome/gnome-libgnome.html
-share/gnome/html/gnome/libgnome.html
-share/gnome/html/gnomeui-decl.txt
-share/gnome/html/gnomeui-sections.txt
-share/gnome/html/gnomeui.hierarchy
-share/gnome/html/gnomeui.html
-share/gnome/html/gnomeui.types
-share/gnome/html/gnomeui/book1.html
-share/gnome/html/gnomeui/gnome-objects.html
-share/gnome/html/gnomeui/gnomeabout.html
-share/gnome/html/gnomeui/gnomeanimator.html
-share/gnome/html/gnomeui/gnomeapp.html
-share/gnome/html/gnomeui/gnomeappbar.html
-share/gnome/html/gnomeui/gnomecalculator.html
-share/gnome/html/gnomeui/gnomecanvas.html
-share/gnome/html/gnomeui/gnomecanvasellipse.html
-share/gnome/html/gnomeui/gnomecanvasgroup.html
-share/gnome/html/gnomeui/gnomecanvasimage.html
-share/gnome/html/gnomeui/gnomecanvasitem.html
-share/gnome/html/gnomeui/gnomecanvasline.html
-share/gnome/html/gnomeui/gnomecanvaspolygon.html
-share/gnome/html/gnomeui/gnomecanvasre.html
-share/gnome/html/gnomeui/gnomecanvasrect.html
-share/gnome/html/gnomeui/gnomecanvastext.html
-share/gnome/html/gnomeui/gnomecanvaswidget.html
-share/gnome/html/gnomeui/gnomeclient.html
-share/gnome/html/gnomeui/gnomecolorpicker.html
-share/gnome/html/gnomeui/gnomedateedit.html
-share/gnome/html/gnomeui/gnomedentryedit.html
-share/gnome/html/gnomeui/gnomedialog.html
-share/gnome/html/gnomeui/gnomedock.html
-share/gnome/html/gnomeui/gnomedockband.html
-share/gnome/html/gnomeui/gnomedockitem.html
-share/gnome/html/gnomeui/gnomedocklayout.html
-share/gnome/html/gnomeui/gnomedruid.html
-share/gnome/html/gnomeui/gnomedruidpage.html
-share/gnome/html/gnomeui/gnomedruidpagefinish.html
-share/gnome/html/gnomeui/gnomedruidpagestandard.html
-share/gnome/html/gnomeui/gnomedruidpagestart.html
-share/gnome/html/gnomeui/gnomeentry.html
-share/gnome/html/gnomeui/gnomefileentry.html
-share/gnome/html/gnomeui/gnomefontpicker.html
-share/gnome/html/gnomeui/gnomefontselector.html
-share/gnome/html/gnomeui/gnomehref.html
-share/gnome/html/gnomeui/gnomeiconentry.html
-share/gnome/html/gnomeui/gnomeiconlist.html
-share/gnome/html/gnomeui/gnomeiconselection.html
-share/gnome/html/gnomeui/gnomeicontextitem.html
-share/gnome/html/gnomeui/gnomeless.html
-share/gnome/html/gnomeui/gnomemdi.html
-share/gnome/html/gnomeui/gnomemdichild.html
-share/gnome/html/gnomeui/gnomemdigenericchild.html
-share/gnome/html/gnomeui/gnomemessagebox.html
-share/gnome/html/gnomeui/gnomenumberentry.html
-share/gnome/html/gnomeui/gnomepaperselector.html
-share/gnome/html/gnomeui/gnomepixmap.html
-share/gnome/html/gnomeui/gnomepixmapentry.html
-share/gnome/html/gnomeui/gnomeprocbar.html
-share/gnome/html/gnomeui/gnomepropertybox.html
-share/gnome/html/gnomeui/gnomescores.html
-share/gnome/html/gnomeui/gnomespell.html
-share/gnome/html/gnomeui/gnomestock.html
-share/gnome/html/gnomeui/gnomeui-gnome-app-helper.html
-share/gnome/html/gnomeui/gnomeui-gnome-app-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-canvas-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-dialog-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-dns.html
-share/gnome/html/gnomeui/gnomeui-gnome-geometry.html
-share/gnome/html/gnomeui/gnomeui-gnome-ice.html
-share/gnome/html/gnomeui/gnomeui-gnome-icon-text.html
-share/gnome/html/gnomeui/gnomeui-gnome-init.html
-share/gnome/html/gnomeui/gnomeui-gnome-mdi-session.html
-share/gnome/html/gnomeui/gnomeui-gnome-popup-help.html
-share/gnome/html/gnomeui/gnomeui-gnome-popup-menu.html
-share/gnome/html/gnomeui/gnomeui-gnome-preferences.html
-share/gnome/html/gnomeui/gnomeui-gnome-properties.html
-share/gnome/html/gnomeui/gnomeui-gnome-property-entries.html
-share/gnome/html/gnomeui/gnomeui-gnome-startup.html
-share/gnome/html/gnomeui/gnomeui-gnome-types.html
-share/gnome/html/gnomeui/gnomeui-gnome-uidefs.html
-share/gnome/html/gnomeui/gnomeui-gnome-window-icon.html
-share/gnome/html/gnomeui/gnomeui-gnome-winhints.html
-share/gnome/html/gnomeui/gnomeui-gtkcauldron.html
-share/gnome/html/gnomeui/gtkclock.html
-share/gnome/html/gnomeui/gtkdial.html
-share/gnome/html/gnomeui/gtkpixmapmenuitem.html
-share/gnome/html/gnomeui/gtkted.html
-share/gnome/html/gnomeui/libgnomeui.html
-share/gnome/html/gnorba-decl.txt
-share/gnome/html/gnorba-sections.txt
-share/gnome/html/gnorba/book1.html
-share/gnome/html/gnorba/gnorba-gnorba.html
-share/gnome/html/gnorba/gnorba-goad.html
-share/gnome/html/gnorba/libgnorba.html
-share/gnome/html/zvt-decl.txt
-share/gnome/html/zvt-sections.txt
-share/gnome/html/zvt/book1.html
-share/gnome/html/zvt/x1035.html
-share/gnome/html/zvt/x1065.html
-share/gnome/html/zvt/x1086.html
-share/gnome/html/zvt/x1106.html
-share/gnome/html/zvt/x119.html
-share/gnome/html/zvt/x98.html
-share/gnome/html/zvt/x987.html
-share/gnome/html/zvt/x995.html
-share/gnome/html/zvt/zvt-zvtterm.html
-share/gnome/html/zvt/zvtterm-future.html
-share/gnome/html/zvt/zvtterm-input-output.html
-share/gnome/html/zvt/zvtterm-notes.html
-share/gnome/html/zvt/zvtterm-properties.html
-share/gnome/html/zvt/zvtterm-reference.html
-share/gnome/html/zvt/zvtterm-window-hints.html
-share/gnome/html/zvt/zvtterm.html
-share/gnome/html/zvtterm.html
 share/gnome/idl/GnomeObject.idl
 share/gnome/idl/Table.idl
 share/gnome/idl/desktop-editor.idl
@@ -542,17 +542,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm share/gnome/type-convert
 @dirrm share/gnome/mime-info
 @dirrm share/gnome/idl
-@dirrm share/gnome/html/zvt
-@dirrm share/gnome/html/gnorba
-@dirrm share/gnome/html/gnomeui
-@dirrm share/gnome/html/gnome
-@dirrm share/gnome/html
 @dirrm share/gnome/help/gnome-dev-info/C
 @dirrm share/gnome/help/gnome-dev-info
 @dirrm share/gnome/help
 @dirrm share/gnome/games
 @dirrm share/gnome/doc
 @dirrm share/doc/libart
+@dirrm share/doc/gnomelibs/zvt
+@dirrm share/doc/gnomelibs/gnorba
+@dirrm share/doc/gnomelibs/gnomeui
+@dirrm share/doc/gnomelibs/gnome
+@dirrm share/doc/gnomelibs
 @dirrm include/gnome-1.0/zvt
 @dirrm include/gnome-1.0/libgnorba
 @dirrm include/gnome-1.0/libgnomeui
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index c086dc4a159..90cc7037092 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomecore
 PORTVERSION=	1.4.0.8
+PORTREVISION=	1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-core
diff --git a/x11/gnomecore/files/patch-gnome-hint::gnome-hint.c b/x11/gnomecore/files/patch-gnome-hint::gnome-hint.c
new file mode 100644
index 00000000000..0603d6fc698
--- /dev/null
+++ b/x11/gnomecore/files/patch-gnome-hint::gnome-hint.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- gnome-hint/gnome-hint.c	2002/05/01 10:43:20	1.1
++++ gnome-hint/gnome-hint.c	2002/05/01 10:43:49
+@@ -163,7 +163,7 @@
+ 	hintnum++;
+ 
+ 	/* see if we find the directory with the hints */
+-	name = gnome_datadir_file ("gnome/hints");
++	name = gnome_datadir_file ("hints");
+ 	if (name == NULL)
+ 		return;
+ 	if (stat (name, &s) != 0 ||
diff --git a/x11/gnomecore/files/patch-panel::doc::Makefile.in b/x11/gnomecore/files/patch-panel::doc::Makefile.in
new file mode 100644
index 00000000000..5887c856eac
--- /dev/null
+++ b/x11/gnomecore/files/patch-panel::doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- panel/doc/Makefile.in	2002/05/01 10:19:11	1.1
++++ panel/doc/Makefile.in	2002/05/01 10:20:03
+@@ -188,7 +188,7 @@
+ CFLAGS = "`gnome-config --cflags gnomeui applets docklets`"
+ LDFLAGS = "`gnome-config --libs gnomeui applets docklets`"
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/panel
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index 7465a8532ee..9be8f84e419 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -53,6 +53,33 @@ lib/libpanel_applet.so.5
 lib/libpanel_status.a
 lib/libpanel_status.so
 lib/libpanel_status.so.5
+share/doc/panel/panel-decl.txt
+share/doc/panel/panel-sections.txt
+share/doc/panel/panel.hierarchy
+share/doc/panel/panel.html
+share/doc/panel/panel.sgml
+share/doc/panel/panel.signals
+share/doc/panel/panel.types
+share/doc/panel/panel/appletwidget.html
+share/doc/panel/panel/index.html
+share/doc/panel/panel/panel-context-menu.html
+share/doc/panel/panel/panel-miscellaneous.html
+share/doc/panel/panel/panel-panel-interaction.html
+share/doc/panel/panel/r1373.html
+share/doc/panel/panel/r160.html
+share/doc/panel/panel/statusdocklet.html
+share/doc/panel/panel/unnamed1.html
+share/doc/panel/panel/unnamed10.html
+share/doc/panel/panel/unnamed11.html
+share/doc/panel/panel/unnamed12.html
+share/doc/panel/panel/unnamed13.html
+share/doc/panel/panel/unnamed14.html
+share/doc/panel/panel/unnamed15.html
+share/doc/panel/panel/unnamed16.html
+share/doc/panel/panel/unnamed3.html
+share/doc/panel/panel/unnamed4.html
+share/doc/panel/panel/unnamed5.html
+share/doc/panel/panel/unnamed6.html
 share/gnome/applets/Amusements/.directory
 share/gnome/applets/Amusements/fish_applet.desktop
 share/gnome/applets/Clocks/.directory
@@ -836,33 +863,6 @@ share/gnome/help/tasklist_applet/eu/tasklist.sgml
 share/gnome/help/tasklist_applet/eu/tasklist_applet.sgml
 share/gnome/help/tasklist_applet/eu/topic.dat
 share/gnome/hints/panel.hints
-share/gnome/html/panel-decl.txt
-share/gnome/html/panel-sections.txt
-share/gnome/html/panel.hierarchy
-share/gnome/html/panel.html
-share/gnome/html/panel.sgml
-share/gnome/html/panel.signals
-share/gnome/html/panel.types
-share/gnome/html/panel/appletwidget.html
-share/gnome/html/panel/index.html
-share/gnome/html/panel/panel-context-menu.html
-share/gnome/html/panel/panel-miscellaneous.html
-share/gnome/html/panel/panel-panel-interaction.html
-share/gnome/html/panel/r1373.html
-share/gnome/html/panel/r160.html
-share/gnome/html/panel/statusdocklet.html
-share/gnome/html/panel/unnamed1.html
-share/gnome/html/panel/unnamed10.html
-share/gnome/html/panel/unnamed11.html
-share/gnome/html/panel/unnamed12.html
-share/gnome/html/panel/unnamed13.html
-share/gnome/html/panel/unnamed14.html
-share/gnome/html/panel/unnamed15.html
-share/gnome/html/panel/unnamed16.html
-share/gnome/html/panel/unnamed3.html
-share/gnome/html/panel/unnamed4.html
-share/gnome/html/panel/unnamed5.html
-share/gnome/html/panel/unnamed6.html
 share/gnome/idl/Terminal.idl
 share/gnome/idl/gnome-panel.idl
 share/gnome/idl/help-browser.idl
@@ -1140,7 +1140,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo
 @dirrm share/gnome/omf/gnome-core
 @dirrm share/gnome/mc/templates
 @dirrm share/gnome/mc
-@dirrm share/gnome/html/panel
 @dirrm share/gnome/hints
 @dirrm share/gnome/help/tasklist_applet/eu/stylesheet-images
 @dirrm share/gnome/help/tasklist_applet/eu/figures
@@ -1347,6 +1346,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-core.mo
 @dirrm share/gnome/applets/Clocks
 @dirrm share/gnome/applets/Amusements
 @dirrm share/gnome/applets
+@dirrm share/doc/panel/panel
+@dirrm share/doc/panel
 @dirrm etc/gnome/panel-config/panel.d/default
 @dirrm etc/gnome/panel-config/panel.d
 @dirrm etc/gnome/panel-config
diff --git a/x11/gnomelibs/files/patch-devel-docs::gnome::Makefile.in b/x11/gnomelibs/files/patch-devel-docs::gnome::Makefile.in
new file mode 100644
index 00000000000..b98c5295317
--- /dev/null
+++ b/x11/gnomelibs/files/patch-devel-docs::gnome::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/gnome/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/gnome/Makefile.in	2002/05/01 01:50:40
+@@ -158,7 +158,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnome
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnomelibs/files/patch-devel-docs::gnomeui::Makefile.in b/x11/gnomelibs/files/patch-devel-docs::gnomeui::Makefile.in
new file mode 100644
index 00000000000..9266154be01
--- /dev/null
+++ b/x11/gnomelibs/files/patch-devel-docs::gnomeui::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/gnomeui/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/gnomeui/Makefile.in	2002/05/01 01:50:55
+@@ -161,7 +161,7 @@
+ CFLAGS = `gnome-config --cflags gnomeui`
+ LDFLAGS = `gnome-config --libs gnomeui`
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnomelibs/files/patch-devel-docs::gnorba::Makefile.in b/x11/gnomelibs/files/patch-devel-docs::gnorba::Makefile.in
new file mode 100644
index 00000000000..e7cc10f89a6
--- /dev/null
+++ b/x11/gnomelibs/files/patch-devel-docs::gnorba::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/gnorba/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/gnorba/Makefile.in	2002/05/01 01:51:15
+@@ -158,7 +158,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/libgnorba
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnomelibs/files/patch-devel-docs::zvt::Makefile.in b/x11/gnomelibs/files/patch-devel-docs::zvt::Makefile.in
new file mode 100644
index 00000000000..c03007ea3a2
--- /dev/null
+++ b/x11/gnomelibs/files/patch-devel-docs::zvt::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- devel-docs/zvt/Makefile.in	2002/05/01 01:47:18	1.1
++++ devel-docs/zvt/Makefile.in	2002/05/01 01:51:06
+@@ -158,7 +158,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = $(GNOME_LIBS_DIR)/zvt
+ 
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gnomelibs
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index b771d39a753..fc35a1e0891 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -202,6 +202,144 @@ lib/libzvt.a
 lib/libzvt.so
 lib/libzvt.so.5
 share/aclocal/libart.m4
+share/doc/gnomelibs/gnome-decl.txt
+share/doc/gnomelibs/gnome-sections.txt
+share/doc/gnomelibs/gnome.html
+share/doc/gnomelibs/gnome/book1.html
+share/doc/gnomelibs/gnome/gnome-gnome-config.html
+share/doc/gnomelibs/gnome/gnome-gnome-defs.html
+share/doc/gnomelibs/gnome/gnome-gnome-dentry.html
+share/doc/gnomelibs/gnome/gnome-gnome-exec.html
+share/doc/gnomelibs/gnome/gnome-gnome-fileconvert.html
+share/doc/gnomelibs/gnome/gnome-gnome-help.html
+share/doc/gnomelibs/gnome/gnome-gnome-history.html
+share/doc/gnomelibs/gnome/gnome-gnome-i18n.html
+share/doc/gnomelibs/gnome/gnome-gnome-metadata.html
+share/doc/gnomelibs/gnome/gnome-gnome-mime-info.html
+share/doc/gnomelibs/gnome/gnome-gnome-mime.html
+share/doc/gnomelibs/gnome/gnome-gnome-paper.html
+share/doc/gnomelibs/gnome/gnome-gnome-popt.html
+share/doc/gnomelibs/gnome/gnome-gnome-regex.html
+share/doc/gnomelibs/gnome/gnome-gnome-remote.html
+share/doc/gnomelibs/gnome/gnome-gnome-score.html
+share/doc/gnomelibs/gnome/gnome-gnome-sound.html
+share/doc/gnomelibs/gnome/gnome-gnome-triggers.html
+share/doc/gnomelibs/gnome/gnome-gnome-url.html
+share/doc/gnomelibs/gnome/gnome-gnome-util.html
+share/doc/gnomelibs/gnome/gnome-libgnome.html
+share/doc/gnomelibs/gnome/libgnome.html
+share/doc/gnomelibs/gnomeui-decl.txt
+share/doc/gnomelibs/gnomeui-sections.txt
+share/doc/gnomelibs/gnomeui.hierarchy
+share/doc/gnomelibs/gnomeui.html
+share/doc/gnomelibs/gnomeui.types
+share/doc/gnomelibs/gnomeui/book1.html
+share/doc/gnomelibs/gnomeui/gnome-objects.html
+share/doc/gnomelibs/gnomeui/gnomeabout.html
+share/doc/gnomelibs/gnomeui/gnomeanimator.html
+share/doc/gnomelibs/gnomeui/gnomeapp.html
+share/doc/gnomelibs/gnomeui/gnomeappbar.html
+share/doc/gnomelibs/gnomeui/gnomecalculator.html
+share/doc/gnomelibs/gnomeui/gnomecanvas.html
+share/doc/gnomelibs/gnomeui/gnomecanvasellipse.html
+share/doc/gnomelibs/gnomeui/gnomecanvasgroup.html
+share/doc/gnomelibs/gnomeui/gnomecanvasimage.html
+share/doc/gnomelibs/gnomeui/gnomecanvasitem.html
+share/doc/gnomelibs/gnomeui/gnomecanvasline.html
+share/doc/gnomelibs/gnomeui/gnomecanvaspolygon.html
+share/doc/gnomelibs/gnomeui/gnomecanvasre.html
+share/doc/gnomelibs/gnomeui/gnomecanvasrect.html
+share/doc/gnomelibs/gnomeui/gnomecanvastext.html
+share/doc/gnomelibs/gnomeui/gnomecanvaswidget.html
+share/doc/gnomelibs/gnomeui/gnomeclient.html
+share/doc/gnomelibs/gnomeui/gnomecolorpicker.html
+share/doc/gnomelibs/gnomeui/gnomedateedit.html
+share/doc/gnomelibs/gnomeui/gnomedentryedit.html
+share/doc/gnomelibs/gnomeui/gnomedialog.html
+share/doc/gnomelibs/gnomeui/gnomedock.html
+share/doc/gnomelibs/gnomeui/gnomedockband.html
+share/doc/gnomelibs/gnomeui/gnomedockitem.html
+share/doc/gnomelibs/gnomeui/gnomedocklayout.html
+share/doc/gnomelibs/gnomeui/gnomedruid.html
+share/doc/gnomelibs/gnomeui/gnomedruidpage.html
+share/doc/gnomelibs/gnomeui/gnomedruidpagefinish.html
+share/doc/gnomelibs/gnomeui/gnomedruidpagestandard.html
+share/doc/gnomelibs/gnomeui/gnomedruidpagestart.html
+share/doc/gnomelibs/gnomeui/gnomeentry.html
+share/doc/gnomelibs/gnomeui/gnomefileentry.html
+share/doc/gnomelibs/gnomeui/gnomefontpicker.html
+share/doc/gnomelibs/gnomeui/gnomefontselector.html
+share/doc/gnomelibs/gnomeui/gnomehref.html
+share/doc/gnomelibs/gnomeui/gnomeiconentry.html
+share/doc/gnomelibs/gnomeui/gnomeiconlist.html
+share/doc/gnomelibs/gnomeui/gnomeiconselection.html
+share/doc/gnomelibs/gnomeui/gnomeicontextitem.html
+share/doc/gnomelibs/gnomeui/gnomeless.html
+share/doc/gnomelibs/gnomeui/gnomemdi.html
+share/doc/gnomelibs/gnomeui/gnomemdichild.html
+share/doc/gnomelibs/gnomeui/gnomemdigenericchild.html
+share/doc/gnomelibs/gnomeui/gnomemessagebox.html
+share/doc/gnomelibs/gnomeui/gnomenumberentry.html
+share/doc/gnomelibs/gnomeui/gnomepaperselector.html
+share/doc/gnomelibs/gnomeui/gnomepixmap.html
+share/doc/gnomelibs/gnomeui/gnomepixmapentry.html
+share/doc/gnomelibs/gnomeui/gnomeprocbar.html
+share/doc/gnomelibs/gnomeui/gnomepropertybox.html
+share/doc/gnomelibs/gnomeui/gnomescores.html
+share/doc/gnomelibs/gnomeui/gnomespell.html
+share/doc/gnomelibs/gnomeui/gnomestock.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-app-helper.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-app-util.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-canvas-util.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-dialog-util.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-dns.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-geometry.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-ice.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-icon-text.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-init.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-mdi-session.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-popup-help.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-popup-menu.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-preferences.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-properties.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-property-entries.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-startup.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-types.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-uidefs.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-window-icon.html
+share/doc/gnomelibs/gnomeui/gnomeui-gnome-winhints.html
+share/doc/gnomelibs/gnomeui/gnomeui-gtkcauldron.html
+share/doc/gnomelibs/gnomeui/gtkclock.html
+share/doc/gnomelibs/gnomeui/gtkdial.html
+share/doc/gnomelibs/gnomeui/gtkpixmapmenuitem.html
+share/doc/gnomelibs/gnomeui/gtkted.html
+share/doc/gnomelibs/gnomeui/libgnomeui.html
+share/doc/gnomelibs/gnorba-decl.txt
+share/doc/gnomelibs/gnorba-sections.txt
+share/doc/gnomelibs/gnorba/book1.html
+share/doc/gnomelibs/gnorba/gnorba-gnorba.html
+share/doc/gnomelibs/gnorba/gnorba-goad.html
+share/doc/gnomelibs/gnorba/libgnorba.html
+share/doc/gnomelibs/zvt-decl.txt
+share/doc/gnomelibs/zvt-sections.txt
+share/doc/gnomelibs/zvt/book1.html
+share/doc/gnomelibs/zvt/x1035.html
+share/doc/gnomelibs/zvt/x1065.html
+share/doc/gnomelibs/zvt/x1086.html
+share/doc/gnomelibs/zvt/x1106.html
+share/doc/gnomelibs/zvt/x119.html
+share/doc/gnomelibs/zvt/x98.html
+share/doc/gnomelibs/zvt/x987.html
+share/doc/gnomelibs/zvt/x995.html
+share/doc/gnomelibs/zvt/zvt-zvtterm.html
+share/doc/gnomelibs/zvt/zvtterm-future.html
+share/doc/gnomelibs/zvt/zvtterm-input-output.html
+share/doc/gnomelibs/zvt/zvtterm-notes.html
+share/doc/gnomelibs/zvt/zvtterm-properties.html
+share/doc/gnomelibs/zvt/zvtterm-reference.html
+share/doc/gnomelibs/zvt/zvtterm-window-hints.html
+share/doc/gnomelibs/zvt/zvtterm.html
+share/doc/gnomelibs/zvtterm.html
 share/doc/libart/basic-foo.html
 share/doc/libart/basic-rendering.html
 share/doc/libart/basic.html
@@ -339,144 +477,6 @@ share/gnome/help/gnome-dev-info/C/x1453.html
 share/gnome/help/gnome-dev-info/C/x2161.html
 share/gnome/help/gnome-dev-info/C/x2674.html
 share/gnome/help/gnome-dev-info/C/x671.html
-share/gnome/html/gnome-decl.txt
-share/gnome/html/gnome-sections.txt
-share/gnome/html/gnome.html
-share/gnome/html/gnome/book1.html
-share/gnome/html/gnome/gnome-gnome-config.html
-share/gnome/html/gnome/gnome-gnome-defs.html
-share/gnome/html/gnome/gnome-gnome-dentry.html
-share/gnome/html/gnome/gnome-gnome-exec.html
-share/gnome/html/gnome/gnome-gnome-fileconvert.html
-share/gnome/html/gnome/gnome-gnome-help.html
-share/gnome/html/gnome/gnome-gnome-history.html
-share/gnome/html/gnome/gnome-gnome-i18n.html
-share/gnome/html/gnome/gnome-gnome-metadata.html
-share/gnome/html/gnome/gnome-gnome-mime-info.html
-share/gnome/html/gnome/gnome-gnome-mime.html
-share/gnome/html/gnome/gnome-gnome-paper.html
-share/gnome/html/gnome/gnome-gnome-popt.html
-share/gnome/html/gnome/gnome-gnome-regex.html
-share/gnome/html/gnome/gnome-gnome-remote.html
-share/gnome/html/gnome/gnome-gnome-score.html
-share/gnome/html/gnome/gnome-gnome-sound.html
-share/gnome/html/gnome/gnome-gnome-triggers.html
-share/gnome/html/gnome/gnome-gnome-url.html
-share/gnome/html/gnome/gnome-gnome-util.html
-share/gnome/html/gnome/gnome-libgnome.html
-share/gnome/html/gnome/libgnome.html
-share/gnome/html/gnomeui-decl.txt
-share/gnome/html/gnomeui-sections.txt
-share/gnome/html/gnomeui.hierarchy
-share/gnome/html/gnomeui.html
-share/gnome/html/gnomeui.types
-share/gnome/html/gnomeui/book1.html
-share/gnome/html/gnomeui/gnome-objects.html
-share/gnome/html/gnomeui/gnomeabout.html
-share/gnome/html/gnomeui/gnomeanimator.html
-share/gnome/html/gnomeui/gnomeapp.html
-share/gnome/html/gnomeui/gnomeappbar.html
-share/gnome/html/gnomeui/gnomecalculator.html
-share/gnome/html/gnomeui/gnomecanvas.html
-share/gnome/html/gnomeui/gnomecanvasellipse.html
-share/gnome/html/gnomeui/gnomecanvasgroup.html
-share/gnome/html/gnomeui/gnomecanvasimage.html
-share/gnome/html/gnomeui/gnomecanvasitem.html
-share/gnome/html/gnomeui/gnomecanvasline.html
-share/gnome/html/gnomeui/gnomecanvaspolygon.html
-share/gnome/html/gnomeui/gnomecanvasre.html
-share/gnome/html/gnomeui/gnomecanvasrect.html
-share/gnome/html/gnomeui/gnomecanvastext.html
-share/gnome/html/gnomeui/gnomecanvaswidget.html
-share/gnome/html/gnomeui/gnomeclient.html
-share/gnome/html/gnomeui/gnomecolorpicker.html
-share/gnome/html/gnomeui/gnomedateedit.html
-share/gnome/html/gnomeui/gnomedentryedit.html
-share/gnome/html/gnomeui/gnomedialog.html
-share/gnome/html/gnomeui/gnomedock.html
-share/gnome/html/gnomeui/gnomedockband.html
-share/gnome/html/gnomeui/gnomedockitem.html
-share/gnome/html/gnomeui/gnomedocklayout.html
-share/gnome/html/gnomeui/gnomedruid.html
-share/gnome/html/gnomeui/gnomedruidpage.html
-share/gnome/html/gnomeui/gnomedruidpagefinish.html
-share/gnome/html/gnomeui/gnomedruidpagestandard.html
-share/gnome/html/gnomeui/gnomedruidpagestart.html
-share/gnome/html/gnomeui/gnomeentry.html
-share/gnome/html/gnomeui/gnomefileentry.html
-share/gnome/html/gnomeui/gnomefontpicker.html
-share/gnome/html/gnomeui/gnomefontselector.html
-share/gnome/html/gnomeui/gnomehref.html
-share/gnome/html/gnomeui/gnomeiconentry.html
-share/gnome/html/gnomeui/gnomeiconlist.html
-share/gnome/html/gnomeui/gnomeiconselection.html
-share/gnome/html/gnomeui/gnomeicontextitem.html
-share/gnome/html/gnomeui/gnomeless.html
-share/gnome/html/gnomeui/gnomemdi.html
-share/gnome/html/gnomeui/gnomemdichild.html
-share/gnome/html/gnomeui/gnomemdigenericchild.html
-share/gnome/html/gnomeui/gnomemessagebox.html
-share/gnome/html/gnomeui/gnomenumberentry.html
-share/gnome/html/gnomeui/gnomepaperselector.html
-share/gnome/html/gnomeui/gnomepixmap.html
-share/gnome/html/gnomeui/gnomepixmapentry.html
-share/gnome/html/gnomeui/gnomeprocbar.html
-share/gnome/html/gnomeui/gnomepropertybox.html
-share/gnome/html/gnomeui/gnomescores.html
-share/gnome/html/gnomeui/gnomespell.html
-share/gnome/html/gnomeui/gnomestock.html
-share/gnome/html/gnomeui/gnomeui-gnome-app-helper.html
-share/gnome/html/gnomeui/gnomeui-gnome-app-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-canvas-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-dialog-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-dns.html
-share/gnome/html/gnomeui/gnomeui-gnome-geometry.html
-share/gnome/html/gnomeui/gnomeui-gnome-ice.html
-share/gnome/html/gnomeui/gnomeui-gnome-icon-text.html
-share/gnome/html/gnomeui/gnomeui-gnome-init.html
-share/gnome/html/gnomeui/gnomeui-gnome-mdi-session.html
-share/gnome/html/gnomeui/gnomeui-gnome-popup-help.html
-share/gnome/html/gnomeui/gnomeui-gnome-popup-menu.html
-share/gnome/html/gnomeui/gnomeui-gnome-preferences.html
-share/gnome/html/gnomeui/gnomeui-gnome-properties.html
-share/gnome/html/gnomeui/gnomeui-gnome-property-entries.html
-share/gnome/html/gnomeui/gnomeui-gnome-startup.html
-share/gnome/html/gnomeui/gnomeui-gnome-types.html
-share/gnome/html/gnomeui/gnomeui-gnome-uidefs.html
-share/gnome/html/gnomeui/gnomeui-gnome-window-icon.html
-share/gnome/html/gnomeui/gnomeui-gnome-winhints.html
-share/gnome/html/gnomeui/gnomeui-gtkcauldron.html
-share/gnome/html/gnomeui/gtkclock.html
-share/gnome/html/gnomeui/gtkdial.html
-share/gnome/html/gnomeui/gtkpixmapmenuitem.html
-share/gnome/html/gnomeui/gtkted.html
-share/gnome/html/gnomeui/libgnomeui.html
-share/gnome/html/gnorba-decl.txt
-share/gnome/html/gnorba-sections.txt
-share/gnome/html/gnorba/book1.html
-share/gnome/html/gnorba/gnorba-gnorba.html
-share/gnome/html/gnorba/gnorba-goad.html
-share/gnome/html/gnorba/libgnorba.html
-share/gnome/html/zvt-decl.txt
-share/gnome/html/zvt-sections.txt
-share/gnome/html/zvt/book1.html
-share/gnome/html/zvt/x1035.html
-share/gnome/html/zvt/x1065.html
-share/gnome/html/zvt/x1086.html
-share/gnome/html/zvt/x1106.html
-share/gnome/html/zvt/x119.html
-share/gnome/html/zvt/x98.html
-share/gnome/html/zvt/x987.html
-share/gnome/html/zvt/x995.html
-share/gnome/html/zvt/zvt-zvtterm.html
-share/gnome/html/zvt/zvtterm-future.html
-share/gnome/html/zvt/zvtterm-input-output.html
-share/gnome/html/zvt/zvtterm-notes.html
-share/gnome/html/zvt/zvtterm-properties.html
-share/gnome/html/zvt/zvtterm-reference.html
-share/gnome/html/zvt/zvtterm-window-hints.html
-share/gnome/html/zvt/zvtterm.html
-share/gnome/html/zvtterm.html
 share/gnome/idl/GnomeObject.idl
 share/gnome/idl/Table.idl
 share/gnome/idl/desktop-editor.idl
@@ -542,17 +542,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm share/gnome/type-convert
 @dirrm share/gnome/mime-info
 @dirrm share/gnome/idl
-@dirrm share/gnome/html/zvt
-@dirrm share/gnome/html/gnorba
-@dirrm share/gnome/html/gnomeui
-@dirrm share/gnome/html/gnome
-@dirrm share/gnome/html
 @dirrm share/gnome/help/gnome-dev-info/C
 @dirrm share/gnome/help/gnome-dev-info
 @dirrm share/gnome/help
 @dirrm share/gnome/games
 @dirrm share/gnome/doc
 @dirrm share/doc/libart
+@dirrm share/doc/gnomelibs/zvt
+@dirrm share/doc/gnomelibs/gnorba
+@dirrm share/doc/gnomelibs/gnomeui
+@dirrm share/doc/gnomelibs/gnome
+@dirrm share/doc/gnomelibs
 @dirrm include/gnome-1.0/zvt
 @dirrm include/gnome-1.0/libgnorba
 @dirrm include/gnome-1.0/libgnomeui