update to 2.30.2

This switches to the gnome-2.30 release branch.

4 files changed, 48 insertions, 60 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index f5454271d4d..152c496db78 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.106 2010/06/13 22:45:33 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2010/07/13 12:05:57 drochner Exp $
 #
 
-DISTNAME=	epiphany-2.28.2
-PKGREVISION=	2
+DISTNAME=	epiphany-2.30.2
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,13 +18,10 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 
-PKGCONFIG_OVERRIDE=	data/epiphany-2.28.pc
+#CONFIGURE_ARGS+=	--with-ca-file=/etc/openssl/certs/ca-certificates.crt
+CONFIGURE_ARGS+=	--without-ca-file
 
-# needed for epiphany-2.28 and gtk2-2.20 -- remove on next update
-BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
+PKGCONFIG_OVERRIDE=	data/epiphany-2.29.pc
 
 .include "options.mk"
 
@@ -37,12 +33,6 @@ GCONF_SCHEMAS+=	epiphany-lockdown.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.18.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-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/nss/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 95cf4f09dd9..f8300bd776f 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,39 +1,39 @@
-@comment $NetBSD: PLIST,v 1.37 2010/01/16 14:46:27 tnn Exp $
+@comment $NetBSD: PLIST,v 1.38 2010/07/13 12:05:57 drochner Exp $
 bin/epiphany
-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
+include/epiphany/2.30/epiphany/ephy-adblock-manager.h
+include/epiphany/2.30/epiphany/ephy-adblock.h
+include/epiphany/2.30/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/2.30/epiphany/ephy-bookmarks.h
+include/epiphany/2.30/epiphany/ephy-dbus.h
+include/epiphany/2.30/epiphany/ephy-dialog.h
+include/epiphany/2.30/epiphany/ephy-embed-container.h
+include/epiphany/2.30/epiphany/ephy-embed-event.h
+include/epiphany/2.30/epiphany/ephy-embed-persist.h
+include/epiphany/2.30/epiphany/ephy-embed-prefs.h
+include/epiphany/2.30/epiphany/ephy-embed-shell.h
+include/epiphany/2.30/epiphany/ephy-embed-single.h
+include/epiphany/2.30/epiphany/ephy-embed-type-builtins.h
+include/epiphany/2.30/epiphany/ephy-embed-utils.h
+include/epiphany/2.30/epiphany/ephy-embed.h
+include/epiphany/2.30/epiphany/ephy-extension.h
+include/epiphany/2.30/epiphany/ephy-extensions-manager.h
+include/epiphany/2.30/epiphany/ephy-history.h
+include/epiphany/2.30/epiphany/ephy-lib-type-builtins.h
+include/epiphany/2.30/epiphany/ephy-link.h
+include/epiphany/2.30/epiphany/ephy-loader.h
+include/epiphany/2.30/epiphany/ephy-node-db.h
+include/epiphany/2.30/epiphany/ephy-node.h
+include/epiphany/2.30/epiphany/ephy-notebook.h
+include/epiphany/2.30/epiphany/ephy-permission-manager.h
+include/epiphany/2.30/epiphany/ephy-session.h
+include/epiphany/2.30/epiphany/ephy-shell.h
+include/epiphany/2.30/epiphany/ephy-state.h
+include/epiphany/2.30/epiphany/ephy-statusbar.h
+include/epiphany/2.30/epiphany/ephy-type-builtins.h
+include/epiphany/2.30/epiphany/ephy-web-view.h
+include/epiphany/2.30/epiphany/ephy-window.h
+include/epiphany/2.30/epiphany/epiphany.h
+lib/pkgconfig/epiphany-2.29.pc
 man/man1/epiphany.1
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
@@ -41,7 +41,6 @@ share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
 share/epiphany/about.ini
 share/epiphany/default-bookmarks.rdf
-share/epiphany/ephy-xml2ini.xsl
 share/epiphany/epiphany-bookmark-editor-ui.xml
 share/epiphany/epiphany-bookmarks-html.xsl
 share/epiphany/epiphany-bookmarksbar.xml
@@ -243,6 +242,7 @@ share/locale/da/LC_MESSAGES/epiphany.mo
 share/locale/de/LC_MESSAGES/epiphany.mo
 share/locale/dz/LC_MESSAGES/epiphany.mo
 share/locale/el/LC_MESSAGES/epiphany.mo
+share/locale/en@shaw/LC_MESSAGES/epiphany.mo
 share/locale/en_CA/LC_MESSAGES/epiphany.mo
 share/locale/en_GB/LC_MESSAGES/epiphany.mo
 share/locale/es/LC_MESSAGES/epiphany.mo
@@ -280,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/nds/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
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index b9e4c2c429d..565a33c9bb6 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/06/13 22:45:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/07/13 12:05:57 drochner Exp $
 #
 
 BUILDLINK_TREE+=	epiphany
@@ -13,9 +13,6 @@ BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 .include "../../mk/bsd.fast.prefs.mk"
 
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 986d6cebbd7..eb3722603f5 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.49 2010/01/16 14:46:27 tnn Exp $
+$NetBSD: distinfo,v 1.50 2010/07/13 12:05:57 drochner Exp $
 
-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
+SHA1 (epiphany-2.30.2.tar.bz2) = 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b
+RMD160 (epiphany-2.30.2.tar.bz2) = c0bb5e1a14ccbe72531cbf3f0f416c5172437a86
+Size (epiphany-2.30.2.tar.bz2) = 5881032 bytes