3 files changed, 58 insertions, 10 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 4aca8285d20a..f4147b6f87aa 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.101 2007/10/15 22:00:17 mezz Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.105 2008/03/11 17:19:08 mezz Exp $
 #
 
 PORTNAME=	epiphany-extensions
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 CATEGORIES=	www 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
@@ -35,9 +34,9 @@ CONFIGURE_ARGS=	--with-mozilla=${GECKO}
 GCONF_SCHEMAS=	smart-bookmarks.schemas
 
 EPHY_EXTENSIONS=all,rss
-EPHY_VERSION=	2.20
+EPHY_VERSION=	2.22
 
-PLIST_SUB=	VERSION="2.20" EPHY_VERSION=${EPHY_VERSION}
+PLIST_SUB=	VERSION="2.22" EPHY_VERSION=${EPHY_VERSION}
 
 OPTIONS=	OPENSP "Enable OpenSP SGML support" off
 
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 993d27d10568..3bbce21aae97 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 86563cb1e7cda31d45f220ae2e185fef
-SHA256 (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 3b19652c6717d9f1dbfc2b855e9777e58623247765accbe8cfc7b86cb840aea2
-SIZE (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 909040
+MD5 (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 05b131995c532f2689150c731b2f37c1
+SHA256 (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 8d9b57aa22bbb318650dcb6dd73bec1951e9cb5ae64f37d84e39749fdbdd0754
+SIZE (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 926352
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index f107dc0306ba..b1021240d76f 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -62,7 +62,6 @@ lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
 lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
 %%DATADIR%%/adblock-patterns
-%%DATADIR%%/adblock-statusbar-icon.svg
 %%DATADIR%%/ephy-gestures.xml
 %%DATADIR%%/glade/action-properties.glade
 %%DATADIR%%/glade/actions-editor.glade
@@ -73,8 +72,11 @@ lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
 %%DATADIR%%/glade/rss-ui.glade
 %%DATADIR%%/xml/epiphany-sidebar-ui.xml
 %%DATADIR%%/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
@@ -99,6 +101,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
@@ -133,6 +175,7 @@ share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/he/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -163,10 +206,16 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.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
 @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