Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.30/ .

This release brings initial PackageKit support, Upower (replaces power
management part of hal), cuse4bsd integration with HAL and cheese, and a
faster Evolution.

Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This
will also be the last of the 2.x releases. The next release will be the
highly-anticipated GNOME 3.0 which will bring with it a new UI experience.

Currently, there are a few bugs with GNOME 2.30 that may be of note for our
users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at
http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading
instructions, and the up-to-date list of known issues.

This release features commits by avl, ahze, bland, marcus, mezz, and myself.

The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the
initual packagekit porting.

And the following contributors & testers for there help with this release:
Eric L. Chen
Vladimir Grebenschikov
Sergio de Almeida Lenzi
DomiX
walder
crsd
Kevin Oberman
Michal Varga
Pavel Plesov
Bapt
kevin

and ITetcu for two exp-run

PR:	ports/143852
	ports/145347
	ports/144980
	ports/145830
	ports/145511

5 files changed, 44 insertions, 86 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 5109e28d80bc..d8b0d1318066 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.214 2009/10/25 20:22:54 marcus Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.228 2010/05/09 00:11:47 marcus Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.28.2
-PORTREVISION?=	3
+PORTVERSION=	2.30.2
+PORTREVISION?=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,13 +17,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	An extremely lightweight and simple web browser for GNOME 2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit
+		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
 		notify.1:${PORTSDIR}/devel/libnotify \
 		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
 
 USE_LDCONFIG=	yes
@@ -37,7 +37,8 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS+=--enable-introspection
+CONFIGURE_ARGS+=--enable-introspection \
+		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
 
@@ -48,7 +49,7 @@ PLIST_SUB+=	EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}"
 MAN1=		epiphany.1
 
 OPTIONS=	NSS "Import passwords from 2.26 and older on first run" on \
-		SEED "Enable seed support" off \
+		SEED "Enable seed (JavaScript) support" on \
 		SPELLCHECK "Enable spell checking by default" on
 
 .if defined(PACKAGE_BUILDING)
