update to 2.20.1

This switches to the new gnome-2.20 branch.

6 files changed, 192 insertions, 166 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
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 4269b59bce5..a283ff29d78 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.76 2007/09/21 13:04:26 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2007/11/03 17:30:57 drochner Exp $
 #
 
-DISTNAME=	epiphany-2.18.3
-PKGREVISION=	2
+DISTNAME=	epiphany-2.20.1
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 5e97c224835..20640458adc 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,41 +1,41 @@
-@comment $NetBSD: PLIST,v 1.25 2007/09/25 10:54:20 hira Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/11/03 17:30:57 drochner Exp $
 bin/epiphany
-include/epiphany/2.18/epiphany/ephy-adblock-manager.h
-include/epiphany/2.18/epiphany/ephy-adblock.h
-include/epiphany/2.18/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/2.18/epiphany/ephy-bookmarks.h
-include/epiphany/2.18/epiphany/ephy-command-manager.h
-include/epiphany/2.18/epiphany/ephy-cookie-manager.h
-include/epiphany/2.18/epiphany/ephy-dbus.h
-include/epiphany/2.18/epiphany/ephy-dialog.h
-include/epiphany/2.18/epiphany/ephy-embed-event.h
-include/epiphany/2.18/epiphany/ephy-embed-factory.h
-include/epiphany/2.18/epiphany/ephy-embed-persist.h
-include/epiphany/2.18/epiphany/ephy-embed-prefs.h
-include/epiphany/2.18/epiphany/ephy-embed-shell.h
-include/epiphany/2.18/epiphany/ephy-embed-single.h
-include/epiphany/2.18/epiphany/ephy-embed-type-builtins.h
-include/epiphany/2.18/epiphany/ephy-embed.h
-include/epiphany/2.18/epiphany/ephy-extension.h
-include/epiphany/2.18/epiphany/ephy-extensions-manager.h
-include/epiphany/2.18/epiphany/ephy-history.h
-include/epiphany/2.18/epiphany/ephy-lib-type-builtins.h
-include/epiphany/2.18/epiphany/ephy-link.h
-include/epiphany/2.18/epiphany/ephy-loader.h
-include/epiphany/2.18/epiphany/ephy-node-db.h
-include/epiphany/2.18/epiphany/ephy-node.h
-include/epiphany/2.18/epiphany/ephy-notebook.h
-include/epiphany/2.18/epiphany/ephy-password-manager.h
-include/epiphany/2.18/epiphany/ephy-permission-manager.h
-include/epiphany/2.18/epiphany/ephy-session.h
-include/epiphany/2.18/epiphany/ephy-shell.h
-include/epiphany/2.18/epiphany/ephy-state.h
-include/epiphany/2.18/epiphany/ephy-statusbar.h
-include/epiphany/2.18/epiphany/ephy-tab.h
-include/epiphany/2.18/epiphany/ephy-type-builtins.h
-include/epiphany/2.18/epiphany/ephy-window.h
-lib/epiphany/2.18/plugins/libdesktopfileplugin.la
-lib/pkgconfig/epiphany-2.18.pc
+include/epiphany/2.20/epiphany/ephy-adblock-manager.h
+include/epiphany/2.20/epiphany/ephy-adblock.h
+include/epiphany/2.20/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/2.20/epiphany/ephy-bookmarks.h
+include/epiphany/2.20/epiphany/ephy-command-manager.h
+include/epiphany/2.20/epiphany/ephy-cookie-manager.h
+include/epiphany/2.20/epiphany/ephy-dbus.h
+include/epiphany/2.20/epiphany/ephy-dialog.h
+include/epiphany/2.20/epiphany/ephy-embed-event.h
+include/epiphany/2.20/epiphany/ephy-embed-factory.h
+include/epiphany/2.20/epiphany/ephy-embed-persist.h
+include/epiphany/2.20/epiphany/ephy-embed-prefs.h
+include/epiphany/2.20/epiphany/ephy-embed-shell.h
+include/epiphany/2.20/epiphany/ephy-embed-single.h
+include/epiphany/2.20/epiphany/ephy-embed-type-builtins.h
+include/epiphany/2.20/epiphany/ephy-embed.h
+include/epiphany/2.20/epiphany/ephy-extension.h
+include/epiphany/2.20/epiphany/ephy-extensions-manager.h
+include/epiphany/2.20/epiphany/ephy-history.h
+include/epiphany/2.20/epiphany/ephy-lib-type-builtins.h
+include/epiphany/2.20/epiphany/ephy-link.h
+include/epiphany/2.20/epiphany/ephy-loader.h
+include/epiphany/2.20/epiphany/ephy-node-db.h
+include/epiphany/2.20/epiphany/ephy-node.h
+include/epiphany/2.20/epiphany/ephy-notebook.h
+include/epiphany/2.20/epiphany/ephy-password-manager.h
+include/epiphany/2.20/epiphany/ephy-permission-manager.h
+include/epiphany/2.20/epiphany/ephy-session.h
+include/epiphany/2.20/epiphany/ephy-shell.h
+include/epiphany/2.20/epiphany/ephy-state.h
+include/epiphany/2.20/epiphany/ephy-statusbar.h
+include/epiphany/2.20/epiphany/ephy-tab.h
+include/epiphany/2.20/epiphany/ephy-type-builtins.h
+include/epiphany/2.20/epiphany/ephy-window.h
+lib/epiphany/2.20/plugins/libdesktopfileplugin.la
+lib/pkgconfig/epiphany-2.20.pc
 man/man1/epiphany.1
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
@@ -62,30 +62,38 @@ share/epiphany/glade/form-signing-dialog.glade
 share/epiphany/glade/prefs-dialog.glade
 share/epiphany/glade/print.glade
 share/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
