Update to epiphany-2.28.2.

gecko support has been removed upstream, so switch to webkit rendering.

4 files changed, 67 insertions, 73 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 5940dc24df3..f6f8a04402f 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2009/12/15 22:16:10 joerg Exp $
+# $NetBSD: Makefile,v 1.100 2010/01/16 14:46:27 tnn Exp $
 #
 
-DISTNAME=	epiphany-2.26.3
-PKGREVISION=	3
+DISTNAME=	epiphany-2.28.2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.26/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,7 +38,9 @@ BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 .include "../../devel/libgnome/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/xulrunner/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 06ef15cb675..95cf4f09dd9 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,58 +1,46 @@
-@comment $NetBSD: PLIST,v 1.36 2009/08/06 11:03:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.37 2010/01/16 14:46:27 tnn Exp $
 bin/epiphany
-include/epiphany/2.26/epiphany/ephy-adblock-manager.h
-include/epiphany/2.26/epiphany/ephy-adblock.h
-include/epiphany/2.26/epiphany/ephy-base-embed.h
-include/epiphany/2.26/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/2.26/epiphany/ephy-bookmarks.h
-include/epiphany/2.26/epiphany/ephy-command-manager.h
-include/epiphany/2.26/epiphany/ephy-cookie-manager.h
-include/epiphany/2.26/epiphany/ephy-dbus.h
-include/epiphany/2.26/epiphany/ephy-dialog.h
-include/epiphany/2.26/epiphany/ephy-embed-container.h
-include/epiphany/2.26/epiphany/ephy-embed-event.h
-include/epiphany/2.26/epiphany/ephy-embed-factory.h
-include/epiphany/2.26/epiphany/ephy-embed-persist.h
-include/epiphany/2.26/epiphany/ephy-embed-prefs.h
-include/epiphany/2.26/epiphany/ephy-embed-shell.h
-include/epiphany/2.26/epiphany/ephy-embed-single.h
-include/epiphany/2.26/epiphany/ephy-embed-type-builtins.h
-include/epiphany/2.26/epiphany/ephy-embed-utils.h
-include/epiphany/2.26/epiphany/ephy-embed.h
-include/epiphany/2.26/epiphany/ephy-extension.h
-include/epiphany/2.26/epiphany/ephy-extensions-manager.h
-include/epiphany/2.26/epiphany/ephy-history-item.h
-include/epiphany/2.26/epiphany/ephy-history.h
-include/epiphany/2.26/epiphany/ephy-lib-type-builtins.h
-include/epiphany/2.26/epiphany/ephy-link.h
-include/epiphany/2.26/epiphany/ephy-loader.h
-include/epiphany/2.26/epiphany/ephy-node-db.h
-include/epiphany/2.26/epiphany/ephy-node.h
-include/epiphany/2.26/epiphany/ephy-notebook.h
-include/epiphany/2.26/epiphany/ephy-password-manager.h
-include/epiphany/2.26/epiphany/ephy-permission-manager.h
-include/epiphany/2.26/epiphany/ephy-session.h
-include/epiphany/2.26/epiphany/ephy-shell.h
-include/epiphany/2.26/epiphany/ephy-state.h
-include/epiphany/2.26/epiphany/ephy-statusbar.h
-include/epiphany/2.26/epiphany/ephy-type-builtins.h
-include/epiphany/2.26/epiphany/ephy-version.h
-include/epiphany/2.26/epiphany/ephy-window.h
-lib/epiphany/2.26/plugins/libdesktopfileplugin.la
-lib/pkgconfig/epiphany-2.26.pc
+include/epiphany/2.28/epiphany/ephy-adblock-manager.h
+include/epiphany/2.28/epiphany/ephy-adblock.h
+include/epiphany/2.28/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/2.28/epiphany/ephy-bookmarks.h
+include/epiphany/2.28/epiphany/ephy-dbus.h
+include/epiphany/2.28/epiphany/ephy-dialog.h
+include/epiphany/2.28/epiphany/ephy-embed-container.h
+include/epiphany/2.28/epiphany/ephy-embed-event.h
+include/epiphany/2.28/epiphany/ephy-embed-persist.h
+include/epiphany/2.28/epiphany/ephy-embed-prefs.h
+include/epiphany/2.28/epiphany/ephy-embed-shell.h
+include/epiphany/2.28/epiphany/ephy-embed-single.h
+include/epiphany/2.28/epiphany/ephy-embed-type-builtins.h
+include/epiphany/2.28/epiphany/ephy-embed-utils.h
+include/epiphany/2.28/epiphany/ephy-embed.h
+include/epiphany/2.28/epiphany/ephy-extension.h
+include/epiphany/2.28/epiphany/ephy-extensions-manager.h
+include/epiphany/2.28/epiphany/ephy-history.h
+include/epiphany/2.28/epiphany/ephy-lib-type-builtins.h
+include/epiphany/2.28/epiphany/ephy-link.h
+include/epiphany/2.28/epiphany/ephy-loader.h
+include/epiphany/2.28/epiphany/ephy-node-db.h
+include/epiphany/2.28/epiphany/ephy-node.h
+include/epiphany/2.28/epiphany/ephy-notebook.h
+include/epiphany/2.28/epiphany/ephy-permission-manager.h
+include/epiphany/2.28/epiphany/ephy-session.h
+include/epiphany/2.28/epiphany/ephy-shell.h
+include/epiphany/2.28/epiphany/ephy-state.h
+include/epiphany/2.28/epiphany/ephy-statusbar.h
+include/epiphany/2.28/epiphany/ephy-type-builtins.h
+include/epiphany/2.28/epiphany/ephy-web-view.h
+include/epiphany/2.28/epiphany/ephy-window.h
+include/epiphany/2.28/epiphany/epiphany.h
+lib/pkgconfig/epiphany-2.28.pc
 man/man1/epiphany.1
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
 share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
 share/epiphany/about.ini
