The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

14 files changed, 311 insertions, 76 deletions

diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 997a6b4b2c0f..d05b7d9fb70d 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.1 2007/09/18 15:23:15 ahze Exp $
+#   $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.3 2008/03/11 04:00:33 mezz Exp $
+#
 
 PORTNAME=	gnome-devel-docs
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,6 +21,7 @@ RUN_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget
 INSTALLS_OMF=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
index b8d1c3b1a78c..3e10d12e378d 100644
--- a/misc/gnome-devel-docs/distinfo
+++ b/misc/gnome-devel-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 64d6e3594b2c6422ea8d17b78f501020
-SHA256 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 0d966471c8199350df7d3ecc712cde7efd9c52d8d4d31c87060bc5d70c5448ff
-SIZE (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 2373648
+MD5 (gnome2/gnome-devel-docs-2.22.0.tar.bz2) = fde987f35c495fa16b9af1de9a6aed7b
+SHA256 (gnome2/gnome-devel-docs-2.22.0.tar.bz2) = 96f0489d51c10855b6dda303d5b58fccac4f162bc39ffd5d4f23905ae7d07a82
+SIZE (gnome2/gnome-devel-docs-2.22.0.tar.bz2) = 2732641
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
index 3f2151d25f3f..fa595e2d0494 100644
--- a/misc/gnome-devel-docs/pkg-plist
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -95,6 +95,7 @@ share/gnome/help/hig-book/C/hig-ch-layout.xml
 share/gnome/help/hig-book/C/hig-ch-menus.xml
 share/gnome/help/hig-book/C/hig-ch-principles.xml
 share/gnome/help/hig-book/C/hig-ch-toolbars.xml
+share/gnome/help/hig-book/C/hig-ch-whatsnew.xml
 share/gnome/help/hig-book/C/hig-ch-windows.xml
 share/gnome/help/hig-book/C/images/EvoToolbar.png
 share/gnome/help/hig-book/C/images/GtkToolbar.png
@@ -103,28 +104,17 @@ share/gnome/help/hig-book/C/images/GtkToolbar_gedit.png
 share/gnome/help/hig-book/C/images/GtkToolbar_productivitydefault.png
 share/gnome/help/hig-book/C/images/abiword-icon.png
 share/gnome/help/hig-book/C/images/action-icon.png
-share/gnome/help/hig-book/C/images/alert-button-order.png
-share/gnome/help/hig-book/C/images/alert-spacing.png
-share/gnome/help/hig-book/C/images/alert-text.png
 share/gnome/help/hig-book/C/images/application-edit-menu.png
 share/gnome/help/hig-book/C/images/application-icons.png
 share/gnome/help/hig-book/C/images/application-menubar.png
-share/gnome/help/hig-book/C/images/applications-menu.png
-share/gnome/help/hig-book/C/images/assistant-first-page.png
-share/gnome/help/hig-book/C/images/assistant-middle-page.png
-share/gnome/help/hig-book/C/images/authentication-alert.png
 share/gnome/help/hig-book/C/images/browser-toolbar.png
 share/gnome/help/hig-book/C/images/busy-pointers.png
 share/gnome/help/hig-book/C/images/caution.png
 share/gnome/help/hig-book/C/images/checkbox-menu.png
 share/gnome/help/hig-book/C/images/checkbox_label.png
-share/gnome/help/hig-book/C/images/checklist-window-done.png
-share/gnome/help/hig-book/C/images/checklist-window-in-progress.png
-share/gnome/help/hig-book/C/images/checklist-window-start.png
 share/gnome/help/hig-book/C/images/colour_and_arrows.png
 share/gnome/help/hig-book/C/images/colour_only.png
 share/gnome/help/hig-book/C/images/command-menu.png
-share/gnome/help/hig-book/C/images/confirmation-alert.png
 share/gnome/help/hig-book/C/images/controls-buttons.png
 share/gnome/help/hig-book/C/images/controls-check-box-ambiguous.png
 share/gnome/help/hig-book/C/images/controls-check-boxes-mixed.png
@@ -159,6 +149,7 @@ share/gnome/help/hig-book/C/images/depend1a.png
 share/gnome/help/hig-book/C/images/depend2.png
 share/gnome/help/hig-book/C/images/depend2a.png
 share/gnome/help/hig-book/C/images/depend3.png
+share/gnome/help/hig-book/C/images/desktop-applications-menu.png
 share/gnome/help/hig-book/C/images/df.png
 share/gnome/help/hig-book/C/images/dragcursor-augmented.png
 share/gnome/help/hig-book/C/images/dragcursor-copy.png
@@ -169,9 +160,7 @@ share/gnome/help/hig-book/C/images/dragcursor-rmb.png
 share/gnome/help/hig-book/C/images/earthDeutan.png
 share/gnome/help/hig-book/C/images/earthNorm.png
 share/gnome/help/hig-book/C/images/earthTritan.png
-share/gnome/help/hig-book/C/images/error-alert.png
 share/gnome/help/hig-book/C/images/evolution-icon.png
-share/gnome/help/hig-book/C/images/explicit-apply.png
 share/gnome/help/hig-book/C/images/file-menu.png
 share/gnome/help/hig-book/C/images/floppy-dissected.png
 share/gnome/help/hig-book/C/images/fontsel-icon.png
@@ -219,7 +208,6 @@ share/gnome/help/hig-book/C/images/icon_perspective_shelf.png
 share/gnome/help/hig-book/C/images/icon_perspective_table.png
 share/gnome/help/hig-book/C/images/icons_labels.png
 share/gnome/help/hig-book/C/images/important.png
-share/gnome/help/hig-book/C/images/information-alert.png
 share/gnome/help/hig-book/C/images/installer-icon.png
 share/gnome/help/hig-book/C/images/label_above.png
 share/gnome/help/hig-book/C/images/label_below.png
@@ -234,7 +222,6 @@ share/gnome/help/hig-book/C/images/list_control_label.png
 share/gnome/help/hig-book/C/images/log-icon.png
 share/gnome/help/hig-book/C/images/manual-alert-spacing.png
 share/gnome/help/hig-book/C/images/manual-button-ordering.png
-share/gnome/help/hig-book/C/images/mdi.png
 share/gnome/help/hig-book/C/images/menu-icons.png
 share/gnome/help/hig-book/C/images/mnemonics_and_shortcuts.png
 share/gnome/help/hig-book/C/images/nautilus-icon.png
@@ -278,17 +265,12 @@ share/gnome/help/hig-book/C/images/palette-8.png
 share/gnome/help/hig-book/C/images/palette-9.png
 share/gnome/help/hig-book/C/images/pointingdevices.png
 share/gnome/help/hig-book/C/images/popup-menu.png
-share/gnome/help/hig-book/C/images/preferences-window.png
-share/gnome/help/hig-book/C/images/primary-window.png
 share/gnome/help/hig-book/C/images/progress-checklist-with-bar.png
 share/gnome/help/hig-book/C/images/progress-checklist.png
 share/gnome/help/hig-book/C/images/progress-indeterminate.png
 share/gnome/help/hig-book/C/images/progress-proportion.png
 share/gnome/help/hig-book/C/images/progress-time.png
 share/gnome/help/hig-book/C/images/progress-typical-time.png
-share/gnome/help/hig-book/C/images/progress-window-copy.png
-share/gnome/help/hig-book/C/images/progress-window.png
-share/gnome/help/hig-book/C/images/property-window.png
 share/gnome/help/hig-book/C/images/quit1.png
 share/gnome/help/hig-book/C/images/quit2.png
 share/gnome/help/hig-book/C/images/radio_button_label.png
@@ -297,8 +279,6 @@ share/gnome/help/hig-book/C/images/rubberband.png
 share/gnome/help/hig-book/C/images/rubberband_dia.png
 share/gnome/help/hig-book/C/images/save1.png
 share/gnome/help/hig-book/C/images/save2.png
-share/gnome/help/hig-book/C/images/save_alert.png
-share/gnome/help/hig-book/C/images/sdi.png
 share/gnome/help/hig-book/C/images/shutdown-icon.png
 share/gnome/help/hig-book/C/images/size-48x48.png
 share/gnome/help/hig-book/C/images/small_icon_label.png
@@ -306,17 +286,38 @@ share/gnome/help/hig-book/C/images/sodipodi-icon.png
 share/gnome/help/hig-book/C/images/softwareupdateicon.png
 share/gnome/help/hig-book/C/images/stock_save.png
 share/gnome/help/hig-book/C/images/submenu.png
-share/gnome/help/hig-book/C/images/tabbed-dialog-box.png
 share/gnome/help/hig-book/C/images/textbox_label.png
 share/gnome/help/hig-book/C/images/tip.png
 share/gnome/help/hig-book/C/images/toolbar-icons.png
 share/gnome/help/hig-book/C/images/toolbar-silhouette.png
-share/gnome/help/hig-book/C/images/toolbox-small.png
-share/gnome/help/hig-book/C/images/toolbox.png
 share/gnome/help/hig-book/C/images/underline-icon.png
 share/gnome/help/hig-book/C/images/view-toolbar.png
 share/gnome/help/hig-book/C/images/warning.png
-share/gnome/help/hig-book/C/images/window-title.png
+share/gnome/help/hig-book/C/images/windows-alert-authentication.png
+share/gnome/help/hig-book/C/images/windows-alert-buttons.png
+share/gnome/help/hig-book/C/images/windows-alert-confirmation.png
+share/gnome/help/hig-book/C/images/windows-alert-error.png
+share/gnome/help/hig-book/C/images/windows-alert-information.png
+share/gnome/help/hig-book/C/images/windows-alert-save.png
+share/gnome/help/hig-book/C/images/windows-alert-spacing.png
+share/gnome/help/hig-book/C/images/windows-alert-text.png
+share/gnome/help/hig-book/C/images/windows-assistant-first-page.png
+share/gnome/help/hig-book/C/images/windows-assistant-middle-page.png
+share/gnome/help/hig-book/C/images/windows-dialog-tabbed.png
+share/gnome/help/hig-book/C/images/windows-explicit-apply.png
+share/gnome/help/hig-book/C/images/windows-mdi.png
+share/gnome/help/hig-book/C/images/windows-preferences.png
+share/gnome/help/hig-book/C/images/windows-primary.png
+share/gnome/help/hig-book/C/images/windows-progress-checklist-done.png
+share/gnome/help/hig-book/C/images/windows-progress-checklist-start.png
+share/gnome/help/hig-book/C/images/windows-progress-checklist.png
+share/gnome/help/hig-book/C/images/windows-progress-copy-file.png
+share/gnome/help/hig-book/C/images/windows-progress.png
+share/gnome/help/hig-book/C/images/windows-properties.png
+share/gnome/help/hig-book/C/images/windows-sdi.png
+share/gnome/help/hig-book/C/images/windows-titlebar.png
+share/gnome/help/hig-book/C/images/windows-toolbox-large.png
+share/gnome/help/hig-book/C/images/windows-toolbox-small.png
 share/gnome/help/hig-book/C/images/ximian-palette.png
 share/gnome/help/integration-guide/C/integration-guide.xml
 share/gnome/help/platform-overview/C/apx-modules.xml
@@ -343,6 +344,18 @@ share/gnome/help/platform-overview/es/ipc-network.xml
 share/gnome/help/platform-overview/es/legal-fdl.xml
 share/gnome/help/platform-overview/es/platform-overview.xml
 share/gnome/help/platform-overview/es/platform.xml
+share/gnome/help/platform-overview/fr/apx-modules.xml
+share/gnome/help/platform-overview/fr/bindings.xml
+share/gnome/help/platform-overview/fr/core-tech.xml
+share/gnome/help/platform-overview/fr/desktop-tech.xml
+share/gnome/help/platform-overview/fr/figures/graphics.png
+share/gnome/help/platform-overview/fr/figures/i18n.png
+share/gnome/help/platform-overview/fr/figures/pango.png
+share/gnome/help/platform-overview/fr/intro.xml
+share/gnome/help/platform-overview/fr/ipc-network.xml
+share/gnome/help/platform-overview/fr/legal-fdl.xml
+share/gnome/help/platform-overview/fr/platform-overview.xml
+share/gnome/help/platform-overview/fr/platform.xml
 share/gnome/help/platform-overview/it/apx-modules.xml
 share/gnome/help/platform-overview/it/bindings.xml
 share/gnome/help/platform-overview/it/core-tech.xml
@@ -355,21 +368,53 @@ share/gnome/help/platform-overview/it/ipc-network.xml
 share/gnome/help/platform-overview/it/legal-fdl.xml
 share/gnome/help/platform-overview/it/platform-overview.xml
 share/gnome/help/platform-overview/it/platform.xml
+share/gnome/help/platform-overview/oc/apx-modules.xml
+share/gnome/help/platform-overview/oc/bindings.xml
+share/gnome/help/platform-overview/oc/core-tech.xml
+share/gnome/help/platform-overview/oc/desktop-tech.xml
+share/gnome/help/platform-overview/oc/figures/graphics.png
+share/gnome/help/platform-overview/oc/figures/i18n.png
+share/gnome/help/platform-overview/oc/figures/pango.png
+share/gnome/help/platform-overview/oc/intro.xml
+share/gnome/help/platform-overview/oc/ipc-network.xml
+share/gnome/help/platform-overview/oc/legal-fdl.xml
+share/gnome/help/platform-overview/oc/platform-overview.xml
+share/gnome/help/platform-overview/oc/platform.xml
+share/gnome/help/platform-overview/ru/apx-modules.xml
+share/gnome/help/platform-overview/ru/bindings.xml
+share/gnome/help/platform-overview/ru/core-tech.xml
+share/gnome/help/platform-overview/ru/desktop-tech.xml
+share/gnome/help/platform-overview/ru/figures/graphics.png
+share/gnome/help/platform-overview/ru/figures/i18n.png
+share/gnome/help/platform-overview/ru/figures/pango.png
+share/gnome/help/platform-overview/ru/intro.xml
+share/gnome/help/platform-overview/ru/ipc-network.xml
+share/gnome/help/platform-overview/ru/legal-fdl.xml
+share/gnome/help/platform-overview/ru/platform-overview.xml
+share/gnome/help/platform-overview/ru/platform.xml
 share/omf/gdp-handbook/gdp-handbook-C.omf
 share/omf/gdp-style-guide/gdp-style-guide-C.omf
 share/omf/hig-book/hig-book-C.omf
 share/omf/integration-guide/integration-guide-C.omf
 share/omf/platform-overview/platform-overview-C.omf
 share/omf/platform-overview/platform-overview-es.omf
+share/omf/platform-overview/platform-overview-fr.omf
 share/omf/platform-overview/platform-overview-it.omf
+share/omf/platform-overview/platform-overview-oc.omf
+share/omf/platform-overview/platform-overview-ru.omf
 @dirrm share/omf/platform-overview
 @dirrm share/omf/integration-guide
 @dirrm share/omf/hig-book
 @dirrm share/omf/gdp-style-guide
 @dirrm share/omf/gdp-handbook
-@dirrm share/omf
+@dirrm share/gnome/help/platform-overview/ru/figures
+@dirrm share/gnome/help/platform-overview/ru
+@dirrm share/gnome/help/platform-overview/oc/figures
+@dirrm share/gnome/help/platform-overview/oc
 @dirrm share/gnome/help/platform-overview/it/figures
 @dirrm share/gnome/help/platform-overview/it
+@dirrm share/gnome/help/platform-overview/fr/figures
+@dirrm share/gnome/help/platform-overview/fr
 @dirrm share/gnome/help/platform-overview/es/figures
 @dirrm share/gnome/help/platform-overview/es
 @dirrm share/gnome/help/platform-overview/C/figures
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 537cd00c49ee..ed09d16aad3f 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,15 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.107 2007/09/18 02:01:24 ahze Exp $
+#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.113 2008/03/11 17:31:58 mezz Exp $
 #
 
 PORTNAME=	gnome-icon-theme
-PORTVERSION=	2.20.0
-PORTREVISION=	1
+PORTVERSION=	2.22.0
 CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 150d02fc7b51..8741f3f0af06 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 56857a6d5f26c236b48fcf6760549d1b
-SHA256 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3c911a7a35f6633bde3cc29bb6134e67dfec05dc13f5d6f03c04c6fa08448663
-SIZE (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3470014
+MD5 (gnome2/gnome-icon-theme-2.22.0.tar.bz2) = a4c03092da28ad53ed3867aef83f29d9
+SHA256 (gnome2/gnome-icon-theme-2.22.0.tar.bz2) = 98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748
+SIZE (gnome2/gnome-icon-theme-2.22.0.tar.bz2) = 3666577
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index dbd63d1e653f..cab97f2a7163 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -158,7 +158,6 @@ share/icons/gnome/16x16/actions/gtk-undo-ltr.png
 share/icons/gnome/16x16/actions/gtk-unindent-ltr.png
 share/icons/gnome/16x16/actions/gtk-unindent-rtl.png
 share/icons/gnome/16x16/actions/gtk-zoom-100.png
-share/icons/gnome/16x16/actions/gtk-zoom-fit.png
 share/icons/gnome/16x16/actions/gtk-zoom-in.png
 share/icons/gnome/16x16/actions/gtk-zoom-out.png
 share/icons/gnome/16x16/actions/help-about.png
@@ -296,7 +295,6 @@ share/icons/gnome/16x16/actions/stock_up.png
 share/icons/gnome/16x16/actions/stock_zoom-1.png
 share/icons/gnome/16x16/actions/stock_zoom-in.png
 share/icons/gnome/16x16/actions/stock_zoom-out.png
-share/icons/gnome/16x16/actions/stock_zoom-page.png
 share/icons/gnome/16x16/actions/stop.png
 share/icons/gnome/16x16/actions/system-lock-screen.png
 share/icons/gnome/16x16/actions/system-log-out.png
@@ -320,7 +318,6 @@ share/icons/gnome/16x16/actions/view-sort-descending.png
 share/icons/gnome/16x16/actions/viewmag+.png
 share/icons/gnome/16x16/actions/viewmag-.png
 share/icons/gnome/16x16/actions/viewmag1.png
-share/icons/gnome/16x16/actions/viewmagfit.png
 share/icons/gnome/16x16/actions/window-close.png
 share/icons/gnome/16x16/actions/window-new.png
 share/icons/gnome/16x16/actions/window_fullscreen.png
@@ -328,7 +325,7 @@ share/icons/gnome/16x16/actions/window_new.png
 share/icons/gnome/16x16/actions/window_nofullscreen.png
 share/icons/gnome/16x16/actions/xfce-system-exit.png
 share/icons/gnome/16x16/actions/xfce-system-lock.png
-share/icons/gnome/16x16/actions/zoom-best-fit.png
+share/icons/gnome/16x16/actions/zoom-fit-best.png
 share/icons/gnome/16x16/actions/zoom-in.png
 share/icons/gnome/16x16/actions/zoom-original.png
 share/icons/gnome/16x16/actions/zoom-out.png
@@ -616,20 +613,26 @@ share/icons/gnome/16x16/emblems/emblem-urgent.png
 share/icons/gnome/16x16/emblems/emblem-web.png
 share/icons/gnome/16x16/emblems/stock_mail-priority-high.png
 share/icons/gnome/16x16/emotes/face-angel.png
+share/icons/gnome/16x16/emotes/face-angry.png
 share/icons/gnome/16x16/emotes/face-cool.png
 share/icons/gnome/16x16/emotes/face-crying.png
 share/icons/gnome/16x16/emotes/face-devilish.png
 share/icons/gnome/16x16/emotes/face-embarrassed.png
 share/icons/gnome/16x16/emotes/face-kiss.png
+share/icons/gnome/16x16/emotes/face-laugh.png
 share/icons/gnome/16x16/emotes/face-monkey.png
 share/icons/gnome/16x16/emotes/face-plain.png
 share/icons/gnome/16x16/emotes/face-raspberry.png
 share/icons/gnome/16x16/emotes/face-sad.png
+share/icons/gnome/16x16/emotes/face-sick.png
 share/icons/gnome/16x16/emotes/face-smile-big.png
 share/icons/gnome/16x16/emotes/face-smile.png
 share/icons/gnome/16x16/emotes/face-smirk.png
 share/icons/gnome/16x16/emotes/face-surprise.png
+share/icons/gnome/16x16/emotes/face-tired.png
+share/icons/gnome/16x16/emotes/face-uncertain.png
 share/icons/gnome/16x16/emotes/face-wink.png
+share/icons/gnome/16x16/emotes/face-worried.png
 share/icons/gnome/16x16/emotes/stock_smiley-1.png
 share/icons/gnome/16x16/emotes/stock_smiley-10.png
 share/icons/gnome/16x16/emotes/stock_smiley-11.png
@@ -886,6 +889,8 @@ share/icons/gnome/16x16/status/info.png
 share/icons/gnome/16x16/status/mail-attachment.png
 share/icons/gnome/16x16/status/mail-read.png
 share/icons/gnome/16x16/status/mail-replied.png
+share/icons/gnome/16x16/status/mail-signed-verified.png
+share/icons/gnome/16x16/status/mail-signed.png
 share/icons/gnome/16x16/status/mail-unread.png
 share/icons/gnome/16x16/status/media-playlist-repeat.png
 share/icons/gnome/16x16/status/media-playlist-shuffle.png
@@ -1885,7 +1890,6 @@ share/icons/gnome/22x22/actions/gtk-undo-ltr.png
 share/icons/gnome/22x22/actions/gtk-unindent-ltr.png
 share/icons/gnome/22x22/actions/gtk-unindent-rtl.png
 share/icons/gnome/22x22/actions/gtk-zoom-100.png
-share/icons/gnome/22x22/actions/gtk-zoom-fit.png
 share/icons/gnome/22x22/actions/gtk-zoom-in.png
 share/icons/gnome/22x22/actions/gtk-zoom-out.png
 share/icons/gnome/22x22/actions/help-about.png
@@ -2023,7 +2027,6 @@ share/icons/gnome/22x22/actions/stock_up.png
 share/icons/gnome/22x22/actions/stock_zoom-1.png
 share/icons/gnome/22x22/actions/stock_zoom-in.png
 share/icons/gnome/22x22/actions/stock_zoom-out.png
-share/icons/gnome/22x22/actions/stock_zoom-page.png
 share/icons/gnome/22x22/actions/stop.png
 share/icons/gnome/22x22/actions/system-lock-screen.png
 share/icons/gnome/22x22/actions/system-log-out.png
@@ -2047,7 +2050,6 @@ share/icons/gnome/22x22/actions/view-sort-descending.png
 share/icons/gnome/22x22/actions/viewmag+.png
 share/icons/gnome/22x22/actions/viewmag-.png
 share/icons/gnome/22x22/actions/viewmag1.png
-share/icons/gnome/22x22/actions/viewmagfit.png
 share/icons/gnome/22x22/actions/window-close.png
 share/icons/gnome/22x22/actions/window-new.png
 share/icons/gnome/22x22/actions/window_fullscreen.png
@@ -2055,7 +2057,7 @@ share/icons/gnome/22x22/actions/window_new.png
 share/icons/gnome/22x22/actions/window_nofullscreen.png
 share/icons/gnome/22x22/actions/xfce-system-exit.png
 share/icons/gnome/22x22/actions/xfce-system-lock.png
-share/icons/gnome/22x22/actions/zoom-best-fit.png
+share/icons/gnome/22x22/actions/zoom-fit-best.png
 share/icons/gnome/22x22/actions/zoom-in.png
 share/icons/gnome/22x22/actions/zoom-original.png
 share/icons/gnome/22x22/actions/zoom-out.png
@@ -2342,20 +2344,26 @@ share/icons/gnome/22x22/emblems/emblem-urgent.png
 share/icons/gnome/22x22/emblems/emblem-web.png
 share/icons/gnome/22x22/emblems/stock_mail-priority-high.png
 share/icons/gnome/22x22/emotes/face-angel.png
+share/icons/gnome/22x22/emotes/face-angry.png
 share/icons/gnome/22x22/emotes/face-cool.png
 share/icons/gnome/22x22/emotes/face-crying.png
 share/icons/gnome/22x22/emotes/face-devilish.png
 share/icons/gnome/22x22/emotes/face-embarrassed.png
 share/icons/gnome/22x22/emotes/face-kiss.png
+share/icons/gnome/22x22/emotes/face-laugh.png
 share/icons/gnome/22x22/emotes/face-monkey.png
 share/icons/gnome/22x22/emotes/face-plain.png
 share/icons/gnome/22x22/emotes/face-raspberry.png
 share/icons/gnome/22x22/emotes/face-sad.png
+share/icons/gnome/22x22/emotes/face-sick.png
 share/icons/gnome/22x22/emotes/face-smile-big.png
 share/icons/gnome/22x22/emotes/face-smile.png
 share/icons/gnome/22x22/emotes/face-smirk.png
 share/icons/gnome/22x22/emotes/face-surprise.png
+share/icons/gnome/22x22/emotes/face-tired.png
+share/icons/gnome/22x22/emotes/face-uncertain.png
 share/icons/gnome/22x22/emotes/face-wink.png
+share/icons/gnome/22x22/emotes/face-worried.png
 share/icons/gnome/22x22/emotes/stock_smiley-1.png
 share/icons/gnome/22x22/emotes/stock_smiley-10.png
 share/icons/gnome/22x22/emotes/stock_smiley-11.png
@@ -2610,6 +2618,8 @@ share/icons/gnome/22x22/status/info.png
 share/icons/gnome/22x22/status/mail-attachment.png
 share/icons/gnome/22x22/status/mail-read.png
 share/icons/gnome/22x22/status/mail-replied.png
+share/icons/gnome/22x22/status/mail-signed-verified.png
+share/icons/gnome/22x22/status/mail-signed.png
 share/icons/gnome/22x22/status/mail-unread.png
 share/icons/gnome/22x22/status/media-playlist-repeat.png
 share/icons/gnome/22x22/status/media-playlist-shuffle.png
@@ -2843,7 +2853,6 @@ share/icons/gnome/24x24/actions/gtk-undo-ltr.png
 share/icons/gnome/24x24/actions/gtk-unindent-ltr.png
 share/icons/gnome/24x24/actions/gtk-unindent-rtl.png
 share/icons/gnome/24x24/actions/gtk-zoom-100.png
-share/icons/gnome/24x24/actions/gtk-zoom-fit.png
 share/icons/gnome/24x24/actions/gtk-zoom-in.png
 share/icons/gnome/24x24/actions/gtk-zoom-out.png
 share/icons/gnome/24x24/actions/help-about.png
@@ -2981,7 +2990,6 @@ share/icons/gnome/24x24/actions/stock_up.png
 share/icons/gnome/24x24/actions/stock_zoom-1.png
 share/icons/gnome/24x24/actions/stock_zoom-in.png
 share/icons/gnome/24x24/actions/stock_zoom-out.png
-share/icons/gnome/24x24/actions/stock_zoom-page.png
 share/icons/gnome/24x24/actions/stop.png
 share/icons/gnome/24x24/actions/system-lock-screen.png
 share/icons/gnome/24x24/actions/system-log-out.png
@@ -3005,7 +3013,6 @@ share/icons/gnome/24x24/actions/view-sort-descending.png
 share/icons/gnome/24x24/actions/viewmag+.png
 share/icons/gnome/24x24/actions/viewmag-.png
 share/icons/gnome/24x24/actions/viewmag1.png
-share/icons/gnome/24x24/actions/viewmagfit.png
 share/icons/gnome/24x24/actions/window-close.png
 share/icons/gnome/24x24/actions/window-new.png
 share/icons/gnome/24x24/actions/window_fullscreen.png
@@ -3013,7 +3020,7 @@ share/icons/gnome/24x24/actions/window_new.png
 share/icons/gnome/24x24/actions/window_nofullscreen.png
 share/icons/gnome/24x24/actions/xfce-system-exit.png
 share/icons/gnome/24x24/actions/xfce-system-lock.png
-share/icons/gnome/24x24/actions/zoom-best-fit.png
+share/icons/gnome/24x24/actions/zoom-fit-best.png
 share/icons/gnome/24x24/actions/zoom-in.png
 share/icons/gnome/24x24/actions/zoom-original.png
 share/icons/gnome/24x24/actions/zoom-out.png
@@ -3333,20 +3340,26 @@ share/icons/gnome/24x24/emblems/emblem-urgent.png
 share/icons/gnome/24x24/emblems/emblem-web.png
 share/icons/gnome/24x24/emblems/stock_mail-priority-high.png
 share/icons/gnome/24x24/emotes/face-angel.png
+share/icons/gnome/24x24/emotes/face-angry.png
 share/icons/gnome/24x24/emotes/face-cool.png
 share/icons/gnome/24x24/emotes/face-crying.png
 share/icons/gnome/24x24/emotes/face-devilish.png
 share/icons/gnome/24x24/emotes/face-embarrassed.png
 share/icons/gnome/24x24/emotes/face-kiss.png
+share/icons/gnome/24x24/emotes/face-laugh.png
 share/icons/gnome/24x24/emotes/face-monkey.png
 share/icons/gnome/24x24/emotes/face-plain.png
 share/icons/gnome/24x24/emotes/face-raspberry.png
 share/icons/gnome/24x24/emotes/face-sad.png
+share/icons/gnome/24x24/emotes/face-sick.png
 share/icons/gnome/24x24/emotes/face-smile-big.png
 share/icons/gnome/24x24/emotes/face-smile.png
 share/icons/gnome/24x24/emotes/face-smirk.png
 share/icons/gnome/24x24/emotes/face-surprise.png
+share/icons/gnome/24x24/emotes/face-tired.png
+share/icons/gnome/24x24/emotes/face-uncertain.png
 share/icons/gnome/24x24/emotes/face-wink.png
+share/icons/gnome/24x24/emotes/face-worried.png
 share/icons/gnome/24x24/emotes/stock_smiley-1.png
 share/icons/gnome/24x24/emotes/stock_smiley-10.png
 share/icons/gnome/24x24/emotes/stock_smiley-11.png
@@ -3607,6 +3620,8 @@ share/icons/gnome/24x24/status/info.png
 share/icons/gnome/24x24/status/mail-attachment.png
 share/icons/gnome/24x24/status/mail-read.png
 share/icons/gnome/24x24/status/mail-replied.png
+share/icons/gnome/24x24/status/mail-signed-verified.png
+share/icons/gnome/24x24/status/mail-signed.png
 share/icons/gnome/24x24/status/mail-unread.png
 share/icons/gnome/24x24/status/media-playlist-repeat.png
 share/icons/gnome/24x24/status/media-playlist-shuffle.png
@@ -4456,7 +4471,6 @@ share/icons/gnome/32x32/actions/gtk-undo-ltr.png
 share/icons/gnome/32x32/actions/gtk-unindent-ltr.png
 share/icons/gnome/32x32/actions/gtk-unindent-rtl.png
 share/icons/gnome/32x32/actions/gtk-zoom-100.png
-share/icons/gnome/32x32/actions/gtk-zoom-fit.png
 share/icons/gnome/32x32/actions/gtk-zoom-in.png
 share/icons/gnome/32x32/actions/gtk-zoom-out.png
 share/icons/gnome/32x32/actions/help-about.png
@@ -4589,7 +4603,6 @@ share/icons/gnome/32x32/actions/stock_up.png
 share/icons/gnome/32x32/actions/stock_zoom-1.png
 share/icons/gnome/32x32/actions/stock_zoom-in.png
 share/icons/gnome/32x32/actions/stock_zoom-out.png
-share/icons/gnome/32x32/actions/stock_zoom-page.png
 share/icons/gnome/32x32/actions/stop.png
 share/icons/gnome/32x32/actions/system-lock-screen.png
 share/icons/gnome/32x32/actions/system-log-out.png
@@ -4611,7 +4624,6 @@ share/icons/gnome/32x32/actions/view-sort-descending.png
 share/icons/gnome/32x32/actions/viewmag+.png
 share/icons/gnome/32x32/actions/viewmag-.png
 share/icons/gnome/32x32/actions/viewmag1.png
-share/icons/gnome/32x32/actions/viewmagfit.png
 share/icons/gnome/32x32/actions/window-close.png
 share/icons/gnome/32x32/actions/window-new.png
 share/icons/gnome/32x32/actions/window_fullscreen.png
@@ -4619,7 +4631,7 @@ share/icons/gnome/32x32/actions/window_new.png
 share/icons/gnome/32x32/actions/window_nofullscreen.png
 share/icons/gnome/32x32/actions/xfce-system-exit.png
 share/icons/gnome/32x32/actions/xfce-system-lock.png
-share/icons/gnome/32x32/actions/zoom-best-fit.png
+share/icons/gnome/32x32/actions/zoom-fit-best.png
 share/icons/gnome/32x32/actions/zoom-in.png
 share/icons/gnome/32x32/actions/zoom-original.png
 share/icons/gnome/32x32/actions/zoom-out.png
@@ -4896,20 +4908,26 @@ share/icons/gnome/32x32/emblems/emblem-urgent.png
 share/icons/gnome/32x32/emblems/emblem-web.png
 share/icons/gnome/32x32/emblems/stock_mail-priority-high.png
 share/icons/gnome/32x32/emotes/face-angel.png
+share/icons/gnome/32x32/emotes/face-angry.png
 share/icons/gnome/32x32/emotes/face-cool.png
 share/icons/gnome/32x32/emotes/face-crying.png
 share/icons/gnome/32x32/emotes/face-devilish.png
 share/icons/gnome/32x32/emotes/face-embarrassed.png
 share/icons/gnome/32x32/emotes/face-kiss.png
+share/icons/gnome/32x32/emotes/face-laugh.png
 share/icons/gnome/32x32/emotes/face-monkey.png
 share/icons/gnome/32x32/emotes/face-plain.png
 share/icons/gnome/32x32/emotes/face-raspberry.png
 share/icons/gnome/32x32/emotes/face-sad.png
+share/icons/gnome/32x32/emotes/face-sick.png
 share/icons/gnome/32x32/emotes/face-smile-big.png
 share/icons/gnome/32x32/emotes/face-smile.png
 share/icons/gnome/32x32/emotes/face-smirk.png
 share/icons/gnome/32x32/emotes/face-surprise.png
+share/icons/gnome/32x32/emotes/face-tired.png
+share/icons/gnome/32x32/emotes/face-uncertain.png
 share/icons/gnome/32x32/emotes/face-wink.png
+share/icons/gnome/32x32/emotes/face-worried.png
 share/icons/gnome/32x32/emotes/stock_smiley-1.png
 share/icons/gnome/32x32/emotes/stock_smiley-10.png
 share/icons/gnome/32x32/emotes/stock_smiley-11.png
@@ -5585,7 +5603,6 @@ share/icons/gnome/scalable/actions/gtk-undo-ltr.svg
 share/icons/gnome/scalable/actions/gtk-unindent-ltr.svg
 share/icons/gnome/scalable/actions/gtk-unindent-rtl.svg
 share/icons/gnome/scalable/actions/gtk-zoom-100.svg
-share/icons/gnome/scalable/actions/gtk-zoom-fit.svg
 share/icons/gnome/scalable/actions/gtk-zoom-in.svg
 share/icons/gnome/scalable/actions/gtk-zoom-out.svg
 share/icons/gnome/scalable/actions/help-about.svg
@@ -5718,7 +5735,6 @@ share/icons/gnome/scalable/actions/stock_up.svg
 share/icons/gnome/scalable/actions/stock_zoom-1.svg
 share/icons/gnome/scalable/actions/stock_zoom-in.svg
 share/icons/gnome/scalable/actions/stock_zoom-out.svg
-share/icons/gnome/scalable/actions/stock_zoom-page.svg
 share/icons/gnome/scalable/actions/stop.svg
 share/icons/gnome/scalable/actions/system-lock-screen.svg
 share/icons/gnome/scalable/actions/system-log-out.svg
@@ -5740,7 +5756,6 @@ share/icons/gnome/scalable/actions/view-sort-descending.svg
 share/icons/gnome/scalable/actions/viewmag+.svg
 share/icons/gnome/scalable/actions/viewmag-.svg
 share/icons/gnome/scalable/actions/viewmag1.svg
-share/icons/gnome/scalable/actions/viewmagfit.svg
 share/icons/gnome/scalable/actions/window-close.svg
 share/icons/gnome/scalable/actions/window-new.svg
 share/icons/gnome/scalable/actions/window_fullscreen.svg
@@ -5748,7 +5763,7 @@ share/icons/gnome/scalable/actions/window_new.svg
 share/icons/gnome/scalable/actions/window_nofullscreen.svg
 share/icons/gnome/scalable/actions/xfce-system-exit.svg
 share/icons/gnome/scalable/actions/xfce-system-lock.svg
-share/icons/gnome/scalable/actions/zoom-best-fit.svg
+share/icons/gnome/scalable/actions/zoom-fit-best.svg
 share/icons/gnome/scalable/actions/zoom-in.svg
 share/icons/gnome/scalable/actions/zoom-original.svg
 share/icons/gnome/scalable/actions/zoom-out.svg
@@ -6045,20 +6060,26 @@ share/icons/gnome/scalable/emblems/emblem-web.svg
 share/icons/gnome/scalable/emblems/stock_mail-priority-high.icon
 share/icons/gnome/scalable/emblems/stock_mail-priority-high.svg
 share/icons/gnome/scalable/emotes/face-angel.svg
+share/icons/gnome/scalable/emotes/face-angry.svg
 share/icons/gnome/scalable/emotes/face-cool.svg
 share/icons/gnome/scalable/emotes/face-crying.svg
 share/icons/gnome/scalable/emotes/face-devilish.svg
 share/icons/gnome/scalable/emotes/face-embarrassed.svg
 share/icons/gnome/scalable/emotes/face-kiss.svg
+share/icons/gnome/scalable/emotes/face-laugh.svg
 share/icons/gnome/scalable/emotes/face-monkey.svg
 share/icons/gnome/scalable/emotes/face-plain.svg
 share/icons/gnome/scalable/emotes/face-raspberry.svg
 share/icons/gnome/scalable/emotes/face-sad.svg
+share/icons/gnome/scalable/emotes/face-sick.svg
 share/icons/gnome/scalable/emotes/face-smile-big.svg
 share/icons/gnome/scalable/emotes/face-smile.svg
 share/icons/gnome/scalable/emotes/face-smirk.svg
 share/icons/gnome/scalable/emotes/face-surprise.svg
+share/icons/gnome/scalable/emotes/face-tired.svg
+share/icons/gnome/scalable/emotes/face-uncertain.svg
 share/icons/gnome/scalable/emotes/face-wink.svg
+share/icons/gnome/scalable/emotes/face-worried.svg
 share/icons/gnome/scalable/emotes/stock_smiley-1.svg
 share/icons/gnome/scalable/emotes/stock_smiley-10.svg
 share/icons/gnome/scalable/emotes/stock_smiley-11.svg
@@ -6420,6 +6441,8 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 6d4bce23777c..cafe1e61a773 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-user-docs/Makefile,v 1.40 2007/10/13 21:06:54 marcus Exp $
+#   $MCom: ports/misc/gnome-user-docs/Makefile,v 1.42 2008/03/10 17:39:04 ahze Exp $
 #
 
 PORTNAME=	gnome-user-docs
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 9a0f5ece6467..c7022e4e55c6 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = d6bba44acaed20117769ec8dce378f71
-SHA256 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = cec02e5e31bc7ab1fa892314368d6021e6c80ded8af3f727122aa355f86d18c9
-SIZE (gnome2/gnome-user-docs-2.20.1.tar.bz2) = 9827506
+MD5 (gnome2/gnome-user-docs-2.22.0.tar.bz2) = f3af808e754701b83105eab2f5ca690c
+SHA256 (gnome2/gnome-user-docs-2.22.0.tar.bz2) = 0328a0b750730788c1669b902fd93ad09313d62cdaa391131ce1bbec4a6c8fa7
+SIZE (gnome2/gnome-user-docs-2.22.0.tar.bz2) = 10876875
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index fbf3f44041f1..c94903d08db3 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -141,6 +141,33 @@ share/gnome/help/gnome-access-guide/es/figures/tabbed_section.png
 share/gnome/help/gnome-access-guide/es/figures/text_box.png
 share/gnome/help/gnome-access-guide/es/figures/tree.png
 share/gnome/help/gnome-access-guide/es/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/fi/figures/accessx.png
+share/gnome/help/gnome-access-guide/fi/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/fi/figures/button.png
+share/gnome/help/gnome-access-guide/fi/figures/check_box.png
+share/gnome/help/gnome-access-guide/fi/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/fi/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/fi/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/fi/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/fi/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/fi/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/fi/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/fi/figures/radio_button.png
+share/gnome/help/gnome-access-guide/fi/figures/slider.png
+share/gnome/help/gnome-access-guide/fi/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/fi/figures/spin_box.png
+share/gnome/help/gnome-access-guide/fi/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/fi/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/fi/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/fi/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/fi/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/fi/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/fi/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/fi/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/fi/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/fi/figures/text_box.png
+share/gnome/help/gnome-access-guide/fi/figures/tree.png
+share/gnome/help/gnome-access-guide/fi/gnome-access-guide.xml
 share/gnome/help/gnome-access-guide/fr/figures/accessx.png
 share/gnome/help/gnome-access-guide/fr/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/fr/figures/button.png
@@ -195,6 +222,33 @@ share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png
 share/gnome/help/gnome-access-guide/it/figures/text_box.png
 share/gnome/help/gnome-access-guide/it/figures/tree.png
 share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/oc/figures/accessx.png
+share/gnome/help/gnome-access-guide/oc/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/oc/figures/button.png
+share/gnome/help/gnome-access-guide/oc/figures/check_box.png
+share/gnome/help/gnome-access-guide/oc/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/oc/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/oc/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/oc/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/oc/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/oc/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/oc/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/oc/figures/radio_button.png
+share/gnome/help/gnome-access-guide/oc/figures/slider.png
+share/gnome/help/gnome-access-guide/oc/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/oc/figures/spin_box.png
+share/gnome/help/gnome-access-guide/oc/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/oc/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/oc/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/oc/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/oc/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/oc/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/oc/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/oc/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/oc/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/oc/figures/text_box.png
+share/gnome/help/gnome-access-guide/oc/figures/tree.png
+share/gnome/help/gnome-access-guide/oc/gnome-access-guide.xml
 share/gnome/help/gnome-access-guide/pt/figures/accessx.png
 share/gnome/help/gnome-access-guide/pt/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/pt/figures/button.png
@@ -264,9 +318,14 @@ share/gnome/help/system-admin-guide/C/screensavers.xml
 share/gnome/help/system-admin-guide/C/sessions.xml
 share/gnome/help/system-admin-guide/C/system-admin-guide.xml
 share/gnome/help/system-admin-guide/C/themes.xml
+share/gnome/help/system-admin-guide/ca/system-admin-guide.xml
+share/gnome/help/system-admin-guide/el/system-admin-guide.xml
 share/gnome/help/system-admin-guide/es/system-admin-guide.xml
+share/gnome/help/system-admin-guide/fi/system-admin-guide.xml
 share/gnome/help/system-admin-guide/fr/system-admin-guide.xml
 share/gnome/help/system-admin-guide/it/system-admin-guide.xml
+share/gnome/help/system-admin-guide/ko/system-admin-guide.xml
+share/gnome/help/system-admin-guide/oc/system-admin-guide.xml
 share/gnome/help/system-admin-guide/pa/system-admin-guide.xml
 share/gnome/help/system-admin-guide/pt/system-admin-guide.xml
 share/gnome/help/system-admin-guide/sv/system-admin-guide.xml
@@ -1118,6 +1177,83 @@ share/gnome/help/user-guide/ko/gospanel.xml
 share/gnome/help/user-guide/ko/gosstartsession.xml
 share/gnome/help/user-guide/ko/gostools.xml
 share/gnome/help/user-guide/ko/user-guide.xml
+share/gnome/help/user-guide/oc/figures/ask_pointer.png
+share/gnome/help/user-guide/oc/figures/busy_pointer.png
+share/gnome/help/user-guide/oc/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/oc/figures/copy_pointer.png
+share/gnome/help/user-guide/oc/figures/force_quit.png
+share/gnome/help/user-guide/oc/figures/four_hide_button.png
+share/gnome/help/user-guide/oc/figures/gedit_window.png
+share/gnome/help/user-guide/oc/figures/gnome_panel.png
+share/gnome/help/user-guide/oc/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/oc/figures/ibeam_pointer.png
+share/gnome/help/user-guide/oc/figures/link_pointer.png
+share/gnome/help/user-guide/oc/figures/lockscreen_icon.png
+share/gnome/help/user-guide/oc/figures/logout_icon.png
+share/gnome/help/user-guide/oc/figures/menu_bar_applet.png
+share/gnome/help/user-guide/oc/figures/menu_panel.png
+share/gnome/help/user-guide/oc/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/oc/figures/move_pointer.png
+share/gnome/help/user-guide/oc/figures/movewindow_pointer.png
+share/gnome/help/user-guide/oc/figures/naut_browser_mode.png
+share/gnome/help/user-guide/oc/figures/naut_button_bar.png
+share/gnome/help/user-guide/oc/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/oc/figures/naut_emblem.png
+share/gnome/help/user-guide/oc/figures/naut_go_to_location.png
+share/gnome/help/user-guide/oc/figures/naut_link_emblem.png
+share/gnome/help/user-guide/oc/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/oc/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/oc/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/oc/figures/naut_refine_search.png
+share/gnome/help/user-guide/oc/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/oc/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/oc/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/oc/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/oc/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/oc/figures/naut_search_bar.png
+share/gnome/help/user-guide/oc/figures/naut_search_results.png
+share/gnome/help/user-guide/oc/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/oc/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/oc/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/oc/figures/naut_spatial_view.png
+share/gnome/help/user-guide/oc/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/oc/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/oc/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/oc/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/oc/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/oc/figures/normal_pointer.png
+share/gnome/help/user-guide/oc/figures/not_available_pointer.png
+share/gnome/help/user-guide/oc/figures/notification_area_icon.png
+share/gnome/help/user-guide/oc/figures/open_drawer.png
+share/gnome/help/user-guide/oc/figures/openwindows_menu.png
+share/gnome/help/user-guide/oc/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/oc/figures/resize_pointer.png
+share/gnome/help/user-guide/oc/figures/run_button.png
+share/gnome/help/user-guide/oc/figures/sample_applet.png
+share/gnome/help/user-guide/oc/figures/screenshot_button.png
+share/gnome/help/user-guide/oc/figures/searchtool_button.png
+share/gnome/help/user-guide/oc/figures/show_desktop_button.png
+share/gnome/help/user-guide/oc/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/oc/figures/titlebar_window.png
+share/gnome/help/user-guide/oc/figures/typical_menu.png
+share/gnome/help/user-guide/oc/figures/window_list_applet.png
+share/gnome/help/user-guide/oc/figures/window_list_group_applet.png
+share/gnome/help/user-guide/oc/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/oc/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/oc/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/oc/figures/yelp_preferences.png
+share/gnome/help/user-guide/oc/figures/yelp_window.png
+share/gnome/help/user-guide/oc/glossary.xml
+share/gnome/help/user-guide/oc/gosbasic.xml
+share/gnome/help/user-guide/oc/goscustdesk.xml
+share/gnome/help/user-guide/oc/goseditmainmenu.xml
+share/gnome/help/user-guide/oc/gosfeedback.xml
+share/gnome/help/user-guide/oc/gosnautilus.xml
+share/gnome/help/user-guide/oc/gosoverview.xml
+share/gnome/help/user-guide/oc/gospanel.xml
+share/gnome/help/user-guide/oc/gosstartsession.xml
+share/gnome/help/user-guide/oc/gostools.xml
+share/gnome/help/user-guide/oc/user-guide.xml
 share/gnome/help/user-guide/pa/figures/ask_pointer.png
 share/gnome/help/user-guide/pa/figures/busy_pointer.png
 share/gnome/help/user-guide/pa/figures/com_file_manager_menu.png
@@ -1585,14 +1721,21 @@ share/omf/gnome-access-guide/gnome-access-guide-de.omf
 share/omf/gnome-access-guide/gnome-access-guide-el.omf
 share/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
 share/omf/gnome-access-guide/gnome-access-guide-es.omf
+share/omf/gnome-access-guide/gnome-access-guide-fi.omf
 share/omf/gnome-access-guide/gnome-access-guide-fr.omf
 share/omf/gnome-access-guide/gnome-access-guide-it.omf
+share/omf/gnome-access-guide/gnome-access-guide-oc.omf
 share/omf/gnome-access-guide/gnome-access-guide-pt.omf
 share/omf/gnome-access-guide/gnome-access-guide-sv.omf
 share/omf/system-admin-guide/system-admin-guide-C.omf
+share/omf/system-admin-guide/system-admin-guide-ca.omf
+share/omf/system-admin-guide/system-admin-guide-el.omf
 share/omf/system-admin-guide/system-admin-guide-es.omf
+share/omf/system-admin-guide/system-admin-guide-fi.omf
 share/omf/system-admin-guide/system-admin-guide-fr.omf
 share/omf/system-admin-guide/system-admin-guide-it.omf
+share/omf/system-admin-guide/system-admin-guide-ko.omf
+share/omf/system-admin-guide/system-admin-guide-oc.omf
 share/omf/system-admin-guide/system-admin-guide-pa.omf
 share/omf/system-admin-guide/system-admin-guide-pt.omf
 share/omf/system-admin-guide/system-admin-guide-sv.omf
@@ -1607,6 +1750,7 @@ share/omf/user-guide/user-guide-fr.omf
 share/omf/user-guide/user-guide-hu.omf
 share/omf/user-guide/user-guide-it.omf
 share/omf/user-guide/user-guide-ko.omf
+share/omf/user-guide/user-guide-oc.omf
 share/omf/user-guide/user-guide-pa.omf
 share/omf/user-guide/user-guide-pt.omf
 share/omf/user-guide/user-guide-pt_BR.omf
@@ -1628,6 +1772,8 @@ share/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/user-guide/pt
 @dirrm share/gnome/help/user-guide/pa/figures
 @dirrm share/gnome/help/user-guide/pa
+@dirrm share/gnome/help/user-guide/oc/figures
+@dirrm share/gnome/help/user-guide/oc
 @dirrm share/gnome/help/user-guide/ko/figures
 @dirrm share/gnome/help/user-guide/ko
 @dirrm share/gnome/help/user-guide/it/figures
@@ -1654,19 +1800,28 @@ share/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/system-admin-guide/sv
 @dirrm share/gnome/help/system-admin-guide/pt
 @dirrm share/gnome/help/system-admin-guide/pa
+@dirrm share/gnome/help/system-admin-guide/oc
+@dirrm share/gnome/help/system-admin-guide/ko
 @dirrm share/gnome/help/system-admin-guide/it
 @dirrm share/gnome/help/system-admin-guide/fr
+@dirrm share/gnome/help/system-admin-guide/fi
 @dirrm share/gnome/help/system-admin-guide/es
+@dirrm share/gnome/help/system-admin-guide/el
+@dirrm share/gnome/help/system-admin-guide/ca
 @dirrm share/gnome/help/system-admin-guide/C
 @dirrm share/gnome/help/system-admin-guide
 @dirrm share/gnome/help/gnome-access-guide/sv/figures
 @dirrm share/gnome/help/gnome-access-guide/sv
 @dirrm share/gnome/help/gnome-access-guide/pt/figures
 @dirrm share/gnome/help/gnome-access-guide/pt
+@dirrm share/gnome/help/gnome-access-guide/oc/figures
+@dirrm share/gnome/help/gnome-access-guide/oc
 @dirrm share/gnome/help/gnome-access-guide/it/figures
 @dirrm share/gnome/help/gnome-access-guide/it
 @dirrm share/gnome/help/gnome-access-guide/fr/figures
 @dirrm share/gnome/help/gnome-access-guide/fr
+@dirrm share/gnome/help/gnome-access-guide/fi/figures
+@dirrm share/gnome/help/gnome-access-guide/fi
 @dirrm share/gnome/help/gnome-access-guide/es/figures
 @dirrm share/gnome/help/gnome-access-guide/es
 @dirrm share/gnome/help/gnome-access-guide/en_GB/figures
diff --git a/misc/pciids/Makefile b/misc/pciids/Makefile
index f792eb9a1d98..6c6e55027e21 100644
--- a/misc/pciids/Makefile
+++ b/misc/pciids/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/misc/pciids/Makefile,v 1.8 2006/10/26 16:14:10 ahze Exp $
+#    $MCom: ports/misc/pciids/Makefile,v 1.11 2008/03/23 06:57:57 marcus Exp $
 
 PORTNAME=	pciids
-PORTVERSION=	20080109
+PORTVERSION=	20080312
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
diff --git a/misc/pciids/distinfo b/misc/pciids/distinfo
index 406ed754fef8..d142c5f69189 100644
--- a/misc/pciids/distinfo
+++ b/misc/pciids/distinfo
@@ -1,3 +1,3 @@
-MD5 (pciids-20080109.tar.bz2) = a5ac7d673913770a21b0cb9383cbfe56
-SHA256 (pciids-20080109.tar.bz2) = 22b939f1cde29c38e720221723df1c33faf173d054b4f19cd65cec79715d0d37
-SIZE (pciids-20080109.tar.bz2) = 257226
+MD5 (pciids-20080312.tar.bz2) = 404a4bde5b22a06d34b3bf3c4ffab560
+SHA256 (pciids-20080312.tar.bz2) = 9d50cdd2564802f7b7a414c954055af029101d1672d88e06bfe1f13c4e2e966e
+SIZE (pciids-20080312.tar.bz2) = 263363
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 3d16a6dff9bb..4ed1919bb039 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -3,11 +3,12 @@
 # Whom:                olgeni@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.11 2007/08/09 19:33:41 marcus Exp $
+#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.13 2008/02/01 04:17:52 mezz Exp $
 #
 
 PORTNAME=	shared-mime-info
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
@@ -29,7 +30,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 MIMEDIRS=	${LOCALBASE}/share/mime \
 		${PREFIX}/share/mime
 MIMESUBDIRS=	application audio image inode message model multipart \
-		packages text video
+		packages text video x-epoc x-content
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%MIMEDIRS%%|${MIMEDIRS}|g' \
@@ -41,5 +42,6 @@ post-install:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%MIMEDIRS%%|${MIMEDIRS}|' \
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	@${MKDIR} ${PREFIX}/share/mime/x-content
 
 .include <bsd.port.mk>
diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c
index 045f753d2035..5706a2b89fe3 100644
--- a/misc/shared-mime-info/files/patch-update-mime-database.c
+++ b/misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,6 +1,14 @@
---- update-mime-database.c.orig	2007-06-27 15:46:53.000000000 -0400
-+++ update-mime-database.c	2007-08-09 15:32:31.000000000 -0400
-@@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo
+--- update-mime-database.c.orig	2007-07-02 04:00:13.000000000 -0500
++++ update-mime-database.c	2008-01-28 23:42:30.000000000 -0600
+@@ -54,6 +54,7 @@
+ 	"model",
+ 	"multipart",
+ 	"x-epoc",
++	"x-content",
+ };
+ 
+ /* Represents a MIME type */
+@@ -445,7 +446,8 @@
  		}
  	}
  
@@ -10,7 +18,7 @@
  }
  
  /* 'node' is a <mime-type> node from a source file, whose type is 'type'.
-@@ -1510,7 +1511,7 @@ static void check_in_path_xdg_data(const
+@@ -1510,7 +1512,7 @@
  
  	env = getenv("XDG_DATA_DIRS");
  	if (!env)
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 44edec6954b0..8955e3e34c17 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -562,6 +562,8 @@ share/mime/video/x-ogm+ogg.xml
 share/mime/video/x-sgi-movie.xml
 share/mime/video/x-theora+ogg.xml
 share/mime/x-epoc/x-sisx-app.xml
+@exec /bin/mkdir -p %D/share/mime/x-content
+@dirrmtry share/mime/x-content
 @dirrmtry share/mime/x-epoc
 @dirrmtry share/mime/video
 @dirrmtry share/mime/text