-share/epiphany/icons/hicolor/16x16/actions/download.png
 share/epiphany/icons/hicolor/16x16/actions/history-view.png
 share/epiphany/icons/hicolor/16x16/actions/location-entry.png
+share/epiphany/icons/hicolor/16x16/places/bookmark-web.png
+share/epiphany/icons/hicolor/16x16/status/lock-broken.png
+share/epiphany/icons/hicolor/16x16/status/lock-insecure.png
+share/epiphany/icons/hicolor/16x16/status/lock-secure-checked.png
+share/epiphany/icons/hicolor/16x16/status/lock-secure.png
 share/epiphany/icons/hicolor/16x16/status/popup-hidden.png
 share/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
-share/epiphany/icons/hicolor/22x22/actions/download.png
 share/epiphany/icons/hicolor/22x22/actions/history-view.png
 share/epiphany/icons/hicolor/22x22/actions/location-entry.png
+share/epiphany/icons/hicolor/22x22/places/bookmark-web.png
 share/epiphany/icons/hicolor/22x22/status/popup-hidden.png
 share/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
-share/epiphany/icons/hicolor/24x24/actions/download.png
 share/epiphany/icons/hicolor/24x24/actions/history-view.png
 share/epiphany/icons/hicolor/24x24/actions/location-entry.png
+share/epiphany/icons/hicolor/24x24/places/bookmark-web.png
+share/epiphany/icons/hicolor/24x24/status/lock-broken.png
+share/epiphany/icons/hicolor/24x24/status/lock-insecure.png
+share/epiphany/icons/hicolor/24x24/status/lock-secure-checked.png
+share/epiphany/icons/hicolor/24x24/status/lock-secure.png
 share/epiphany/icons/hicolor/24x24/status/popup-hidden.png
 share/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/epiphany/icons/hicolor/32x32/actions/download.png
 share/epiphany/icons/hicolor/32x32/actions/history-view.png
 share/epiphany/icons/hicolor/32x32/actions/location-entry.png
+share/epiphany/icons/hicolor/32x32/actions/location-entry.svg
 share/epiphany/icons/hicolor/32x32/status/popup-hidden.png
+share/epiphany/icons/hicolor/48x48/status/lock-broken.png
+share/epiphany/icons/hicolor/48x48/status/lock-insecure.png
+share/epiphany/icons/hicolor/48x48/status/lock-secure-checked.png
+share/epiphany/icons/hicolor/48x48/status/lock-secure.png
 share/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/epiphany/icons/hicolor/scalable/actions/download.svg
 share/epiphany/icons/hicolor/scalable/actions/history-view.svg
 share/epiphany/icons/hicolor/scalable/actions/location-entry.svg
 share/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
