Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

4 files changed, 17 insertions, 56 deletions

diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index c0f3a7f0dd34..f5d417a837c5 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeuserdocs2
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome2-user-docs/2.4
+MASTER_SITE_SUBDIR=	sources/gnome2-user-docs/2.6
 DISTNAME=	gnome2-user-docs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index e9b8d3d8d1ee..5f26a52d9d98 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome2-user-docs-2.4.1.tar.bz2) = 560d4fbb21d5f8ab5e0c79c856d60f8c
-SIZE (gnome2/gnome2-user-docs-2.4.1.tar.bz2) = 1428178
+MD5 (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 8125558f7f515b681fdeb853adf06ebb
+SIZE (gnome2/gnome2-user-docs-2.6.0.1.tar.bz2) = 1018591
diff --git a/misc/gnome-user-docs/pkg-descr b/misc/gnome-user-docs/pkg-descr
index 0ba21f5fdd2a..0ed2fb1bc819 100644
--- a/misc/gnome-user-docs/pkg-descr
+++ b/misc/gnome-user-docs/pkg-descr
@@ -1 +1 @@
-GNOME 2 users guide.
+User documentation for the GNOME 2 desktop.
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 97ffcc354343..aa6f26f30a0e 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -22,20 +22,14 @@ share/gnome/help/gnome-access-guide/C/keynav.xml
 share/gnome/help/gnome-access-guide/C/legal.xml
 share/gnome/help/gnome-access-guide/C/preface.xml
 share/gnome/help/gnome-access-guide/C/themes.xml
-share/gnome/help/introduction-to-gnome/C/figures/desktop.png
-share/gnome/help/introduction-to-gnome/C/figures/microguiborder.png
-share/gnome/help/introduction-to-gnome/C/figures/naut_iconview_window.png
-share/gnome/help/introduction-to-gnome/C/figures/titlebar_anno_window.png
-share/gnome/help/introduction-to-gnome/C/figures/typical_anno_desktop.png
-share/gnome/help/introduction-to-gnome/C/introduction-to-gnome.xml
-share/gnome/help/introduction-to-gnome/C/legal.xml
 share/gnome/help/system-admin-guide/C/appendixa.xml
-share/gnome/help/system-admin-guide/C/figures/gconf_editor_anno_window.png
+share/gnome/help/system-admin-guide/C/appendixb.xml
+share/gnome/help/system-admin-guide/C/fontconfig.xml
 share/gnome/help/system-admin-guide/C/gconf.xml
-share/gnome/help/system-admin-guide/C/gdm.xml
 share/gnome/help/system-admin-guide/C/glossary.xml
 share/gnome/help/system-admin-guide/C/help.xml
 share/gnome/help/system-admin-guide/C/legal.xml
+share/gnome/help/system-admin-guide/C/lockdown.xml
 share/gnome/help/system-admin-guide/C/menustructure.xml
 share/gnome/help/system-admin-guide/C/mimetypes.xml
 share/gnome/help/system-admin-guide/C/performance.xml
@@ -47,6 +41,7 @@ share/gnome/help/user-guide/C/figures/applet_popup.png
 share/gnome/help/user-guide/C/figures/ask_pointer.png
 share/gnome/help/user-guide/C/figures/caution.png
 share/gnome/help/user-guide/C/figures/column_resize_pointer.png
+share/gnome/help/user-guide/C/figures/com_file_manager_menu.png
 share/gnome/help/user-guide/C/figures/copy_pointer.png
 share/gnome/help/user-guide/C/figures/corner_resize_pointer.png
 share/gnome/help/user-guide/C/figures/file_manager_menu.png
@@ -67,6 +62,10 @@ share/gnome/help/user-guide/C/figures/menu_panel.png
 share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png
 share/gnome/help/user-guide/C/figures/move_pointer.png
 share/gnome/help/user-guide/C/figures/naut_audioview_window.png
+share/gnome/help/user-guide/C/figures/naut_browser_filesystem.png
+share/gnome/help/user-guide/C/figures/naut_browser_window.png
+share/gnome/help/user-guide/C/figures/naut_computer_contents.png
+share/gnome/help/user-guide/C/figures/naut_computer_launcher.png
 share/gnome/help/user-guide/C/figures/naut_home_launcher.png
 share/gnome/help/user-guide/C/figures/naut_iconview_anno_window.png
 share/gnome/help/user-guide/C/figures/naut_iconview_window.png
@@ -111,7 +110,6 @@ share/gnome/help/user-guide/C/figures/window_list_applet.png
 share/gnome/help/user-guide/C/figures/window_list_group_applet.png
 share/gnome/help/user-guide/C/figures/window_menu.png
 share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png
-share/gnome/help/user-guide/C/front.xml
 share/gnome/help/user-guide/C/glossary.xml
 share/gnome/help/user-guide/C/gosbasic.xml
 share/gnome/help/user-guide/C/goscustaccess.xml
@@ -127,6 +125,7 @@ share/gnome/help/user-guide/C/gosstartsession.xml
 share/gnome/help/user-guide/C/legal.xml
 share/gnome/help/user-guide/C/part1.xml
 share/gnome/help/user-guide/C/part2.xml
+share/gnome/help/user-guide/C/plaingnomestartpreftools.xml
 share/gnome/help/user-guide/C/user-guide.xml
 share/gnome/help/user-guide/C/wgosbasic.xml
 share/gnome/help/user-guide/C/wgoscustaccess.xml
@@ -141,57 +140,20 @@ share/gnome/help/user-guide/C/wgospanel.xml
 share/gnome/help/user-guide/C/wgosstartsession.xml
 share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gosbasic-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosbasic-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/goscustaccess-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustaccess-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/goscustdesk-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustdesk-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/goscustlookandfeel-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goscustlookandfeel-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gosdeskback-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosdeskback-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/goseditmainmenu-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/goseditmainmenu-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gosmetacity-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosmetacity-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gosnautilus-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosnautilus-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gosoverview-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosoverview-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gospanel-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gospanel-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/user-guide/gosstartsession-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/gosstartsession-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/user-guide/user-guide-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/user-guide/user-guide-C.omf 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/omf/user-guide
 @dirrm share/gnome/omf/gnome2-user-docs
 @dirrm share/gnome/help/user-guide/C/figures
 @dirrm share/gnome/help/user-guide/C
 @dirrm share/gnome/help/user-guide
-@dirrm share/gnome/help/system-admin-guide/C/figures
 @dirrm share/gnome/help/system-admin-guide/C
 @dirrm share/gnome/help/system-admin-guide
-@dirrm share/gnome/help/introduction-to-gnome/C/figures
-@dirrm share/gnome/help/introduction-to-gnome/C
-@dirrm share/gnome/help/introduction-to-gnome
 @dirrm share/gnome/help/gnome-access-guide/C/figures
 @dirrm share/gnome/help/gnome-access-guide/C
 @dirrm share/gnome/help/gnome-access-guide
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/introduction-to-gnome-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosbasic-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustaccess-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustdesk-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goscustlookandfeel-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosdeskback-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/goseditmainmenu-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosmetacity-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosnautilus-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosoverview-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gospanel-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/gosstartsession-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/user-guide/user-guide-C.omf 2>/dev/null || /usr/bin/true