update to 2.22.1

This switches to the gnome-2.22 release branch.

3 files changed, 135 insertions, 87 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 8beda39caaf..5b4a1893be5 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2008/04/15 18:17:32 drochner Exp $
 #
 
-DISTNAME=	epiphany-extensions-2.20.3
-PKGREVISION=	1
+DISTNAME=	epiphany-extensions-2.22.1
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/epiphany-extensions/PLIST b/www/epiphany-extensions/PLIST
index c5bb0ba7ccc..47f658bd5cc 100644
--- a/www/epiphany-extensions/PLIST
+++ b/www/epiphany-extensions/PLIST
@@ -1,38 +1,37 @@
-@comment $NetBSD: PLIST,v 1.15 2007/11/03 17:30:57 drochner Exp $
-lib/epiphany/2.20/extensions/actions.ephy-extension
-lib/epiphany/2.20/extensions/adblock.ephy-extension
-lib/epiphany/2.20/extensions/auto-reload.ephy-extension
-lib/epiphany/2.20/extensions/auto-scroller.ephy-extension
-lib/epiphany/2.20/extensions/certificates.ephy-extension
-lib/epiphany/2.20/extensions/error-viewer.ephy-extension
-lib/epiphany/2.20/extensions/extensions-manager-ui.ephy-extension
-lib/epiphany/2.20/extensions/gestures.ephy-extension
-lib/epiphany/2.20/extensions/java-console.ephy-extension
-lib/epiphany/2.20/extensions/libactionsextension.la
-lib/epiphany/2.20/extensions/libadblockextension.la
-lib/epiphany/2.20/extensions/libautoreloadextension.la
-lib/epiphany/2.20/extensions/libautoscrollerextension.la
-lib/epiphany/2.20/extensions/libcertificatesextension.la
-lib/epiphany/2.20/extensions/liberrorviewerextension.la
-lib/epiphany/2.20/extensions/libextensionsmanageruiextension.la
-lib/epiphany/2.20/extensions/libgesturesextension.la
-lib/epiphany/2.20/extensions/libjavaconsoleextension.la
-lib/epiphany/2.20/extensions/libpageinfoextension.la
-lib/epiphany/2.20/extensions/libpushscrollerextension.la
-lib/epiphany/2.20/extensions/libselectstylesheetextension.la
-lib/epiphany/2.20/extensions/libsidebarextension.la
-lib/epiphany/2.20/extensions/libsmartbookmarksextension.la
-lib/epiphany/2.20/extensions/libtabgroupsextension.la
-lib/epiphany/2.20/extensions/libtabstatesextension.la
-lib/epiphany/2.20/extensions/page-info.ephy-extension
-lib/epiphany/2.20/extensions/push-scroller.ephy-extension
-lib/epiphany/2.20/extensions/select-stylesheet.ephy-extension
-lib/epiphany/2.20/extensions/sidebar.ephy-extension
-lib/epiphany/2.20/extensions/smart-bookmarks.ephy-extension
-lib/epiphany/2.20/extensions/tab-groups.ephy-extension
-lib/epiphany/2.20/extensions/tab-states.ephy-extension
+@comment $NetBSD: PLIST,v 1.16 2008/04/15 18:17:32 drochner Exp $
+lib/epiphany/2.22/extensions/actions.ephy-extension
+lib/epiphany/2.22/extensions/adblock.ephy-extension
+lib/epiphany/2.22/extensions/auto-reload.ephy-extension
+lib/epiphany/2.22/extensions/auto-scroller.ephy-extension
+lib/epiphany/2.22/extensions/certificates.ephy-extension
+lib/epiphany/2.22/extensions/error-viewer.ephy-extension
+lib/epiphany/2.22/extensions/extensions-manager-ui.ephy-extension
+lib/epiphany/2.22/extensions/gestures.ephy-extension
+lib/epiphany/2.22/extensions/java-console.ephy-extension
+lib/epiphany/2.22/extensions/libactionsextension.la
+lib/epiphany/2.22/extensions/libadblockextension.la
+lib/epiphany/2.22/extensions/libautoreloadextension.la
+lib/epiphany/2.22/extensions/libautoscrollerextension.la
+lib/epiphany/2.22/extensions/libcertificatesextension.la
+lib/epiphany/2.22/extensions/liberrorviewerextension.la
+lib/epiphany/2.22/extensions/libextensionsmanageruiextension.la
+lib/epiphany/2.22/extensions/libgesturesextension.la
+lib/epiphany/2.22/extensions/libjavaconsoleextension.la
+lib/epiphany/2.22/extensions/libpageinfoextension.la
+lib/epiphany/2.22/extensions/libpushscrollerextension.la
+lib/epiphany/2.22/extensions/libselectstylesheetextension.la
+lib/epiphany/2.22/extensions/libsidebarextension.la
+lib/epiphany/2.22/extensions/libsmartbookmarksextension.la
+lib/epiphany/2.22/extensions/libtabgroupsextension.la
+lib/epiphany/2.22/extensions/libtabstatesextension.la
+lib/epiphany/2.22/extensions/page-info.ephy-extension
+lib/epiphany/2.22/extensions/push-scroller.ephy-extension
+lib/epiphany/2.22/extensions/select-stylesheet.ephy-extension
+lib/epiphany/2.22/extensions/sidebar.ephy-extension
+lib/epiphany/2.22/extensions/smart-bookmarks.ephy-extension
+lib/epiphany/2.22/extensions/tab-groups.ephy-extension
+lib/epiphany/2.22/extensions/tab-states.ephy-extension
 share/epiphany-extensions/adblock-patterns
