update to 2.20.1

This switches to the new gnome-2.20 branch.

3 files changed, 92 insertions, 83 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 97d714dd74b..0daf591fc94 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:27 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/11/03 17:30:57 drochner Exp $
 #
 
-DISTNAME=	epiphany-extensions-2.18.3
-PKGREVISION=	2
+DISTNAME=	epiphany-extensions-2.20.1
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -16,6 +15,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
+USE_DIRS+=		gnome2-1.5
 
 # Avoid -Werror, which breaks the build sometimes.
 CONFIGURE_ARGS+=	--enable-compile-warnings=no
diff --git a/www/epiphany-extensions/PLIST b/www/epiphany-extensions/PLIST
index 8ebe3f6938c..c5bb0ba7ccc 100644
--- a/www/epiphany-extensions/PLIST
+++ b/www/epiphany-extensions/PLIST
@@ -1,36 +1,36 @@
-@comment $NetBSD: PLIST,v 1.14 2007/09/25 10:54:20 hira Exp $
-lib/epiphany/2.18/extensions/actions.ephy-extension
-lib/epiphany/2.18/extensions/adblock.ephy-extension
-lib/epiphany/2.18/extensions/auto-reload.ephy-extension
-lib/epiphany/2.18/extensions/auto-scroller.ephy-extension
-lib/epiphany/2.18/extensions/certificates.ephy-extension
-lib/epiphany/2.18/extensions/error-viewer.ephy-extension
-lib/epiphany/2.18/extensions/extensions-manager-ui.ephy-extension
-lib/epiphany/2.18/extensions/gestures.ephy-extension
-lib/epiphany/2.18/extensions/java-console.ephy-extension
-lib/epiphany/2.18/extensions/libactionsextension.la
-lib/epiphany/2.18/extensions/libadblockextension.la
-lib/epiphany/2.18/extensions/libautoreloadextension.la
-lib/epiphany/2.18/extensions/libautoscrollerextension.la
-lib/epiphany/2.18/extensions/libcertificatesextension.la
-lib/epiphany/2.18/extensions/liberrorviewerextension.la
-lib/epiphany/2.18/extensions/libextensionsmanageruiextension.la
-lib/epiphany/2.18/extensions/libgesturesextension.la
-lib/epiphany/2.18/extensions/libjavaconsoleextension.la
-lib/epiphany/2.18/extensions/libpageinfoextension.la
-lib/epiphany/2.18/extensions/libpushscrollerextension.la
-lib/epiphany/2.18/extensions/libselectstylesheetextension.la
-lib/epiphany/2.18/extensions/libsidebarextension.la
-lib/epiphany/2.18/extensions/libsmartbookmarksextension.la
-lib/epiphany/2.18/extensions/libtabgroupsextension.la
-lib/epiphany/2.18/extensions/libtabstatesextension.la
-lib/epiphany/2.18/extensions/page-info.ephy-extension
-lib/epiphany/2.18/extensions/push-scroller.ephy-extension
-lib/epiphany/2.18/extensions/select-stylesheet.ephy-extension
-lib/epiphany/2.18/extensions/sidebar.ephy-extension
-lib/epiphany/2.18/extensions/smart-bookmarks.ephy-extension
-lib/epiphany/2.18/extensions/tab-groups.ephy-extension
-lib/epiphany/2.18/extensions/tab-states.ephy-extension
+@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
 share/epiphany-extensions/adblock-patterns
 share/epiphany-extensions/adblock-statusbar-icon.svg
 share/epiphany-extensions/ephy-gestures.xml
@@ -42,6 +42,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/feed-presence.png
+share/epiphany/icons/hicolor/22x22/status/feed-presence.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
 share/gconf/schemas/smart-bookmarks.schemas
 share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
 share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
@@ -84,57 +89,61 @@ 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.18.mo
-share/locale/bg/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/ca/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/cs/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/da/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/de/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/el/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/en_CA/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/en_GB/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/es/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/fi/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/fr/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/gl/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/hr/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/hu/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/it/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/ja/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/ko/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/lt/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/nb/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/ne/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/nl/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/pa/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/pl/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/pt/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/ru/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/rw/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/sk/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/sq/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/sr/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/sv/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/th/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/tr/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/uk/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/vi/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/wa/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-2.18.mo
-share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-2.18.mo
+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/omf/epiphany-extensions/epiphany-extensions-C.omf
 share/omf/epiphany-extensions/epiphany-extensions-sv.omf
 @dirrm share/omf/epiphany-extensions
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/epiphany-extensions/sv/figures
 @dirrm share/gnome/help/epiphany-extensions/sv
 @dirrm share/gnome/help/epiphany-extensions/C/figures
 @dirrm share/gnome/help/epiphany-extensions/C
 @dirrm share/gnome/help/epiphany-extensions
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/epiphany-extensions/xml
 @dirrm share/epiphany-extensions/glade
 @dirrm share/epiphany-extensions
-@dirrm lib/epiphany/2.18/extensions
+@dirrm lib/epiphany/2.20/extensions
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 53ef24dc77f..9a4abd0e031 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2007/07/13 17:32:12 drochner Exp $
+$NetBSD: distinfo,v 1.21 2007/11/03 17:30:57 drochner Exp $
 
-SHA1 (epiphany-extensions-2.18.3.tar.bz2) = 6d6ce16aea20980a9b2f49388e66d2dfa159c221
-RMD160 (epiphany-extensions-2.18.3.tar.bz2) = 7f6a71b1a084401c0c0ddb79da05b85ba99a0726
-Size (epiphany-extensions-2.18.3.tar.bz2) = 893264 bytes
+SHA1 (epiphany-extensions-2.20.1.tar.bz2) = c53d454a5dd78c85746aff4e75edc1ae87b1d597
+RMD160 (epiphany-extensions-2.20.1.tar.bz2) = 643e3d70c845157ed795350bfd8086c6a2ee9312
+Size (epiphany-extensions-2.20.1.tar.bz2) = 908577 bytes