update to 2.22.0

This switches to the gnome-2.22 release branch.

3 files changed, 165 insertions, 10 deletions

diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index ecca08f119d..2c0bfd9ad66 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2007/11/05 19:50:03 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2008/04/15 18:50:17 drochner Exp $
 #
 
-DISTNAME=	gnome-user-docs-2.20.1
+DISTNAME=	gnome-user-docs-2.22.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-user-docs/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-user-docs/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,5 +19,5 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-user-docs/PLIST b/misc/gnome-user-docs/PLIST
index cd31aa02743..a102c882659 100644
--- a/misc/gnome-user-docs/PLIST
+++ b/misc/gnome-user-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/11/05 19:50:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/15 18:50:17 drochner Exp $
 share/gnome/help/gnome-access-guide/C/accessintro.xml
 share/gnome/help/gnome-access-guide/C/enable.xml
 share/gnome/help/gnome-access-guide/C/figures/accessx.png
@@ -142,6 +142,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
@@ -196,6 +223,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
@@ -265,9 +319,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
@@ -1119,6 +1178,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
@@ -1586,14 +1722,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
@@ -1608,6 +1751,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
@@ -1617,7 +1761,7 @@ share/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/omf/user-guide
 @dirrm share/omf/system-admin-guide
 @dirrm share/omf/gnome-access-guide
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @dirrm share/gnome/help/user-guide/zh_CN/figures
 @dirrm share/gnome/help/user-guide/zh_CN
 @dirrm share/gnome/help/user-guide/sv/figures
@@ -1630,6 +1774,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
@@ -1656,19 +1802,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/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 333d132d3d0..f1c18b8e197 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2007/11/05 19:50:03 drochner Exp $
+$NetBSD: distinfo,v 1.8 2008/04/15 18:50:17 drochner Exp $
 
-SHA1 (gnome-user-docs-2.20.1.tar.bz2) = 4c22c4e1076be68cc0686cc750889d06c0711e9c
-RMD160 (gnome-user-docs-2.20.1.tar.bz2) = 96077dedf849c651b8a44c27c65246a08bef3ab4
-Size (gnome-user-docs-2.20.1.tar.bz2) = 9827506 bytes
+SHA1 (gnome-user-docs-2.22.0.tar.bz2) = b6eef0b7dcf3e61743e438df8493e5c5511ea465
+RMD160 (gnome-user-docs-2.22.0.tar.bz2) = 36786da23719fec56613c3232021b4fdf16d3440
+Size (gnome-user-docs-2.22.0.tar.bz2) = 10876875 bytes