-share/epiphany/chrome/app-chrome.manifest
-share/epiphany/chrome/branding/brand.dtd
-share/epiphany/chrome/branding/brand.properties
-share/epiphany/chrome/global/about.xhtml
-share/epiphany/chrome/global/netError.dtd
-share/epiphany/components/epiphany.xpt
-share/epiphany/default-prefs.js
+share/epiphany/default-bookmarks.rdf
 share/epiphany/ephy-xml2ini.xsl
 share/epiphany/epiphany-bookmark-editor-ui.xml
 share/epiphany/epiphany-bookmarks-html.xsl
@@ -62,11 +50,11 @@ share/epiphany/epiphany-history-window-ui.xml
 share/epiphany/epiphany-toolbar.xml
 share/epiphany/epiphany-ui.xml
 share/epiphany/epiphany.xhtml
-share/epiphany/glade/certificate-dialogs.glade
-share/epiphany/glade/epiphany.glade
-share/epiphany/glade/form-signing-dialog.glade
-share/epiphany/glade/prefs-dialog.glade
-share/epiphany/glade/print.glade
+share/epiphany/glade/certificate-dialogs.ui
+share/epiphany/glade/epiphany.ui
+share/epiphany/glade/form-signing-dialog.ui
+share/epiphany/glade/prefs-dialog.ui
+share/epiphany/glade/print.ui
 share/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
 share/epiphany/icons/hicolor/16x16/actions/history-view.png
 share/epiphany/icons/hicolor/16x16/actions/location-entry.png
@@ -104,9 +92,7 @@ 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
 share/epiphany/mime-types-permissions.xml
-share/gconf/schemas/epiphany-fonts.schemas
 share/gconf/schemas/epiphany-lockdown.schemas
-share/gconf/schemas/epiphany-pango.schemas
 share/gconf/schemas/epiphany.schemas
 share/gnome/help/epiphany/C/epiphany.xml
 share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png
@@ -201,17 +187,21 @@ 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/EphyLocationEntry.html
 share/gtk-doc/html/epiphany/EphyNodeDb.html
+share/gtk-doc/html/epiphany/EphySearchEntry.html
+share/gtk-doc/html/epiphany/EphySpinner.html
 share/gtk-doc/html/epiphany/EphyWindow.html
