update to 2.22.1.1

This switches to the gnome-2.22 release branch.

4 files changed, 57 insertions, 60 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 09ce49f12ac..f2c0bbe313a 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2008/04/15 18:16:16 drochner Exp $
 #
 
-DISTNAME=	epiphany-2.20.3
-PKGREVISION=	2
+DISTNAME=	epiphany-2.22.1.1
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -18,7 +17,7 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 
-PKGCONFIG_OVERRIDE=	data/epiphany-2.20.pc
+PKGCONFIG_OVERRIDE=	data/epiphany-2.22.pc
 
 .include "options.mk"
 
@@ -28,7 +27,6 @@ GCONF_SCHEMAS+=	epiphany-lockdown.schemas
 GCONF_SCHEMAS+=	epiphany-pango.schemas
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.10.0
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
@@ -43,12 +41,9 @@ BUILDLINK_API_DEPENDS.libxml2+=		libxml2>=2.6.12
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 6ef55bb5922..8e3a181b5ad 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,41 +1,45 @@
-@comment $NetBSD: PLIST,v 1.28 2008/01/11 13:42:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.29 2008/04/15 18:16:16 drochner Exp $
 bin/epiphany
-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
+include/epiphany/2.22/epiphany/ephy-adblock-manager.h
+include/epiphany/2.22/epiphany/ephy-adblock.h
+include/epiphany/2.22/epiphany/ephy-base-embed.h
+include/epiphany/2.22/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/2.22/epiphany/ephy-bookmarks.h
+include/epiphany/2.22/epiphany/ephy-command-manager.h
+include/epiphany/2.22/epiphany/ephy-cookie-manager.h
+include/epiphany/2.22/epiphany/ephy-dbus.h
+include/epiphany/2.22/epiphany/ephy-dialog.h
+include/epiphany/2.22/epiphany/ephy-embed-container.h
+include/epiphany/2.22/epiphany/ephy-embed-event.h
+include/epiphany/2.22/epiphany/ephy-embed-factory.h
+include/epiphany/2.22/epiphany/ephy-embed-persist.h
+include/epiphany/2.22/epiphany/ephy-embed-prefs.h
+include/epiphany/2.22/epiphany/ephy-embed-shell.h
+include/epiphany/2.22/epiphany/ephy-embed-single.h
+include/epiphany/2.22/epiphany/ephy-embed-type-builtins.h
+include/epiphany/2.22/epiphany/ephy-embed-utils.h
+include/epiphany/2.22/epiphany/ephy-embed.h
+include/epiphany/2.22/epiphany/ephy-extension.h
+include/epiphany/2.22/epiphany/ephy-extensions-manager.h
+include/epiphany/2.22/epiphany/ephy-history-item.h
+include/epiphany/2.22/epiphany/ephy-history.h
+include/epiphany/2.22/epiphany/ephy-lib-type-builtins.h
+include/epiphany/2.22/epiphany/ephy-link.h
+include/epiphany/2.22/epiphany/ephy-loader.h
+include/epiphany/2.22/epiphany/ephy-node-db.h
+include/epiphany/2.22/epiphany/ephy-node.h
+include/epiphany/2.22/epiphany/ephy-notebook.h
+include/epiphany/2.22/epiphany/ephy-password-manager.h
+include/epiphany/2.22/epiphany/ephy-permission-manager.h
+include/epiphany/2.22/epiphany/ephy-session.h
+include/epiphany/2.22/epiphany/ephy-shell.h
+include/epiphany/2.22/epiphany/ephy-state.h
+include/epiphany/2.22/epiphany/ephy-statusbar.h
+include/epiphany/2.22/epiphany/ephy-type-builtins.h
+include/epiphany/2.22/epiphany/ephy-version.h
+include/epiphany/2.22/epiphany/ephy-window.h
+lib/epiphany/2.22/plugins/libdesktopfileplugin.la
+lib/pkgconfig/epiphany-2.22.pc
 man/man1/epiphany.1
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
@@ -44,7 +48,7 @@ share/dbus-1/services/org.gnome.Epiphany.service
 share/epiphany/about.ini
 share/epiphany/chrome/branding/brand.dtd
 share/epiphany/chrome/branding/brand.properties
-share/epiphany/chrome/epiphany.manifest
+share/epiphany/chrome/app-chrome.manifest
 share/epiphany/chrome/global/about.xhtml
 share/epiphany/default-prefs.js
 share/epiphany/ephy-xml2ini.xsl
@@ -191,7 +195,6 @@ 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
@@ -225,6 +228,7 @@ 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/as/LC_MESSAGES/epiphany.mo
 share/locale/az/LC_MESSAGES/epiphany.mo
 share/locale/be/LC_MESSAGES/epiphany.mo
 share/locale/be@latin/LC_MESSAGES/epiphany.mo
@@ -259,6 +263,7 @@ share/locale/is/LC_MESSAGES/epiphany.mo
 share/locale/it/LC_MESSAGES/epiphany.mo
 share/locale/ja/LC_MESSAGES/epiphany.mo
 share/locale/ka/LC_MESSAGES/epiphany.mo
+share/locale/kn/LC_MESSAGES/epiphany.mo
 share/locale/ko/LC_MESSAGES/epiphany.mo
 share/locale/ku/LC_MESSAGES/epiphany.mo
 share/locale/li/LC_MESSAGES/epiphany.mo
@@ -297,8 +302,6 @@ share/locale/th/LC_MESSAGES/epiphany.mo
 share/locale/tk/LC_MESSAGES/epiphany.mo
 share/locale/tr/LC_MESSAGES/epiphany.mo
 share/locale/uk/LC_MESSAGES/epiphany.mo
-share/locale/uz/LC_MESSAGES/epiphany.mo
-share/locale/uz@cyrillic/LC_MESSAGES/epiphany.mo
 share/locale/vi/LC_MESSAGES/epiphany.mo
 share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
@@ -399,9 +402,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.20/plugins
-@dirrm lib/epiphany/2.20
+@dirrm lib/epiphany/2.22/plugins
+@dirrm lib/epiphany/2.22
 @dirrm lib/epiphany
-@dirrm include/epiphany/2.20/epiphany
-@dirrm include/epiphany/2.20
+@dirrm include/epiphany/2.22/epiphany
+@dirrm include/epiphany/2.22
 @dirrm include/epiphany
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 205d718dd50..c6a6fc570b4 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2008/04/15 18:16:16 drochner Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
@@ -26,7 +26,6 @@ BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 # XXX: should pull in ../../www/seamonkey/gecko-depends.mk
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index eebb53429a5..c2b03369ab4 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.39 2008/01/11 13:42:57 drochner Exp $
+$NetBSD: distinfo,v 1.40 2008/04/15 18:16:16 drochner Exp $
 
-SHA1 (epiphany-2.20.3.tar.bz2) = ee3d21dde38970d9bfc715e2560f68303ac07e83
-RMD160 (epiphany-2.20.3.tar.bz2) = 1af464d3b694bb30e9491ea49162d79b655fa140
-Size (epiphany-2.20.3.tar.bz2) = 4945544 bytes
+SHA1 (epiphany-2.22.1.1.tar.bz2) = 473fe3394e1a9695e016ffc46089d42d4b5d6128
+RMD160 (epiphany-2.22.1.1.tar.bz2) = a59cf90ae697f32f2de843d9c0a993673f4763d9
+Size (epiphany-2.22.1.1.tar.bz2) = 5184989 bytes