@@ -105,6 +113,11 @@ share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
+share/gnome/help/epiphany/ca/epiphany.xml
+share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
 share/gnome/help/epiphany/de/epiphany.xml
 share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -155,6 +168,11 @@ share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
+share/gnome/help/epiphany/oc/epiphany.xml
+share/gnome/help/epiphany/oc/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-screenshot.png
 share/gnome/help/epiphany/ru/epiphany.xml
 share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -170,33 +188,15 @@ share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gtk-doc/html/epiphany/EphyCommandManager.html
-share/gtk-doc/html/epiphany/EphyEmbed.html
-share/gtk-doc/html/epiphany/EphyNodeDb.html
-share/gtk-doc/html/epiphany/EphyTab.html
-share/gtk-doc/html/epiphany/EphyWindow.html
-share/gtk-doc/html/epiphany/ch01.html
-share/gtk-doc/html/epiphany/ch02.html
-share/gtk-doc/html/epiphany/epiphany-EphyEmbedFactory.html
-share/gtk-doc/html/epiphany/epiphany-EphyEmbedPersist.html
-share/gtk-doc/html/epiphany/epiphany-EphyEmbedSingle.html
-share/gtk-doc/html/epiphany/epiphany-EphyExtensionsManager.html
-share/gtk-doc/html/epiphany/epiphany-EphyGlade.html
-share/gtk-doc/html/epiphany/epiphany-EphyPermissionManager.html
-share/gtk-doc/html/epiphany/epiphany-ephy-cookie-manager.html
-share/gtk-doc/html/epiphany/epiphany-ephy-password-manager.html
-share/gtk-doc/html/epiphany/epiphany-ephy-session.html
-share/gtk-doc/html/epiphany/epiphany-ephy-shell.html
-share/gtk-doc/html/epiphany/epiphany.devhelp
-share/gtk-doc/html/epiphany/epiphany.devhelp2
-share/gtk-doc/html/epiphany/home.png
-share/gtk-doc/html/epiphany/index.html
-share/gtk-doc/html/epiphany/index.sgml
-share/gtk-doc/html/epiphany/left.png
-share/gtk-doc/html/epiphany/right.png
-share/gtk-doc/html/epiphany/style.css
-share/gtk-doc/html/epiphany/up.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/hicolor/16x16/apps/gnome-web-browser.png
+share/icons/hicolor/22x22/apps/gnome-web-browser.png
+share/icons/hicolor/24x24/apps/gnome-web-browser.png
+share/icons/hicolor/32x32/apps/gnome-web-browser.png
 share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
+share/icons/hicolor/scalable/apps/gnome-web-browser.svg
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
 share/locale/az/LC_MESSAGES/epiphany.mo
@@ -257,6 +257,7 @@ share/locale/pt_BR/LC_MESSAGES/epiphany.mo
 share/locale/ro/LC_MESSAGES/epiphany.mo
 share/locale/ru/LC_MESSAGES/epiphany.mo
 share/locale/rw/LC_MESSAGES/epiphany.mo
+share/locale/si/LC_MESSAGES/epiphany.mo
 share/locale/sk/LC_MESSAGES/epiphany.mo
 share/locale/sl/LC_MESSAGES/epiphany.mo
 share/locale/sq/LC_MESSAGES/epiphany.mo
@@ -276,6 +277,7 @@ share/locale/zh_HK/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 share/omf/epiphany/epiphany-C.omf
 share/omf/epiphany/epiphany-bg.omf
+share/omf/epiphany/epiphany-ca.omf
 share/omf/epiphany/epiphany-de.omf
 share/omf/epiphany/epiphany-el.omf
 share/omf/epiphany/epiphany-en_GB.omf
@@ -286,13 +288,20 @@ share/omf/epiphany/epiphany-fr.omf
 share/omf/epiphany/epiphany-it.omf
 share/omf/epiphany/epiphany-ja.omf
 share/omf/epiphany/epiphany-nl.omf