+share/gtk-doc/html/epiphany/EphyZoomControl.html
 share/gtk-doc/html/epiphany/ch01.html
 share/gtk-doc/html/epiphany/ch02.html
+share/gtk-doc/html/epiphany/ch03.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
@@ -243,8 +233,10 @@ share/locale/be@latin/LC_MESSAGES/epiphany.mo
 share/locale/bg/LC_MESSAGES/epiphany.mo
 share/locale/bn/LC_MESSAGES/epiphany.mo
 share/locale/bn_IN/LC_MESSAGES/epiphany.mo
+share/locale/br/LC_MESSAGES/epiphany.mo
 share/locale/bs/LC_MESSAGES/epiphany.mo
 share/locale/ca/LC_MESSAGES/epiphany.mo
+share/locale/ca@valencia/LC_MESSAGES/epiphany.mo
 share/locale/cs/LC_MESSAGES/epiphany.mo
 share/locale/cy/LC_MESSAGES/epiphany.mo
 share/locale/da/LC_MESSAGES/epiphany.mo
@@ -266,7 +258,9 @@ share/locale/he/LC_MESSAGES/epiphany.mo
 share/locale/hi/LC_MESSAGES/epiphany.mo
 share/locale/hr/LC_MESSAGES/epiphany.mo
 share/locale/hu/LC_MESSAGES/epiphany.mo
+share/locale/hy/LC_MESSAGES/epiphany.mo
 share/locale/id/LC_MESSAGES/epiphany.mo
+share/locale/ig/LC_MESSAGES/epiphany.mo
 share/locale/is/LC_MESSAGES/epiphany.mo
 share/locale/it/LC_MESSAGES/epiphany.mo
 share/locale/ja/LC_MESSAGES/epiphany.mo
@@ -286,6 +280,7 @@ share/locale/mn/LC_MESSAGES/epiphany.mo
 share/locale/mr/LC_MESSAGES/epiphany.mo
 share/locale/ms/LC_MESSAGES/epiphany.mo
 share/locale/nb/LC_MESSAGES/epiphany.mo
+share/locale/ne/LC_MESSAGES/epiphany.mo
 share/locale/nl/LC_MESSAGES/epiphany.mo
 share/locale/nn/LC_MESSAGES/epiphany.mo
 share/locale/oc/LC_MESSAGES/epiphany.mo
@@ -311,8 +306,11 @@ 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/yo/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_HK/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 92824e3b391..b148ee11626 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,8 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2009/08/26 19:56:45 sno Exp $
-#
-# This Makefile fragment is included by packages that use epiphany.
-#
-# This file was created automatically using createbuildlink-3.1.
+# $NetBSD: buildlink3.mk,v 1.31 2010/01/16 14:46:27 tnn Exp $
 #
 
 BUILDLINK_TREE+=	epiphany
@@ -10,8 +6,7 @@ BUILDLINK_TREE+=	epiphany
 .if !defined(EPIPHANY_BUILDLINK3_MK)
 EPIPHANY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=1.8.2
-BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.26.3nb2
+BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=2.28
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -20,7 +15,8 @@ BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/xulrunner/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 5ea73977d99..986d6cebbd7 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.48 2009/08/06 11:03:49 tnn Exp $
+$NetBSD: distinfo,v 1.49 2010/01/16 14:46:27 tnn Exp $
 
-SHA1 (epiphany-2.26.3.tar.bz2) = d1143fd2f287efe3eab648e1feded9f4911e3236
-RMD160 (epiphany-2.26.3.tar.bz2) = ef2474c8523a6787227d3dfa5e8fc9d443708a0c
-Size (epiphany-2.26.3.tar.bz2) = 5655997 bytes
-SHA1 (patch-aa) = b3b4e0151753eb3b4005f9e7a5ecd4399642ea7f
+SHA1 (epiphany-2.28.2.tar.bz2) = 8f382e18dba2ca4292350f1c979986a68ee9b668
+RMD160 (epiphany-2.28.2.tar.bz2) = 2cfde41e96ceace397bf42231dffd577353f8eeb
+Size (epiphany-2.28.2.tar.bz2) = 5697393 bytes