@@ -85,6 +86,7 @@ post-patch:
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \
 	    	s|-ldl"$$|"|g' \
+		-e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \
 		${WRKSRC}/configure
 
 post-install:
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 9de591cf7613..055b312cf580 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.28.2.tar.bz2) = cf32404bfe6f0cb4d3f01d0c33c08def
-SHA256 (gnome2/epiphany-2.28.2.tar.bz2) = 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490
-SIZE (gnome2/epiphany-2.28.2.tar.bz2) = 5697393
+MD5 (gnome2/epiphany-2.30.2.tar.bz2) = 29b084acfa016540d91d3601ec3dff5c
+SHA256 (gnome2/epiphany-2.30.2.tar.bz2) = cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
+SIZE (gnome2/epiphany-2.30.2.tar.bz2) = 5881032
diff --git a/www/epiphany/files/patch-embed_ephy-embed-prefs.c b/www/epiphany/files/patch-embed_ephy-embed-prefs.c
new file mode 100644
index 000000000000..2f361fc443b8
--- /dev/null
+++ b/www/epiphany/files/patch-embed_ephy-embed-prefs.c
@@ -0,0 +1,15 @@
+--- embed/ephy-embed-prefs.c.orig	2010-02-20 04:42:51.000000000 -0500
++++ embed/ephy-embed-prefs.c	2010-05-08 20:03:20.000000000 -0400
+@@ -322,8 +322,10 @@ webkit_pref_callback_accept_languages (G
+   langs_str = g_strjoinv (", ", langs);
+ 
+   /* Update Soup session */
+-  session = webkit_get_default_session ();
+-  g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
++  if (strlen (langs_str) > 0) {
++      session = webkit_get_default_session ();
++      g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
++  }
+ 
+   g_strfreev (langs);
+   g_free (langs_str);
diff --git a/www/epiphany/files/patch-embed_ephy-embed.c b/www/epiphany/files/patch-embed_ephy-embed.c
deleted file mode 100644
index f05f072a350d..000000000000
--- a/www/epiphany/files/patch-embed_ephy-embed.c
+++ /dev/null
@@ -1,72 +0,0 @@
-From 009be331694b442dd859f49c7f02bdef498621ff Mon Sep 17 00:00:00 2001
-From: Gustavo Noronha Silva <gns@gnome.org>
-Date: Sun, 25 Oct 2009 20:22:46 +0000
-Subject: Reimplement content type checking
-
-This brings back proper content type reporting, and the 'Open' button
-in the download dialog.
-
-Bug #598167
----
-
---- embed/ephy-embed.c.orig	2009-10-17 23:11:58.000000000 +0200
-+++ embed/ephy-embed.c	2009-11-02 12:56:33.000000000 +0100
-@@ -645,27 +645,38 @@ confirm_action_from_mime (WebKitWebView 
-   GAppInfo *helper_app;
-   const char *suggested_filename;
-   int default_response;
-+  WebKitNetworkResponse *response;
-+  SoupMessage *message;
- 
-   parent_window = gtk_widget_get_toplevel (GTK_WIDGET(web_view));
-   if (!GTK_WIDGET_TOPLEVEL (parent_window))
-     parent_window = NULL;
- 
--  /* FIXME: we still have no way of getting the content type from
--   * webkit yet; we need to have a proper WebKitNetworkRequest
--   * implementation to do this here; see
--   * https://bugs.webkit.org/show_bug.cgi?id=18608
--   */
-   helper_app = NULL;
-   mime_description = NULL;
-   mime_permission = EPHY_MIME_PERMISSION_SAFE;
-+
-+  response = webkit_download_get_network_response (download);
-+  message = webkit_network_response_get_message (response);
-+
-+  if (message) {
-+    const char *content_type = soup_message_headers_get_content_type (message->response_headers, NULL);
-+
-+    if (content_type) {
-+      mime_description = g_content_type_get_description (content_type);
-+      helper_app = g_app_info_get_default_for_type (content_type, FALSE);
-+
-+      if (helper_app) {
-+        action = DOWNLOAD_ACTION_OPEN;
-+      }
-+    }
-+  }
-+
-   if (mime_description == NULL) {
-     mime_description = g_strdup (C_("file type", "Unknown"));
-     action = DOWNLOAD_ACTION_OPEN_LOCATION;
-   }
- 
--  /* OPEN will never happen here, for now; see comment about
--   * WebKitNetworkRequest above!
--   */
-   action_label = (action == DOWNLOAD_ACTION_OPEN) ? GTK_STOCK_OPEN : STOCK_DOWNLOAD;
-   suggested_filename = webkit_download_get_suggested_filename (download);
- 
-@@ -757,11 +768,6 @@ download_status_changed_cb (GObject *obj
-     return;
-   }
- 
--  /* FIXME: when we are able to obtain the MIME information from
--   * WebKit, we will want to decide earlier whether we want to open or
--   * open the location to where the file was downloaded. See
--   * perform_auto_download, too.
--   */
-   g_object_ref (download); /* balanced in confirm_action_response_cb */
-   confirm_action_from_mime (web_view, download, DOWNLOAD_ACTION_DOWNLOAD);
- }
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 265cf986aa97..ed5adcca9d3a 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -33,13 +33,13 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-web-view.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
 @comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
-libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+libdata/pkgconfig/epiphany-2.30.pc
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
 share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
-lib/girepository-1.0/Epiphany-2.28.typelib
-share/gir-1.0/Epiphany-2.28.gir
+lib/girepository-1.0/Epiphany-2.30.typelib
+share/gir-1.0/Epiphany-2.30.gir
 %%DOCSDIR%%/EphyCommandManager.html
 %%DOCSDIR%%/EphyEmbed.html
 %%DOCSDIR%%/EphyLocationEntry.html
@@ -71,7 +71,6 @@ share/gir-1.0/Epiphany-2.28.gir
 %%DOCSDIR%%/up.png
 %%DATADIR%%/about.ini
 %%DATADIR%%/default-bookmarks.rdf
-%%DATADIR%%/ephy-xml2ini.xsl
 %%DATADIR%%/epiphany-bookmark-editor-ui.xml
 %%DATADIR%%/epiphany-bookmarks-html.xsl
 %%DATADIR%%/epiphany-bookmarksbar.xml
@@ -244,6 +243,7 @@ share/locale/dz/LC_MESSAGES/epiphany.mo
 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
@@ -279,6 +279,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
@@ -411,6 +412,10 @@ share/omf/epiphany/epiphany-uk.omf
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -423,6 +428,8 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES
@@ -433,6 +440,12 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES