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

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

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

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

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore

And pav@ for 2 exp-runs

PR:		ports/152255
		ports/143260
		ports/141033
		ports/149629
		ports/150350
		ports/151523
With hat:	gnome@

5 files changed, 51 insertions, 23 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d8b0d1318066..d1cc19002abe 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.228 2010/05/09 00:11:47 marcus Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.240 2010/10/10 19:16:00 marcus Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.30.2
+PORTVERSION=	2.30.6
 PORTREVISION?=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
@@ -20,8 +20,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 		${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 \
+		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
 		notify.1:${PORTSDIR}/devel/libnotify \
-		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
@@ -49,8 +50,8 @@ 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 (JavaScript) support" on \
-		SPELLCHECK "Enable spell checking by default" on
+		SPELLCHECK "Enable spell checking by default" on \
+		SEED "Enable seed (JavaScript) support" off \
 
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 055b312cf580..89469ba78b54 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/epiphany-2.30.6.tar.bz2) = 0c566b3ffd428d2135e3c8cb65352d64
+SHA256 (gnome2/epiphany-2.30.6.tar.bz2) = 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
+SIZE (gnome2/epiphany-2.30.6.tar.bz2) = 5927938
diff --git a/www/epiphany/files/patch-embed_ephy-embed-prefs.c b/www/epiphany/files/patch-embed_ephy-embed-prefs.c
index 2f361fc443b8..197a264783c2 100644
--- a/www/epiphany/files/patch-embed_ephy-embed-prefs.c
+++ b/www/epiphany/files/patch-embed_ephy-embed-prefs.c
@@ -6,7 +6,7 @@
    /* Update Soup session */
 -  session = webkit_get_default_session ();
 -  g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
-+  if (strlen (langs_str) > 0) {
++  if (langs_str != NULL && strlen (langs_str) > 0) {
 +      session = webkit_get_default_session ();
 +      g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
 +  }
diff --git a/www/epiphany/files/patch-src_Makefile.in b/www/epiphany/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..2d715ad69703
--- /dev/null
+++ b/www/epiphany/files/patch-src_Makefile.in
@@ -0,0 +1,26 @@
+--- src/Makefile.in.orig	2010-10-04 21:25:05.000000000 +0000
++++ src/Makefile.in	2010-10-04 21:29:36.000000000 +0000
+@@ -1584,8 +1584,10 @@
+ @HAVE_INTROSPECTION_TRUE@Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
+ @HAVE_INTROSPECTION_TRUE@                                      $(EPHY_GIR_C_FILES) epiphany
+ @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+-@HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_SCANNER) -v \
+-@HAVE_INTROSPECTION_TRUE@		--namespace Epiphany \
++@HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_SCANNER) -v --warn-all \
++@HAVE_INTROSPECTION_TRUE@		--identifier-prefix=Ephy \
++@HAVE_INTROSPECTION_TRUE@		--symbol-prefix=ephy \
++@HAVE_INTROSPECTION_TRUE@		--namespace=Epiphany \
+ @HAVE_INTROSPECTION_TRUE@		--nsversion=$(EPIPHANY_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@		--add-include-path=. \
+ @HAVE_INTROSPECTION_TRUE@		--add-include-path=$(srcdir) \
+@@ -1593,8 +1595,8 @@
+ @HAVE_INTROSPECTION_TRUE@		--include=libxml2-2.0 \
+ @HAVE_INTROSPECTION_TRUE@		--include=WebKit-1.0 \
+ @HAVE_INTROSPECTION_TRUE@		--program=./epiphany \
+-@HAVE_INTROSPECTION_TRUE@		--output $@ \
+-@HAVE_INTROSPECTION_TRUE@		--pkg epiphany-$(EPIPHANY_API_VERSION) \
++@HAVE_INTROSPECTION_TRUE@		--output=$@ \
++@HAVE_INTROSPECTION_TRUE@		--pkg=epiphany-$(EPIPHANY_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@		-DEPIPHANY_COMPILATION \
+ @HAVE_INTROSPECTION_TRUE@		-I$(top_srcdir)/embed \
+ @HAVE_INTROSPECTION_TRUE@		-I$(top_srcdir)/lib \
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index ed5adcca9d3a..c14e43c94c51 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -40,26 +40,26 @@ share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
 lib/girepository-1.0/Epiphany-2.30.typelib
 share/gir-1.0/Epiphany-2.30.gir
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
+%%DOCSDIR%%/EphyDialog.html
+%%DOCSDIR%%/EphyLocationAction.html
 %%DOCSDIR%%/EphyLocationEntry.html
-%%DOCSDIR%%/EphyNodeDb.html
+%%DOCSDIR%%/EphyNodeView.html
 %%DOCSDIR%%/EphySearchEntry.html
 %%DOCSDIR%%/EphySpinner.html
+%%DOCSDIR%%/EphyStatusbar.html
+%%DOCSDIR%%/EphyToolbar.html
+%%DOCSDIR%%/EphyTreeModelNode.html
+%%DOCSDIR%%/EphyTreeModelSort.html
+%%DOCSDIR%%/EphyWebView.html
 %%DOCSDIR%%/EphyWindow.html
+%%DOCSDIR%%/EphyZoomAction.html
 %%DOCSDIR%%/EphyZoomControl.html
+%%DOCSDIR%%/annotation-glossary.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
-%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
-%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
-%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
-%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
+%%DOCSDIR%%/epiphany-Epiphany-Debug-Helpers.html
+%%DOCSDIR%%/epiphany-Epiphany-File-Helpers.html
 %%DOCSDIR%%/epiphany.devhelp
 %%DOCSDIR%%/epiphany.devhelp2
 %%DOCSDIR%%/home.png
@@ -222,6 +222,7 @@ share/icons/hicolor/32x32/apps/gnome-web-browser.png
 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/an/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
 share/locale/as/LC_MESSAGES/epiphany.mo
 share/locale/ast/LC_MESSAGES/epiphany.mo
@@ -400,8 +401,6 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrmtry %%DATADIR%%
 @dirrmtry %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry lib/girepository-1.0
-@dirrmtry share/gir-1.0
 @dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
 @dirrmtry lib/epiphany/%%EPHY_VERSION%%
 @dirrmtry lib/epiphany
@@ -458,3 +457,5 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an