+share/omf/epiphany/epiphany-oc.omf
 share/omf/epiphany/epiphany-ru.omf
 share/omf/epiphany/epiphany-sv.omf
 share/omf/epiphany/epiphany-uk.omf
 @dirrm share/omf/epiphany
 @comment in scrollkeeper: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@exec ${MKDIR} %D/share/gtk-doc/html/epiphany
 @dirrm share/gtk-doc/html/epiphany
 @dirrm share/gnome/help/epiphany/uk/figures
 @dirrm share/gnome/help/epiphany/uk
@@ -300,6 +309,8 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm share/gnome/help/epiphany/sv
 @dirrm share/gnome/help/epiphany/ru/figures
 @dirrm share/gnome/help/epiphany/ru
+@dirrm share/gnome/help/epiphany/oc/figures
+@dirrm share/gnome/help/epiphany/oc
 @dirrm share/gnome/help/epiphany/nl/figures
 @dirrm share/gnome/help/epiphany/nl
 @dirrm share/gnome/help/epiphany/ja/figures
@@ -320,6 +331,8 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm share/gnome/help/epiphany/el
 @dirrm share/gnome/help/epiphany/de/figures
 @dirrm share/gnome/help/epiphany/de
+@dirrm share/gnome/help/epiphany/ca/figures
+@dirrm share/gnome/help/epiphany/ca
 @dirrm share/gnome/help/epiphany/bg/figures
 @dirrm share/gnome/help/epiphany/bg
 @dirrm share/gnome/help/epiphany/C/figures
@@ -330,16 +343,21 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm share/epiphany/icons/hicolor/scalable/status
 @dirrm share/epiphany/icons/hicolor/scalable/actions
 @dirrm share/epiphany/icons/hicolor/scalable
+@dirrm share/epiphany/icons/hicolor/48x48/status
+@dirrm share/epiphany/icons/hicolor/48x48
 @dirrm share/epiphany/icons/hicolor/32x32/status
 @dirrm share/epiphany/icons/hicolor/32x32/actions
 @dirrm share/epiphany/icons/hicolor/32x32
 @dirrm share/epiphany/icons/hicolor/24x24/status
+@dirrm share/epiphany/icons/hicolor/24x24/places
 @dirrm share/epiphany/icons/hicolor/24x24/actions
 @dirrm share/epiphany/icons/hicolor/24x24
 @dirrm share/epiphany/icons/hicolor/22x22/status
+@dirrm share/epiphany/icons/hicolor/22x22/places
 @dirrm share/epiphany/icons/hicolor/22x22/actions
 @dirrm share/epiphany/icons/hicolor/22x22
 @dirrm share/epiphany/icons/hicolor/16x16/status
+@dirrm share/epiphany/icons/hicolor/16x16/places
 @dirrm share/epiphany/icons/hicolor/16x16/actions
 @dirrm share/epiphany/icons/hicolor/16x16
 @dirrm share/epiphany/icons/hicolor
@@ -353,9 +371,9 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm share/epiphany
 @comment in dbus: @dirrm share/dbus-1/services
 @comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/epiphany/2.18/plugins
-@dirrm lib/epiphany/2.18
+@dirrm lib/epiphany/2.20/plugins
+@dirrm lib/epiphany/2.20
 @dirrm lib/epiphany
-@dirrm include/epiphany/2.18/epiphany
-@dirrm include/epiphany/2.18
+@dirrm include/epiphany/2.20/epiphany
+@dirrm include/epiphany/2.20
 @dirrm include/epiphany
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 7bf861d4947..ba06b0a16da 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2007/07/13 17:30:36 drochner Exp $
+$NetBSD: distinfo,v 1.37 2007/11/03 17:30:57 drochner Exp $
 
-SHA1 (epiphany-2.18.3.tar.bz2) = 664f6e1ccb3fafd27b6846c6540d63aac860888f
-RMD160 (epiphany-2.18.3.tar.bz2) = 3d18c44fabd8d94a941239a9a13802666a869eaf
-Size (epiphany-2.18.3.tar.bz2) = 4772883 bytes
+SHA1 (epiphany-2.20.1.tar.bz2) = f7f15f5c8c9c4146ef92583f306e98265c8b0011
+RMD160 (epiphany-2.20.1.tar.bz2) = 05921c9228f29c401f4feec77e1601ef26c6138a
+Size (epiphany-2.20.1.tar.bz2) = 4878092 bytes