-share/epiphany-extensions/adblock-statusbar-icon.svg
 share/epiphany-extensions/ephy-gestures.xml
 share/epiphany-extensions/glade/action-properties.glade
 share/epiphany-extensions/glade/actions-editor.glade
@@ -42,8 +41,11 @@ share/epiphany-extensions/glade/extensions-manager-ui.glade
 share/epiphany-extensions/glade/page-info.glade
 share/epiphany-extensions/xml/epiphany-sidebar-ui.xml
 share/epiphany-extensions/xml/page-info-context-ui.xml
+share/epiphany/icons/hicolor/16x16/status/ad-blocked.png
 share/epiphany/icons/hicolor/16x16/status/feed-presence.png
+share/epiphany/icons/hicolor/22x22/status/ad-blocked.png
 share/epiphany/icons/hicolor/22x22/status/feed-presence.png
+share/epiphany/icons/hicolor/24x24/status/ad-blocked.png
 share/epiphany/icons/hicolor/24x24/status/feed-presence.png
 share/epiphany/icons/hicolor/32x32/status/feed-presence.png
 share/epiphany/icons/hicolor/scalable/status/feed-presence.svg
@@ -69,6 +71,46 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
 share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
 share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
 share/gnome/help/epiphany-extensions/C/legal.xml
+share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png
+share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png
 share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png
@@ -89,55 +131,62 @@ share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.p
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
 share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
-share/locale/ar/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/bg/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/ca/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/cs/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/da/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/de/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/dz/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/el/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/en_CA/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/en_GB/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/es/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/fi/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/fr/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/gl/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/hr/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/hu/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/it/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/ja/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/ko/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/lt/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/nb/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/ne/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/nl/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/oc/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/pa/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/pl/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/pt/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/ru/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/rw/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/sk/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/sq/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/sr/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/sv/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/th/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/tr/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/uk/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/vi/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/wa/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-2.20.mo
-share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-2.20.mo
+share/locale/ar/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/bg/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/ca/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/cs/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/da/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/de/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/dz/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/el/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/en_CA/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/en_GB/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/es/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/fi/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/fr/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/gl/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/he/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/hr/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/hu/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/it/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/ja/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/ko/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/lt/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/nb/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/ne/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/nl/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/oc/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/pa/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/pl/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/pt/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/ru/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/rw/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/sk/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/sq/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/sr/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/sv/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/th/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/tr/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/uk/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/vi/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/wa/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-2.22.mo
+share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-2.22.mo
 share/omf/epiphany-extensions/epiphany-extensions-C.omf
+share/omf/epiphany-extensions/epiphany-extensions-es.omf
+share/omf/epiphany-extensions/epiphany-extensions-oc.omf
 share/omf/epiphany-extensions/epiphany-extensions-sv.omf
 @dirrm share/omf/epiphany-extensions
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @dirrm share/gnome/help/epiphany-extensions/sv/figures
 @dirrm share/gnome/help/epiphany-extensions/sv
+@dirrm share/gnome/help/epiphany-extensions/oc/figures
+@dirrm share/gnome/help/epiphany-extensions/oc
+@dirrm share/gnome/help/epiphany-extensions/es/figures
+@dirrm share/gnome/help/epiphany-extensions/es
 @dirrm share/gnome/help/epiphany-extensions/C/figures
 @dirrm share/gnome/help/epiphany-extensions/C
 @dirrm share/gnome/help/epiphany-extensions
@@ -146,4 +195,4 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf
 @dirrm share/epiphany-extensions/xml
 @dirrm share/epiphany-extensions/glade
 @dirrm share/epiphany-extensions
-@dirrm lib/epiphany/2.20/extensions
+@dirrm lib/epiphany/2.22/extensions
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index e4cb26e7a01..dc8abc6dea7 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22 2008/01/11 13:45:46 drochner Exp $
+$NetBSD: distinfo,v 1.23 2008/04/15 18:17:32 drochner Exp $
 
-SHA1 (epiphany-extensions-2.20.3.tar.bz2) = 201232b2d94576478dddc94daa49d19bc1487305
-RMD160 (epiphany-extensions-2.20.3.tar.bz2) = f3fac0a4cc17b3120f0414f0467ff36c24e77dd2
-Size (epiphany-extensions-2.20.3.tar.bz2) = 909040 bytes
+SHA1 (epiphany-extensions-2.22.1.tar.bz2) = 1cbef595dafeb65ce26763ec2a2b99937a82c3fb
+RMD160 (epiphany-extensions-2.22.1.tar.bz2) = 85696465a63c8394f0688fa66dab90e397cf1836
+Size (epiphany-extensions-2.22.1.tar.bz2) = 941966 bytes