aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/gnome-db/Makefile3
-rw-r--r--databases/gnome-db/files/patch-configure16
-rw-r--r--databases/gnome-db/files/patch-doc::C::reference::Makefile.in14
-rw-r--r--databases/gnome-db/files/patch-ltmain.sh36
-rw-r--r--databases/gnome-db/pkg-plist11
-rw-r--r--databases/gnomedb/Makefile3
-rw-r--r--databases/gnomedb/files/patch-configure16
-rw-r--r--databases/gnomedb/files/patch-doc::C::reference::Makefile.in14
-rw-r--r--databases/gnomedb/files/patch-ltmain.sh36
-rw-r--r--databases/gnomedb/pkg-plist11
-rw-r--r--databases/gnomedb2/Makefile3
-rw-r--r--databases/gnomedb2/files/patch-configure16
-rw-r--r--databases/gnomedb2/files/patch-doc::C::reference::Makefile.in14
-rw-r--r--databases/gnomedb2/files/patch-ltmain.sh36
-rw-r--r--databases/gnomedb2/pkg-plist11
-rw-r--r--databases/libgda/Makefile3
-rw-r--r--databases/libgda/files/patch-configure13
-rw-r--r--databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in14
-rw-r--r--databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in14
-rw-r--r--databases/libgda/files/patch-ltmain.sh28
-rw-r--r--databases/libgda/pkg-plist25
-rw-r--r--databases/libgda2/Makefile3
-rw-r--r--databases/libgda2/files/patch-configure13
-rw-r--r--databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in14
-rw-r--r--databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in14
-rw-r--r--databases/libgda2/files/patch-ltmain.sh28
-rw-r--r--databases/libgda2/pkg-plist25
-rw-r--r--databases/libgda3/Makefile3
-rw-r--r--databases/libgda3/files/patch-configure13
-rw-r--r--databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in14
-rw-r--r--databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in14
-rw-r--r--databases/libgda3/files/patch-ltmain.sh28
-rw-r--r--databases/libgda3/pkg-plist25
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig7
-rw-r--r--sysutils/gnome-control-center1/files/patch-capplets::Makefile.in.orig7
-rw-r--r--sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in.orig7
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig7
-rw-r--r--www/gtkhtml/Makefile4
-rw-r--r--www/gtkhtml/files/patch-af23
-rw-r--r--www/gtkhtml/files/patch-doc::Makefile.in14
-rw-r--r--www/gtkhtml/files/patch-ltmain.sh36
-rw-r--r--www/gtkhtml/pkg-plist13
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/gtkhtml3/files/patch-af23
-rw-r--r--www/gtkhtml3/files/patch-doc::Makefile.in14
-rw-r--r--www/gtkhtml3/files/patch-ltmain.sh36
-rw-r--r--www/gtkhtml3/pkg-plist13
-rw-r--r--www/gtkhtml38/Makefile4
-rw-r--r--www/gtkhtml38/files/patch-af23
-rw-r--r--www/gtkhtml38/files/patch-doc::Makefile.in14
-rw-r--r--www/gtkhtml38/files/patch-ltmain.sh36
-rw-r--r--www/gtkhtml38/pkg-plist13
-rw-r--r--www/libgtkhtml/Makefile4
-rw-r--r--www/libgtkhtml/files/patch-af23
-rw-r--r--www/libgtkhtml/files/patch-doc::Makefile.in14
-rw-r--r--www/libgtkhtml/files/patch-ltmain.sh36
-rw-r--r--www/libgtkhtml/pkg-plist13
-rw-r--r--x11-toolkits/gal/Makefile6
-rw-r--r--x11-toolkits/gal/files/patch-configure13
-rw-r--r--x11-toolkits/gal/files/patch-ltmain.sh45
-rw-r--r--x11-toolkits/gal/pkg-plist16
-rw-r--r--x11-toolkits/gal2/Makefile6
-rw-r--r--x11-toolkits/gal2/files/patch-configure13
-rw-r--r--x11-toolkits/gal2/files/patch-ltmain.sh45
-rw-r--r--x11-toolkits/gal2/pkg-plist16
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnome::Makefile.in14
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnomeui::Makefile.in14
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::gnorba::Makefile.in14
-rw-r--r--x11/gnome-libs/files/patch-devel-docs::zvt::Makefile.in14
-rw-r--r--x11/gnome-libs/pkg-plist286
-rw-r--r--x11/gnomecore/Makefile1
-rw-r--r--x11/gnomecore/files/patch-gnome-hint::gnome-hint.c14
-rw-r--r--x11/gnomecore/files/patch-panel::doc::Makefile.in14
-rw-r--r--x11/gnomecore/pkg-plist57
-rw-r--r--x11/gnomelibs/files/patch-devel-docs::gnome::Makefile.in14
-rw-r--r--x11/gnomelibs/files/patch-devel-docs::gnomeui::Makefile.in14
-rw-r--r--x11/gnomelibs/files/patch-devel-docs::gnorba::Makefile.in14
-rw-r--r--x11/gnomelibs/files/patch-devel-docs::zvt::Makefile.in14
-rw-r--r--x11/gnomelibs/pkg-plist286
79 files changed, 972 insertions, 877 deletions
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 8d39545bb314..f0a1ace2ae14 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomedb
PORTVERSION= 0.2.96
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-db
@@ -21,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/gnome-db/files/patch-configure b/databases/gnome-db/files/patch-configure
index 9547ff98afc8..8925b93fafb4 100644
--- a/databases/gnome-db/files/patch-configure
+++ b/databases/gnome-db/files/patch-configure
@@ -1,9 +1,17 @@
$FreeBSD$
---- configure.orig Mon Mar 4 10:42:41 2002
-+++ configure Mon Mar 4 10:47:57 2002
-@@ -8876,7 +8876,7 @@
+--- configure.orig Mon Apr 15 15:30:28 2002
++++ configure Wed May 1 11:51:50 2002
+@@ -5905,6 +5905,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8876,7 +8877,7 @@
PERL_CC=`perl -MConfig -e 'print $Config{cc},"\n";'`
PERL_LD=`perl -MConfig -e 'print $Config{ld},"\n";'`
PERL_CCOPTS=`perl -MExtUtils::Embed -e ccopts`
@@ -12,7 +20,7 @@ $FreeBSD$
-@@ -8906,7 +8906,7 @@
+@@ -8906,7 +8907,7 @@
GNOMEDB_CFLAGS="`gda-config --cflags client` `gnome-config --cflags xml oaf bonobox print gdk_pixbuf`"
GNOMEDB_LIBS="`gda-config --libs client` `gnome-config --libs xml oaf bonobox print gdk_pixbuf`"
diff --git a/databases/gnome-db/files/patch-doc::C::reference::Makefile.in b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
new file mode 100644
index 000000000000..b9c8dda0e901
--- /dev/null
+++ b/databases/gnome-db/files/patch-doc::C::reference::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/Makefile.in 2002/05/01 08:49:53 1.1
++++ doc/C/reference/Makefile.in 2002/05/01 08:50:40
+@@ -174,7 +174,7 @@
+
+
+ DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/gnomedb
+ TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
+
+ DOC_DIR_INSTALL_FILES = libgnomedb.args libgnomedb.hierarchy libgnomedb.signals libgnomedb.types libgnomedb-decl.txt libgnomedb-sections.txt
diff --git a/databases/gnome-db/files/patch-ltmain.sh b/databases/gnome-db/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/databases/gnome-db/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/gnome-db/pkg-plist b/databases/gnome-db/pkg-plist
index 7891f9fa9981..51f76bec637e 100644
--- a/databases/gnome-db/pkg-plist
+++ b/databases/gnome-db/pkg-plist
@@ -38,6 +38,11 @@ lib/bonobo/monikers/libdatabase_moniker.so
lib/libgnomedb.a
lib/libgnomedb.so
lib/libgnomedb.so.0
+share/doc/gnomedb/libgnomedb-decl.txt
+share/doc/gnomedb/libgnomedb-sections.txt
+share/doc/gnomedb/libgnomedb.args
+share/doc/gnomedb/libgnomedb.hierarchy
+share/doc/gnomedb/libgnomedb.types
share/gnome/apps/Applications/gnomedb-fe.desktop
share/gnome/help/gnome-db/C/comlib.html
share/gnome/help/gnome-db/C/components.html
@@ -110,11 +115,6 @@ share/gnome/help/gnome-db/pt_BR/manager.html
share/gnome/help/gnome-db/pt_BR/topic.dat
share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
share/gnome/help/gnome-db/pt_BR/widgetlib.html
-share/gnome/html/libgnomedb-decl.txt
-share/gnome/html/libgnomedb-sections.txt
-share/gnome/html/libgnomedb.args
-share/gnome/html/libgnomedb.hierarchy
-share/gnome/html/libgnomedb.types
share/gnome/idl/GNOME_Database_UI.idl
share/gnome/oaf/GNOME_DB_Builder.oaf
share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
@@ -172,5 +172,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
@dirrm share/gnome/help/gnome-db/C
@dirrm share/gnome/help/gnome-db
@dirrm share/gnome/apps/Applications
+@dirrm share/doc/gnomedb
@dirrm include/libgnomedb-%%VERSION%%/gnome-db
@dirrm include/libgnomedb-%%VERSION%%
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index 8d39545bb314..f0a1ace2ae14 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomedb
PORTVERSION= 0.2.96
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-db
@@ -21,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/gnomedb/files/patch-configure b/databases/gnomedb/files/patch-configure
index 9547ff98afc8..8925b93fafb4 100644
--- a/databases/gnomedb/files/patch-configure
+++ b/databases/gnomedb/files/patch-configure
@@ -1,9 +1,17 @@
$FreeBSD$
---- configure.orig Mon Mar 4 10:42:41 2002
-+++ configure Mon Mar 4 10:47:57 2002
-@@ -8876,7 +8876,7 @@
+--- configure.orig Mon Apr 15 15:30:28 2002
++++ configure Wed May 1 11:51:50 2002
+@@ -5905,6 +5905,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8876,7 +8877,7 @@
PERL_CC=`perl -MConfig -e 'print $Config{cc},"\n";'`
PERL_LD=`perl -MConfig -e 'print $Config{ld},"\n";'`
PERL_CCOPTS=`perl -MExtUtils::Embed -e ccopts`
@@ -12,7 +20,7 @@ $FreeBSD$
-@@ -8906,7 +8906,7 @@
+@@ -8906,7 +8907,7 @@
GNOMEDB_CFLAGS="`gda-config --cflags client` `gnome-config --cflags xml oaf bonobox print gdk_pixbuf`"
GNOMEDB_LIBS="`gda-config --libs client` `gnome-config --libs xml oaf bonobox print gdk_pixbuf`"
diff --git a/databases/gnomedb/files/patch-doc::C::reference::Makefile.in b/databases/gnomedb/files/patch-doc::C::reference::Makefile.in
new file mode 100644
index 000000000000..b9c8dda0e901
--- /dev/null
+++ b/databases/gnomedb/files/patch-doc::C::reference::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/Makefile.in 2002/05/01 08:49:53 1.1
++++ doc/C/reference/Makefile.in 2002/05/01 08:50:40
+@@ -174,7 +174,7 @@
+
+
+ DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/gnomedb
+ TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
+
+ DOC_DIR_INSTALL_FILES = libgnomedb.args libgnomedb.hierarchy libgnomedb.signals libgnomedb.types libgnomedb-decl.txt libgnomedb-sections.txt
diff --git a/databases/gnomedb/files/patch-ltmain.sh b/databases/gnomedb/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/databases/gnomedb/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/gnomedb/pkg-plist b/databases/gnomedb/pkg-plist
index 7891f9fa9981..51f76bec637e 100644
--- a/databases/gnomedb/pkg-plist
+++ b/databases/gnomedb/pkg-plist
@@ -38,6 +38,11 @@ lib/bonobo/monikers/libdatabase_moniker.so
lib/libgnomedb.a
lib/libgnomedb.so
lib/libgnomedb.so.0
+share/doc/gnomedb/libgnomedb-decl.txt
+share/doc/gnomedb/libgnomedb-sections.txt
+share/doc/gnomedb/libgnomedb.args
+share/doc/gnomedb/libgnomedb.hierarchy
+share/doc/gnomedb/libgnomedb.types
share/gnome/apps/Applications/gnomedb-fe.desktop
share/gnome/help/gnome-db/C/comlib.html
share/gnome/help/gnome-db/C/components.html
@@ -110,11 +115,6 @@ share/gnome/help/gnome-db/pt_BR/manager.html
share/gnome/help/gnome-db/pt_BR/topic.dat
share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
share/gnome/help/gnome-db/pt_BR/widgetlib.html
-share/gnome/html/libgnomedb-decl.txt
-share/gnome/html/libgnomedb-sections.txt
-share/gnome/html/libgnomedb.args
-share/gnome/html/libgnomedb.hierarchy
-share/gnome/html/libgnomedb.types
share/gnome/idl/GNOME_Database_UI.idl
share/gnome/oaf/GNOME_DB_Builder.oaf
share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
@@ -172,5 +172,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
@dirrm share/gnome/help/gnome-db/C
@dirrm share/gnome/help/gnome-db
@dirrm share/gnome/apps/Applications
+@dirrm share/doc/gnomedb
@dirrm include/libgnomedb-%%VERSION%%/gnome-db
@dirrm include/libgnomedb-%%VERSION%%
diff --git a/databases/gnomedb2/Makefile b/databases/gnomedb2/Makefile
index 8d39545bb314..f0a1ace2ae14 100644
--- a/databases/gnomedb2/Makefile
+++ b/databases/gnomedb2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomedb
PORTVERSION= 0.2.96
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-db
@@ -21,7 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/gnomedb2/files/patch-configure b/databases/gnomedb2/files/patch-configure
index 9547ff98afc8..8925b93fafb4 100644
--- a/databases/gnomedb2/files/patch-configure
+++ b/databases/gnomedb2/files/patch-configure
@@ -1,9 +1,17 @@
$FreeBSD$
---- configure.orig Mon Mar 4 10:42:41 2002
-+++ configure Mon Mar 4 10:47:57 2002
-@@ -8876,7 +8876,7 @@
+--- configure.orig Mon Apr 15 15:30:28 2002
++++ configure Wed May 1 11:51:50 2002
+@@ -5905,6 +5905,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8876,7 +8877,7 @@
PERL_CC=`perl -MConfig -e 'print $Config{cc},"\n";'`
PERL_LD=`perl -MConfig -e 'print $Config{ld},"\n";'`
PERL_CCOPTS=`perl -MExtUtils::Embed -e ccopts`
@@ -12,7 +20,7 @@ $FreeBSD$
-@@ -8906,7 +8906,7 @@
+@@ -8906,7 +8907,7 @@
GNOMEDB_CFLAGS="`gda-config --cflags client` `gnome-config --cflags xml oaf bonobox print gdk_pixbuf`"
GNOMEDB_LIBS="`gda-config --libs client` `gnome-config --libs xml oaf bonobox print gdk_pixbuf`"
diff --git a/databases/gnomedb2/files/patch-doc::C::reference::Makefile.in b/databases/gnomedb2/files/patch-doc::C::reference::Makefile.in
new file mode 100644
index 000000000000..b9c8dda0e901
--- /dev/null
+++ b/databases/gnomedb2/files/patch-doc::C::reference::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/Makefile.in 2002/05/01 08:49:53 1.1
++++ doc/C/reference/Makefile.in 2002/05/01 08:50:40
+@@ -174,7 +174,7 @@
+
+
+ DOC_MAIN_SGML_FILE = libgnomedb-reference.sgml
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/gnomedb
+ TARGET_DIR = $(DOC_DIR)/libgnomedb-reference
+
+ DOC_DIR_INSTALL_FILES = libgnomedb.args libgnomedb.hierarchy libgnomedb.signals libgnomedb.types libgnomedb-decl.txt libgnomedb-sections.txt
diff --git a/databases/gnomedb2/files/patch-ltmain.sh b/databases/gnomedb2/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/databases/gnomedb2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/gnomedb2/pkg-plist b/databases/gnomedb2/pkg-plist
index 7891f9fa9981..51f76bec637e 100644
--- a/databases/gnomedb2/pkg-plist
+++ b/databases/gnomedb2/pkg-plist
@@ -38,6 +38,11 @@ lib/bonobo/monikers/libdatabase_moniker.so
lib/libgnomedb.a
lib/libgnomedb.so
lib/libgnomedb.so.0
+share/doc/gnomedb/libgnomedb-decl.txt
+share/doc/gnomedb/libgnomedb-sections.txt
+share/doc/gnomedb/libgnomedb.args
+share/doc/gnomedb/libgnomedb.hierarchy
+share/doc/gnomedb/libgnomedb.types
share/gnome/apps/Applications/gnomedb-fe.desktop
share/gnome/help/gnome-db/C/comlib.html
share/gnome/help/gnome-db/C/components.html
@@ -110,11 +115,6 @@ share/gnome/help/gnome-db/pt_BR/manager.html
share/gnome/help/gnome-db/pt_BR/topic.dat
share/gnome/help/gnome-db/pt_BR/widgetlib-overview.html
share/gnome/help/gnome-db/pt_BR/widgetlib.html
-share/gnome/html/libgnomedb-decl.txt
-share/gnome/html/libgnomedb-sections.txt
-share/gnome/html/libgnomedb.args
-share/gnome/html/libgnomedb.hierarchy
-share/gnome/html/libgnomedb.types
share/gnome/idl/GNOME_Database_UI.idl
share/gnome/oaf/GNOME_DB_Builder.oaf
share/gnome/oaf/GNOME_DB_ComponentFactory.oaf
@@ -172,5 +172,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-db.mo
@dirrm share/gnome/help/gnome-db/C
@dirrm share/gnome/help/gnome-db
@dirrm share/gnome/apps/Applications
+@dirrm share/doc/gnomedb
@dirrm include/libgnomedb-%%VERSION%%/gnome-db
@dirrm include/libgnomedb-%%VERSION%%
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index abfd7e86a720..0fb8c4353fdf 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgda
PORTVERSION= 0.2.96
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
@@ -22,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
diff --git a/databases/libgda/files/patch-configure b/databases/libgda/files/patch-configure
new file mode 100644
index 000000000000..948849e89223
--- /dev/null
+++ b/databases/libgda/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 08:18:05 1.1
++++ configure 2002/05/01 08:19:03
+@@ -5785,6 +5785,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
new file mode 100644
index 000000000000..463f043f902c
--- /dev/null
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1
++++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40
+@@ -171,7 +171,7 @@
+ LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a "
+
+
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/libgda
+
+ DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt
+
diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
new file mode 100644
index 000000000000..25b6b1ddc2e5
--- /dev/null
+++ b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1
++++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35
+@@ -171,7 +171,7 @@
+ LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a "
+
+
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/libgda
+
+ DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt
+
diff --git a/databases/libgda/files/patch-ltmain.sh b/databases/libgda/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/databases/libgda/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/libgda/pkg-plist b/databases/libgda/pkg-plist
index 52a3a3b5368b..60028e4563a1 100644
--- a/databases/libgda/pkg-plist
+++ b/databases/libgda/pkg-plist
@@ -58,6 +58,18 @@ lib/libgda-common.so.0
lib/libgda-server.a
lib/libgda-server.so
lib/libgda-server.so.0
+share/doc/libgda/libgda-client-decl.txt
+share/doc/libgda/libgda-client-sections.txt
+share/doc/libgda/libgda-client.args
+share/doc/libgda/libgda-client.hierarchy
+share/doc/libgda/libgda-client.signals
+share/doc/libgda/libgda-client.types
+share/doc/libgda/libgda-common-decl.txt
+share/doc/libgda/libgda-common-sections.txt
+share/doc/libgda/libgda-common.args
+share/doc/libgda/libgda-common.hierarchy
+share/doc/libgda/libgda-common.signals
+share/doc/libgda/libgda-common.types
share/gnome/gda/templates/gda-srv-command.c.tmpl
share/gnome/gda/templates/gda-srv-connection.c.tmpl
share/gnome/gda/templates/gda-srv-recordset.c.tmpl
@@ -149,18 +161,6 @@ share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
share/gnome/help/libgda/pt_BR/providers-examples.html
share/gnome/help/libgda/pt_BR/providers-implementation.html
share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/html/libgda-client-decl.txt
-share/gnome/html/libgda-client-sections.txt
-share/gnome/html/libgda-client.args
-share/gnome/html/libgda-client.hierarchy
-share/gnome/html/libgda-client.signals
-share/gnome/html/libgda-client.types
-share/gnome/html/libgda-common-decl.txt
-share/gnome/html/libgda-common-sections.txt
-share/gnome/html/libgda-common.args
-share/gnome/html/libgda-common.hierarchy
-share/gnome/html/libgda-common.signals
-share/gnome/html/libgda-common.types
share/gnome/idl/GDA.idl
share/gnome/idl/GDA_Command.idl
share/gnome/idl/GDA_Connection.idl
@@ -206,6 +206,7 @@ share/locale/uk/LC_MESSAGES/libgda.mo
@dirrm share/gnome/help/libgda
@dirrm share/gnome/gda/templates
@dirrm share/gnome/gda
+@dirrm share/doc/libgda
@dirrm include/libgda-%%VERSION%%/gda++
@dirrm include/libgda-%%VERSION%%/gda
@dirrm include/libgda-%%VERSION%%
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index abfd7e86a720..0fb8c4353fdf 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgda
PORTVERSION= 0.2.96
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
@@ -22,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
diff --git a/databases/libgda2/files/patch-configure b/databases/libgda2/files/patch-configure
new file mode 100644
index 000000000000..948849e89223
--- /dev/null
+++ b/databases/libgda2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 08:18:05 1.1
++++ configure 2002/05/01 08:19:03
+@@ -5785,6 +5785,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in
new file mode 100644
index 000000000000..463f043f902c
--- /dev/null
+++ b/databases/libgda2/files/patch-doc::C::reference::libgda-client::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1
++++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40
+@@ -171,7 +171,7 @@
+ LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a "
+
+
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/libgda
+
+ DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt
+
diff --git a/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in
new file mode 100644
index 000000000000..25b6b1ddc2e5
--- /dev/null
+++ b/databases/libgda2/files/patch-doc::C::reference::libgda-common::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1
++++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35
+@@ -171,7 +171,7 @@
+ LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a "
+
+
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/libgda
+
+ DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt
+
diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/databases/libgda2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 52a3a3b5368b..60028e4563a1 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -58,6 +58,18 @@ lib/libgda-common.so.0
lib/libgda-server.a
lib/libgda-server.so
lib/libgda-server.so.0
+share/doc/libgda/libgda-client-decl.txt
+share/doc/libgda/libgda-client-sections.txt
+share/doc/libgda/libgda-client.args
+share/doc/libgda/libgda-client.hierarchy
+share/doc/libgda/libgda-client.signals
+share/doc/libgda/libgda-client.types
+share/doc/libgda/libgda-common-decl.txt
+share/doc/libgda/libgda-common-sections.txt
+share/doc/libgda/libgda-common.args
+share/doc/libgda/libgda-common.hierarchy
+share/doc/libgda/libgda-common.signals
+share/doc/libgda/libgda-common.types
share/gnome/gda/templates/gda-srv-command.c.tmpl
share/gnome/gda/templates/gda-srv-connection.c.tmpl
share/gnome/gda/templates/gda-srv-recordset.c.tmpl
@@ -149,18 +161,6 @@ share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
share/gnome/help/libgda/pt_BR/providers-examples.html
share/gnome/help/libgda/pt_BR/providers-implementation.html
share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/html/libgda-client-decl.txt
-share/gnome/html/libgda-client-sections.txt
-share/gnome/html/libgda-client.args
-share/gnome/html/libgda-client.hierarchy
-share/gnome/html/libgda-client.signals
-share/gnome/html/libgda-client.types
-share/gnome/html/libgda-common-decl.txt
-share/gnome/html/libgda-common-sections.txt
-share/gnome/html/libgda-common.args
-share/gnome/html/libgda-common.hierarchy
-share/gnome/html/libgda-common.signals
-share/gnome/html/libgda-common.types
share/gnome/idl/GDA.idl
share/gnome/idl/GDA_Command.idl
share/gnome/idl/GDA_Connection.idl
@@ -206,6 +206,7 @@ share/locale/uk/LC_MESSAGES/libgda.mo
@dirrm share/gnome/help/libgda
@dirrm share/gnome/gda/templates
@dirrm share/gnome/gda
+@dirrm share/doc/libgda
@dirrm include/libgda-%%VERSION%%/gda++
@dirrm include/libgda-%%VERSION%%/gda
@dirrm include/libgda-%%VERSION%%
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index abfd7e86a720..0fb8c4353fdf 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgda
PORTVERSION= 0.2.96
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/${PORTNAME}
@@ -22,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOMECTRL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
diff --git a/databases/libgda3/files/patch-configure b/databases/libgda3/files/patch-configure
new file mode 100644
index 000000000000..948849e89223
--- /dev/null
+++ b/databases/libgda3/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 08:18:05 1.1
++++ configure 2002/05/01 08:19:03
+@@ -5785,6 +5785,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
new file mode 100644
index 000000000000..463f043f902c
--- /dev/null
+++ b/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1
++++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40
+@@ -171,7 +171,7 @@
+ LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a "
+
+
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/libgda
+
+ DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt
+
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
new file mode 100644
index 000000000000..25b6b1ddc2e5
--- /dev/null
+++ b/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1
++++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35
+@@ -171,7 +171,7 @@
+ LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a "
+
+
+-DOC_DIR = $(datadir)/html
++DOC_DIR = $(prefix)/share/doc/libgda
+
+ DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt
+
diff --git a/databases/libgda3/files/patch-ltmain.sh b/databases/libgda3/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/databases/libgda3/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 52a3a3b5368b..60028e4563a1 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -58,6 +58,18 @@ lib/libgda-common.so.0
lib/libgda-server.a
lib/libgda-server.so
lib/libgda-server.so.0
+share/doc/libgda/libgda-client-decl.txt
+share/doc/libgda/libgda-client-sections.txt
+share/doc/libgda/libgda-client.args
+share/doc/libgda/libgda-client.hierarchy
+share/doc/libgda/libgda-client.signals
+share/doc/libgda/libgda-client.types
+share/doc/libgda/libgda-common-decl.txt
+share/doc/libgda/libgda-common-sections.txt
+share/doc/libgda/libgda-common.args
+share/doc/libgda/libgda-common.hierarchy
+share/doc/libgda/libgda-common.signals
+share/doc/libgda/libgda-common.types
share/gnome/gda/templates/gda-srv-command.c.tmpl
share/gnome/gda/templates/gda-srv-connection.c.tmpl
share/gnome/gda/templates/gda-srv-recordset.c.tmpl
@@ -149,18 +161,6 @@ share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
share/gnome/help/libgda/pt_BR/providers-examples.html
share/gnome/help/libgda/pt_BR/providers-implementation.html
share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/html/libgda-client-decl.txt
-share/gnome/html/libgda-client-sections.txt
-share/gnome/html/libgda-client.args
-share/gnome/html/libgda-client.hierarchy
-share/gnome/html/libgda-client.signals
-share/gnome/html/libgda-client.types
-share/gnome/html/libgda-common-decl.txt
-share/gnome/html/libgda-common-sections.txt
-share/gnome/html/libgda-common.args
-share/gnome/html/libgda-common.hierarchy
-share/gnome/html/libgda-common.signals
-share/gnome/html/libgda-common.types
share/gnome/idl/GDA.idl
share/gnome/idl/GDA_Command.idl
share/gnome/idl/GDA_Connection.idl
@@ -206,6 +206,7 @@ share/locale/uk/LC_MESSAGES/libgda.mo
@dirrm share/gnome/help/libgda
@dirrm share/gnome/gda/templates
@dirrm share/gnome/gda
+@dirrm share/doc/libgda
@dirrm include/libgda-%%VERSION%%/gda++
@dirrm include/libgda-%%VERSION%%/gda
@dirrm include/libgda-%%VERSION%%
diff --git a/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets::Makefile.in.orig
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+- screensaver-properties background-properties \
++ background-properties \
+ theme-switcher sound-properties \
diff --git a/sysutils/gnome-control-center1/files/patch-capplets::Makefile.in.orig b/sysutils/gnome-control-center1/files/patch-capplets::Makefile.in.orig
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnome-control-center1/files/patch-capplets::Makefile.in.orig
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+- screensaver-properties background-properties \
++ background-properties \
+ theme-switcher sound-properties \
diff --git a/sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in.orig b/sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in.orig
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnomecontrolcenter/files/patch-capplets::Makefile.in.orig
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+- screensaver-properties background-properties \
++ background-properties \
+ theme-switcher sound-properties \
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig
new file mode 100644
index 000000000000..c1c29de83cb1
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets::Makefile.in.orig
@@ -0,0 +1,7 @@
+--- capplets/Makefile.in.orig Sun Feb 10 15:41:49 2002
++++ capplets/Makefile.in Wed Feb 13 09:34:28 2002
+@@ -154,3 +154,3 @@
+ always_built_SUBDIRS = desktop-links mouse-properties \
+- screensaver-properties background-properties \
++ background-properties \
+ theme-switcher sound-properties \
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index eba64859f490..81bc13ca4246 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
@@ -25,7 +25,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-gconf=yes \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml/files/patch-af b/www/gtkhtml/files/patch-af
index d7e199bf43cc..fee4a53519fc 100644
--- a/www/gtkhtml/files/patch-af
+++ b/www/gtkhtml/files/patch-af
@@ -1,7 +1,22 @@
---- configure.orig Thu Dec 14 12:54:55 2000
-+++ configure Thu Dec 14 16:34:25 2000
-@@ -3932,3 +3932,3 @@
+
+$FreeBSD$
+
+--- configure.orig Mon Apr 15 19:37:22 2002
++++ configure Wed May 1 12:17:00 2002
+@@ -7025,6 +7025,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9334,7 +9335,7 @@
+
+ if test "x$enable_xim" = "xyes"; then
BACKUP_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS `gtk-config --libs`"
+ LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
+ echo "$as_me:9338: checking for gdk_im_begin" >&5
+ echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
+ if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..575490af80ea
--- /dev/null
+++ b/www/gtkhtml/files/patch-doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in 2002/05/01 09:15:00 1.1
++++ doc/Makefile.in 2002/05/01 09:16:10
+@@ -151,7 +151,7 @@
+ CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
+ LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
+
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gtkhtml
+
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
diff --git a/www/gtkhtml/files/patch-ltmain.sh b/www/gtkhtml/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/www/gtkhtml/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 68c688d2eaa5..d1b7072f5918 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -94,6 +94,11 @@ lib/bonobo/plugin/libstorage_http.so
lib/libgtkhtml.a
lib/libgtkhtml.so
lib/libgtkhtml.so.21
+share/doc/gtkhtml/gtkhtml-decl.txt
+share/doc/gtkhtml/gtkhtml-sections.txt
+share/doc/gtkhtml/gtkhtml.hierarchy
+share/doc/gtkhtml/gtkhtml.sgml
+share/doc/gtkhtml/gtkhtml.types
share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
share/gnome/control-center/Documents/gtkhtml-properties.desktop
share/gnome/gtkhtml/Editor.idl
@@ -138,11 +143,6 @@ share/gnome/gtkhtml/icons/undo-24.png
share/gnome/gtkhtml/keybindingsrc.emacs
share/gnome/gtkhtml/keybindingsrc.ms
share/gnome/gtkhtml/keybindingsrc.xemacs
-share/gnome/html/gtkhtml-decl.txt
-share/gnome/html/gtkhtml-sections.txt
-share/gnome/html/gtkhtml.hierarchy
-share/gnome/html/gtkhtml.sgml
-share/gnome/html/gtkhtml.types
share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
share/gnome/ui/GNOME_GtkHTML_Editor.xml
@@ -176,7 +176,8 @@ share/locale/tr/LC_MESSAGES/gtkhtml.mo
share/locale/uk/LC_MESSAGES/gtkhtml.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/html/gtkhtml
@dirrm share/gnome/gtkhtml/icons
@dirrm share/gnome/gtkhtml
+@dirrm share/doc/gtkhtml/gtkhtml
+@dirrm share/doc/gtkhtml
@dirrm include/gtkhtml
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index eba64859f490..81bc13ca4246 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
@@ -25,7 +25,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-gconf=yes \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml3/files/patch-af b/www/gtkhtml3/files/patch-af
index d7e199bf43cc..fee4a53519fc 100644
--- a/www/gtkhtml3/files/patch-af
+++ b/www/gtkhtml3/files/patch-af
@@ -1,7 +1,22 @@
---- configure.orig Thu Dec 14 12:54:55 2000
-+++ configure Thu Dec 14 16:34:25 2000
-@@ -3932,3 +3932,3 @@
+
+$FreeBSD$
+
+--- configure.orig Mon Apr 15 19:37:22 2002
++++ configure Wed May 1 12:17:00 2002
+@@ -7025,6 +7025,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9334,7 +9335,7 @@
+
+ if test "x$enable_xim" = "xyes"; then
BACKUP_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS `gtk-config --libs`"
+ LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
+ echo "$as_me:9338: checking for gdk_im_begin" >&5
+ echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
+ if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml3/files/patch-doc::Makefile.in b/www/gtkhtml3/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..575490af80ea
--- /dev/null
+++ b/www/gtkhtml3/files/patch-doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in 2002/05/01 09:15:00 1.1
++++ doc/Makefile.in 2002/05/01 09:16:10
+@@ -151,7 +151,7 @@
+ CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
+ LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
+
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gtkhtml
+
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/www/gtkhtml3/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 68c688d2eaa5..d1b7072f5918 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -94,6 +94,11 @@ lib/bonobo/plugin/libstorage_http.so
lib/libgtkhtml.a
lib/libgtkhtml.so
lib/libgtkhtml.so.21
+share/doc/gtkhtml/gtkhtml-decl.txt
+share/doc/gtkhtml/gtkhtml-sections.txt
+share/doc/gtkhtml/gtkhtml.hierarchy
+share/doc/gtkhtml/gtkhtml.sgml
+share/doc/gtkhtml/gtkhtml.types
share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
share/gnome/control-center/Documents/gtkhtml-properties.desktop
share/gnome/gtkhtml/Editor.idl
@@ -138,11 +143,6 @@ share/gnome/gtkhtml/icons/undo-24.png
share/gnome/gtkhtml/keybindingsrc.emacs
share/gnome/gtkhtml/keybindingsrc.ms
share/gnome/gtkhtml/keybindingsrc.xemacs
-share/gnome/html/gtkhtml-decl.txt
-share/gnome/html/gtkhtml-sections.txt
-share/gnome/html/gtkhtml.hierarchy
-share/gnome/html/gtkhtml.sgml
-share/gnome/html/gtkhtml.types
share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
share/gnome/ui/GNOME_GtkHTML_Editor.xml
@@ -176,7 +176,8 @@ share/locale/tr/LC_MESSAGES/gtkhtml.mo
share/locale/uk/LC_MESSAGES/gtkhtml.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/html/gtkhtml
@dirrm share/gnome/gtkhtml/icons
@dirrm share/gnome/gtkhtml
+@dirrm share/doc/gtkhtml/gtkhtml
+@dirrm share/doc/gtkhtml
@dirrm include/gtkhtml
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index eba64859f490..81bc13ca4246 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
@@ -25,7 +25,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-gconf=yes \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml38/files/patch-af b/www/gtkhtml38/files/patch-af
index d7e199bf43cc..fee4a53519fc 100644
--- a/www/gtkhtml38/files/patch-af
+++ b/www/gtkhtml38/files/patch-af
@@ -1,7 +1,22 @@
---- configure.orig Thu Dec 14 12:54:55 2000
-+++ configure Thu Dec 14 16:34:25 2000
-@@ -3932,3 +3932,3 @@
+
+$FreeBSD$
+
+--- configure.orig Mon Apr 15 19:37:22 2002
++++ configure Wed May 1 12:17:00 2002
+@@ -7025,6 +7025,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9334,7 +9335,7 @@
+
+ if test "x$enable_xim" = "xyes"; then
BACKUP_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS `gtk-config --libs`"
+ LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
+ echo "$as_me:9338: checking for gdk_im_begin" >&5
+ echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
+ if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml38/files/patch-doc::Makefile.in b/www/gtkhtml38/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..575490af80ea
--- /dev/null
+++ b/www/gtkhtml38/files/patch-doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in 2002/05/01 09:15:00 1.1
++++ doc/Makefile.in 2002/05/01 09:16:10
+@@ -151,7 +151,7 @@
+ CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
+ LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
+
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gtkhtml
+
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
diff --git a/www/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/www/gtkhtml38/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 68c688d2eaa5..d1b7072f5918 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -94,6 +94,11 @@ lib/bonobo/plugin/libstorage_http.so
lib/libgtkhtml.a
lib/libgtkhtml.so
lib/libgtkhtml.so.21
+share/doc/gtkhtml/gtkhtml-decl.txt
+share/doc/gtkhtml/gtkhtml-sections.txt
+share/doc/gtkhtml/gtkhtml.hierarchy
+share/doc/gtkhtml/gtkhtml.sgml
+share/doc/gtkhtml/gtkhtml.types
share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
share/gnome/control-center/Documents/gtkhtml-properties.desktop
share/gnome/gtkhtml/Editor.idl
@@ -138,11 +143,6 @@ share/gnome/gtkhtml/icons/undo-24.png
share/gnome/gtkhtml/keybindingsrc.emacs
share/gnome/gtkhtml/keybindingsrc.ms
share/gnome/gtkhtml/keybindingsrc.xemacs
-share/gnome/html/gtkhtml-decl.txt
-share/gnome/html/gtkhtml-sections.txt
-share/gnome/html/gtkhtml.hierarchy
-share/gnome/html/gtkhtml.sgml
-share/gnome/html/gtkhtml.types
share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
share/gnome/ui/GNOME_GtkHTML_Editor.xml
@@ -176,7 +176,8 @@ share/locale/tr/LC_MESSAGES/gtkhtml.mo
share/locale/uk/LC_MESSAGES/gtkhtml.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/html/gtkhtml
@dirrm share/gnome/gtkhtml/icons
@dirrm share/gnome/gtkhtml
+@dirrm share/doc/gtkhtml/gtkhtml
+@dirrm share/doc/gtkhtml
@dirrm include/gtkhtml
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index eba64859f490..81bc13ca4246 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
@@ -25,7 +25,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-gconf=yes \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/libgtkhtml/files/patch-af b/www/libgtkhtml/files/patch-af
index d7e199bf43cc..fee4a53519fc 100644
--- a/www/libgtkhtml/files/patch-af
+++ b/www/libgtkhtml/files/patch-af
@@ -1,7 +1,22 @@
---- configure.orig Thu Dec 14 12:54:55 2000
-+++ configure Thu Dec 14 16:34:25 2000
-@@ -3932,3 +3932,3 @@
+
+$FreeBSD$
+
+--- configure.orig Mon Apr 15 19:37:22 2002
++++ configure Wed May 1 12:17:00 2002
+@@ -7025,6 +7025,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9334,7 +9335,7 @@
+
+ if test "x$enable_xim" = "xyes"; then
BACKUP_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS `gtk-config --libs`"
+ LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- echo $ac_n "checking for gdk_im_begin""... $ac_c" 1>&6
+ echo "$as_me:9338: checking for gdk_im_begin" >&5
+ echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
+ if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/libgtkhtml/files/patch-doc::Makefile.in b/www/libgtkhtml/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..575490af80ea
--- /dev/null
+++ b/www/libgtkhtml/files/patch-doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in 2002/05/01 09:15:00 1.1
++++ doc/Makefile.in 2002/05/01 09:16:10
+@@ -151,7 +151,7 @@
+ CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
+ LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
+
+-HTML_DIR = $(datadir)/html
++HTML_DIR = $(prefix)/share/doc/gtkhtml
+
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
diff --git a/www/libgtkhtml/files/patch-ltmain.sh b/www/libgtkhtml/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/www/libgtkhtml/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Sun Jan 20 16:11:07 2002
-+++ ltmain.sh Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
-
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/libgtkhtml/pkg-plist b/www/libgtkhtml/pkg-plist
index 68c688d2eaa5..d1b7072f5918 100644
--- a/www/libgtkhtml/pkg-plist
+++ b/www/libgtkhtml/pkg-plist
@@ -94,6 +94,11 @@ lib/bonobo/plugin/libstorage_http.so
lib/libgtkhtml.a
lib/libgtkhtml.so
lib/libgtkhtml.so.21
+share/doc/gtkhtml/gtkhtml-decl.txt
+share/doc/gtkhtml/gtkhtml-sections.txt
+share/doc/gtkhtml/gtkhtml.hierarchy
+share/doc/gtkhtml/gtkhtml.sgml
+share/doc/gtkhtml/gtkhtml.types
share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
share/gnome/control-center/Documents/gtkhtml-properties.desktop
share/gnome/gtkhtml/Editor.idl
@@ -138,11 +143,6 @@ share/gnome/gtkhtml/icons/undo-24.png
share/gnome/gtkhtml/keybindingsrc.emacs
share/gnome/gtkhtml/keybindingsrc.ms
share/gnome/gtkhtml/keybindingsrc.xemacs
-share/gnome/html/gtkhtml-decl.txt
-share/gnome/html/gtkhtml-sections.txt
-share/gnome/html/gtkhtml.hierarchy
-share/gnome/html/gtkhtml.sgml
-share/gnome/html/gtkhtml.types
share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
share/gnome/ui/GNOME_GtkHTML_Editor.xml
@@ -176,7 +176,8 @@ share/locale/tr/LC_MESSAGES/gtkhtml.mo
share/locale/uk/LC_MESSAGES/gtkhtml.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/html/gtkhtml
@dirrm share/gnome/gtkhtml/icons
@dirrm share/gnome/gtkhtml
+@dirrm share/doc/gtkhtml/gtkhtml
+@dirrm share/doc/gtkhtml
@dirrm include/gtkhtml
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 64bcd344657e..77724395f714 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.19.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gal
@@ -24,8 +25,9 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-static --with-libiconv
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --enable-static --with-libiconv \
+ --with-html-dir=${PREFIX}/share/doc/gal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal/files/patch-configure b/x11-toolkits/gal/files/patch-configure
new file mode 100644
index 000000000000..08fc564a6a1f
--- /dev/null
+++ b/x11-toolkits/gal/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 01:51:44 1.1
++++ configure 2002/05/01 01:52:07
+@@ -5704,6 +5704,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gal/files/patch-ltmain.sh b/x11-toolkits/gal/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/gal/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Wed Jan 23 11:38:40 2002
-+++ ltmain.sh Sun Feb 3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2412,6 +2420,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index 1acf200a5b21..35c042a5026a 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -132,6 +132,12 @@ include/gal/widgets/widget-pixmap-combo.h
lib/libgal.a
lib/libgal.so
lib/libgal.so.19
+share/doc/gal/gal-api.sgml
+share/doc/gal/gal-decl.txt
+share/doc/gal/gal-sections.txt
+share/doc/gal/gal.hierarchy
+share/doc/gal/gal.signals
+share/doc/gal/gal.types
share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
@@ -140,12 +146,6 @@ share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal/html/gal-api.sgml
-share/gnome/gal/html/gal-decl.txt
-share/gnome/gal/html/gal-sections.txt
-share/gnome/gal/html/gal.hierarchy
-share/gnome/gal/html/gal.signals
-share/gnome/gal/html/gal.types
share/gnome/pixmaps/gal/categories/category_birthday_16.png
share/gnome/pixmaps/gal/categories/category_business_16.png
share/gnome/pixmaps/gal/categories/category_favorites_16.png
@@ -194,14 +194,14 @@ share/locale/uk/LC_MESSAGES/gal.mo
share/locale/zh_TW/LC_MESSAGES/gal.mo
@dirrm share/gnome/pixmaps/gal/categories
@dirrm share/gnome/pixmaps/gal
-@dirrm share/gnome/gal/html/gal
-@dirrm share/gnome/gal/html
@dirrm share/gnome/gal/%%VERSION%%/glade
@dirrm share/gnome/gal/%%VERSION%%
@dirrm share/gnome/gal
@dirrm share/gnome/etable/%%VERSION%%/glade
@dirrm share/gnome/etable/%%VERSION%%
@dirrm share/gnome/etable
+@dirrm share/doc/gal/gal
+@dirrm share/doc/gal
@dirrm include/gal/widgets
@dirrm include/gal/util
@dirrm include/gal/unicode
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 64bcd344657e..77724395f714 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.19.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gal
@@ -24,8 +25,9 @@ USE_PERL5= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-static --with-libiconv
+USE_LIBTOOL= yes
+CONFIGURE_ARGS= --enable-static --with-libiconv \
+ --with-html-dir=${PREFIX}/share/doc/gal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal2/files/patch-configure b/x11-toolkits/gal2/files/patch-configure
new file mode 100644
index 000000000000..08fc564a6a1f
--- /dev/null
+++ b/x11-toolkits/gal2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure 2002/05/01 01:51:44 1.1
++++ configure 2002/05/01 01:52:07
+@@ -5704,6 +5704,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gal2/files/patch-ltmain.sh b/x11-toolkits/gal2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11-toolkits/gal2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig Wed Jan 23 11:38:40 2002
-+++ ltmain.sh Sun Feb 3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2412,6 +2420,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 1acf200a5b21..35c042a5026a 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -132,6 +132,12 @@ include/gal/widgets/widget-pixmap-combo.h
lib/libgal.a
lib/libgal.so
lib/libgal.so.19
+share/doc/gal/gal-api.sgml
+share/doc/gal/gal-decl.txt
+share/doc/gal/gal-sections.txt
+share/doc/gal/gal.hierarchy
+share/doc/gal/gal.signals
+share/doc/gal/gal.types
share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade
share/gnome/etable/%%VERSION%%/glade/e-table-config.glade
share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade
@@ -140,12 +146,6 @@ share/gnome/gal/%%VERSION%%/glade/e-categories-master-list-dialog.glade
share/gnome/gal/%%VERSION%%/glade/gal-categories.glade
share/gnome/gal/%%VERSION%%/glade/gal-define-views.glade
share/gnome/gal/%%VERSION%%/glade/gal-view-new-dialog.glade
-share/gnome/gal/html/gal-api.sgml
-share/gnome/gal/html/gal-decl.txt
-share/gnome/gal/html/gal-sections.txt
-share/gnome/gal/html/gal.hierarchy
-share/gnome/gal/html/gal.signals
-share/gnome/gal/html/gal.types
share/gnome/pixmaps/gal/categories/category_birthday_16.png
share/gnome/pixmaps/gal/categories/category_business_16.png
share/gnome/pixmaps/gal/categories/category_favorites_16.png
@@ -194,14 +194,14 @@ share/locale/uk/LC_MESSAGES/gal.mo
share/locale/zh_TW/LC_MESSAGES/gal.mo
@dirrm share/gnome/pixmaps/gal/categories
@dirrm share/gnome/pixmaps/gal
-@dirrm share/gnome/gal/html/gal
-@dirrm share/gnome/gal/html
@dirrm share/gnome/gal/%%VERSION%%/glade
@dirrm share/gnome/gal/%%VERSION%%
@dirrm share/gnome/gal
@dirrm share/gnome/etable/%%VERSION%%/glade
@dirrm share/gnome/etable/%%VERSION%%
@dirrm share/gnome/etable
+@dirrm share/doc/gal/gal
+@dirrm share/doc/gal
@dirrm include/gal/widgets
@dirrm include/gal/util
@dirrm include/gal/unicode
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 000000000000..b98c5295317b
--- /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 000000000000..9266154be01a
--- /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 000000000000..e7cc10f89a6b
--- /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 000000000000..c03007ea3a2d
--- /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 b771d39a7539..fc35a1e0891d 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 c086dc4a1593..90cc7037092e 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 000000000000..0603d6fc6987
--- /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 000000000000..5887c856eace
--- /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 7465a8532ee8..9be8f84e4190 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 000000000000..b98c5295317b
--- /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 000000000000..9266154be01a
--- /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 000000000000..e7cc10f89a6b
--- /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 000000000000..c03007ea3a2d
--- /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 b771d39a7539..fc35a1e0891d 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