epiphany update

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

The version of epiphany in pkgsrc doesn't compile with the new gtk. The
last stable release seems to. The attached patch "works for me", but

- I call configure with --without-ca-file as I'm not sure where one would
  expect to find one - is there a CA cert package to depend on?
- I'm not sure about what BUILDLINK_API_DEPENDS nor just how much
  buildlink3.mk needs...

Cheers,

Patrick

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/epiphany/Makefile,v
retrieving revision 1.104
diff -u -r1.104 Makefile
--- Makefile    24 Feb 2010 18:47:07 -0000      1.104
+++ Makefile    11 Jun 2010 07:06:14 -0000
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.104 2010/02/24 18:47:07 drochner Exp $
 #
 
-DISTNAME=      epiphany-2.28.2
+DISTNAME=      epiphany-2.30.2
 PKGREVISION=   1
 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@localhost
@@ -19,7 +19,9 @@
 USE_PKGLOCALEDIR=      YES
 USE_LANGUAGES=         c c++
 
-PKGCONFIG_OVERRIDE=    data/epiphany-2.28.pc
+PKGCONFIG_OVERRIDE=    data/epiphany-2.29.pc
+
+CONFIGURE_ARGS+=       --without-ca-file
 
 .include "options.mk"
 
@@ -31,18 +33,12 @@
 .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"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/epiphany/PLIST,v
retrieving revision 1.37
diff -u -r1.37 PLIST
--- PLIST       16 Jan 2010 14:46:27 -0000      1.37
+++ PLIST       11 Jun 2010 07:06:14 -0000
@@ -1,39 +1,39 @@
 @comment $NetBSD: PLIST,v 1.37 2010/01/16 14:46:27 tnn 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/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
@@ -245,6 +244,7 @@
 share/locale/el/LC_MESSAGES/epiphany.mo
 share/locale/en_CA/LC_MESSAGES/epiphany.mo
 share/locale/en_GB/LC_MESSAGES/epiphany.mo
+share/locale/en@shaw/LC_MESSAGES/epiphany.mo
 share/locale/es/LC_MESSAGES/epiphany.mo
 share/locale/et/LC_MESSAGES/epiphany.mo
 share/locale/eu/LC_MESSAGES/epiphany.mo
@@ -280,6 +280,7 @@
 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
Index: buildlink3.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/epiphany/buildlink3.mk,v
retrieving revision 1.32
diff -u -r1.32 buildlink3.mk
--- buildlink3.mk       18 Jan 2010 09:59:30 -0000      1.32
+++ buildlink3.mk       11 Jun 2010 07:06:14 -0000
@@ -6,16 +6,13 @@
 .if !defined(EPIPHANY_BUILDLINK3_MK)
 EPIPHANY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.epiphany+=               epiphany>=2.28
-BUILDLINK_ABI_DEPENDS.epiphany?=               epiphany>=2.28.2nb1
+BUILDLINK_API_DEPENDS.epiphany+=               epiphany>=2.30
+BUILDLINK_ABI_DEPENDS.epiphany?=               epiphany>=2.30.2nb1
 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"
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/epiphany/distinfo,v
retrieving revision 1.49
diff -u -r1.49 distinfo
--- distinfo    16 Jan 2010 14:46:27 -0000      1.49
+++ distinfo    11 Jun 2010 07:06:14 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.49 2010/01/16 14:46:27 tnn 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