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@

23 files changed, 188 insertions, 63 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index fcc316e0c0ea..770393fa2e1d 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.125 2010/04/02 20:47:49 kwm Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.132 2010/09/19 15:40:33 kwm Exp $
 #
 
 PORTNAME=	epiphany-extensions
-PORTVERSION=	2.30.1
+PORTVERSION=	2.30.2
 PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 81cd87b8dd86..ef2a5cf705cb 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.30.1.tar.bz2) = 7553dcdf452dc8f310d33d58aa825925
-SHA256 (gnome2/epiphany-extensions-2.30.1.tar.bz2) = 2f91b34e5854df382bb30bf93ae469490a5321d1ad006ff45032e3127eddb63d
-SIZE (gnome2/epiphany-extensions-2.30.1.tar.bz2) = 1565963
+MD5 (gnome2/epiphany-extensions-2.30.2.tar.bz2) = 4ee9beee4bfd8a588a6821e164c48b3d
+SHA256 (gnome2/epiphany-extensions-2.30.2.tar.bz2) = bdd0aad473262f2ac780d34c09644d0dd0066cb01f2cc66b3d200b946fd2db27
+SIZE (gnome2/epiphany-extensions-2.30.2.tar.bz2) = 1565280
diff --git a/www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c b/www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c
new file mode 100644
index 000000000000..7131e43328fa
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c
@@ -0,0 +1,22 @@
+--- extensions/adblock/adblock-ui.c.orig	2010-08-19 08:56:01.000000000 +0200
++++ extensions/adblock/adblock-ui.c	2010-08-19 08:56:39.000000000 +0200
+@@ -65,7 +65,7 @@
+ struct _AdblockUIPrivate
+ {
+ 	GtkWidget *dialog;
+-	GtkNotebook *notebook;
++	GtkWidget *notebook;
+ 
+ 	/* Pages */
+ 	InfoPage *pages[LAST_PAGE];
+@@ -347,8 +347,8 @@
+ }
+ 
+ static void
+-adblock_ui_switch_page (GtkNotebook *notebook,
+-			GtkNotebookPage *page,
++adblock_ui_switch_page (GtkWidget *notebook,
++			GtkWidget *page,
+ 			guint page_num,
+ 			AdblockUI *dialog)
+ {
diff --git a/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c b/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c
new file mode 100644
index 000000000000..50ea0b3d3a4e
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c
@@ -0,0 +1,13 @@
+--- extensions/adblock/ephy-adblock-extension.c.orig	2010-08-19 08:54:27.000000000 +0200
++++ extensions/adblock/ephy-adblock-extension.c	2010-08-19 08:54:54.000000000 +0200
+@@ -385,8 +385,8 @@ ephy_adblock_extension_edit_cb (GtkActio
+ }
+ 
+ static void
+-switch_page_cb (GtkNotebook *notebook,
+-		GtkNotebookPage *page,
++switch_page_cb (GtkWidget *notebook,
++		GtkWidget *page,
+ 		guint page_num,
+ 		EphyWindow *window)
+ {
diff --git a/www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c b/www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c
new file mode 100644
index 000000000000..129157887c52
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c
@@ -0,0 +1,22 @@
+--- extensions/permissions/ephy-permissions-dialog.c.orig	2010-08-19 09:05:33.000000000 +0200
++++ extensions/permissions/ephy-permissions-dialog.c	2010-08-19 09:05:58.000000000 +0200
+@@ -56,7 +56,7 @@ struct EphyPermissionsDialogPrivate
+ {
+ 	EphyPermissionManager *manager;
+ 	GList *tabs;
+-	GtkNotebook *notebook;
++	GtkWidget *notebook;
+ 	GtkSizeGroup *buttons_size_group;
+ };
+ 
+@@ -219,8 +219,8 @@ fill_tab (DialogTab *tab)
+ }
+ 
+ static void
+-sync_notebook_tab (GtkNotebook *notebook,
+-		   GtkNotebookPage *page,
++sync_notebook_tab (GtkWidget *notebook,
++		   GtkWidget *page,
+ 		   int page_num,
+ 		   EphyPermissionsDialog *dialog)
+ {
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
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 30693567e868..4f107af21381 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@rainbow-runner.nl>
 #
 # $FreeBSD$
-#   $MCom: ports/www/evolution-webcal/Makefile,v 1.66 2010/04/01 12:38:24 kwm Exp $
+#   $MCom: ports/www/evolution-webcal/Makefile,v 1.69 2010/09/29 12:56:07 kwm Exp $
 #
 
 PORTNAME=	evolution-webcal
-PORTVERSION=	2.28.1
-PORTREVISION=	1
+PORTVERSION=	2.32.0
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 8a4d1a0f3f74..1da8895a4d94 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.28.1.tar.bz2) = c5bdefc1ad9128dab4fc2ec2e86ef07d
-SHA256 (evolution-webcal-2.28.1.tar.bz2) = eeff6d0c9f45647ee1bc19585fd17f81caa87e99b95501f87d7ab1cdac1060c1
-SIZE (evolution-webcal-2.28.1.tar.bz2) = 162470
+MD5 (evolution-webcal-2.32.0.tar.bz2) = eec3c2464b18853fd03ebb4da1a69031
+SHA256 (evolution-webcal-2.32.0.tar.bz2) = b6ae8a105665771c4069be96d67e0c10f13e01417805cb3a1900c397c9bd580c
+SIZE (evolution-webcal-2.32.0.tar.bz2) = 163816
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 046c9e4b6c73..e839181c1bc1 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gnome-user-share/Makefile,v 1.21 2010/04/01 21:10:51 kwm Exp $
+#   $MCom: ports/www/gnome-user-share/Makefile,v 1.23 2010/09/28 08:52:36 kwm Exp $
 #
 
 PORTNAME=	gnome-user-share
-PORTVERSION=	2.30.0
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index c0d7485256ba..741941d9dacf 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-2.30.0.tar.bz2) = a736a1bebc1782d3d6e7a7239158f189
-SHA256 (gnome2/gnome-user-share-2.30.0.tar.bz2) = 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163
-SIZE (gnome2/gnome-user-share-2.30.0.tar.bz2) = 944583
+MD5 (gnome2/gnome-user-share-2.30.1.tar.bz2) = 532f3d310ec9b42bf2dd015ab5b64092
+SHA256 (gnome2/gnome-user-share-2.30.1.tar.bz2) = 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
+SIZE (gnome2/gnome-user-share-2.30.1.tar.bz2) = 959747
diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure
index 27fe70c56841..7c2899da0167 100644
--- a/www/gnome-user-share/files/patch-configure
+++ b/www/gnome-user-share/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-03-16 13:46:47.000000000 +0100
-+++ configure	2010-03-16 13:46:47.000000000 +0100
-@@ -13261,12 +13261,12 @@
+--- configure.orig	2010-09-28 10:42:29.000000000 +0000
++++ configure	2010-09-28 10:43:25.000000000 +0000
+@@ -13411,12 +13411,12 @@
      pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -16,7 +16,7 @@
  else
    pkg_failed=yes
  fi
-@@ -13277,12 +13277,12 @@
+@@ -13427,12 +13427,12 @@
      pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -32,7 +32,7 @@
  else
    pkg_failed=yes
  fi
-@@ -13300,14 +13300,14 @@
+@@ -13452,14 +13452,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -45,8 +45,8 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$USER_SHARE_PKG_ERRORS" >&5
  
--	as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
-+	as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
+-	as_fn_error $? "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
++	as_fn_error $? "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
  
  $USER_SHARE_PKG_ERRORS
  
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 6423483af4d5..609b8dd2395c 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -84,6 +84,7 @@ share/locale/ast/LC_MESSAGES/gnome-user-share.mo
 share/locale/bg/LC_MESSAGES/gnome-user-share.mo
 share/locale/bn/LC_MESSAGES/gnome-user-share.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo
+share/locale/br/LC_MESSAGES/gnome-user-share.mo
 share/locale/ca/LC_MESSAGES/gnome-user-share.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-user-share.mo
 share/locale/cs/LC_MESSAGES/gnome-user-share.mo
@@ -94,6 +95,7 @@ share/locale/el/LC_MESSAGES/gnome-user-share.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-user-share.mo
 share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo
 share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo
+share/locale/eo/LC_MESSAGES/gnome-user-share.mo
 share/locale/eu/LC_MESSAGES/gnome-user-share.mo
 share/locale/es/LC_MESSAGES/gnome-user-share.mo
 share/locale/et/LC_MESSAGES/gnome-user-share.mo
@@ -105,6 +107,7 @@ share/locale/gu/LC_MESSAGES/gnome-user-share.mo
 share/locale/he/LC_MESSAGES/gnome-user-share.mo
 share/locale/hi/LC_MESSAGES/gnome-user-share.mo
 share/locale/hu/LC_MESSAGES/gnome-user-share.mo
+share/locale/id/LC_MESSAGES/gnome-user-share.mo
 share/locale/it/LC_MESSAGES/gnome-user-share.mo
 share/locale/ja/LC_MESSAGES/gnome-user-share.mo
 share/locale/kn/LC_MESSAGES/gnome-user-share.mo
@@ -118,6 +121,7 @@ share/locale/mr/LC_MESSAGES/gnome-user-share.mo
 share/locale/nb/LC_MESSAGES/gnome-user-share.mo
 share/locale/ne/LC_MESSAGES/gnome-user-share.mo
 share/locale/nl/LC_MESSAGES/gnome-user-share.mo
+share/locale/nn/LC_MESSAGES/gnome-user-share.mo
 share/locale/oc/LC_MESSAGES/gnome-user-share.mo
 share/locale/or/LC_MESSAGES/gnome-user-share.mo
 share/locale/pa/LC_MESSAGES/gnome-user-share.mo
@@ -137,6 +141,7 @@ share/locale/ta/LC_MESSAGES/gnome-user-share.mo
 share/locale/te/LC_MESSAGES/gnome-user-share.mo
 share/locale/th/LC_MESSAGES/gnome-user-share.mo
 share/locale/tr/LC_MESSAGES/gnome-user-share.mo
+share/locale/ug/LC_MESSAGES/gnome-user-share.mo
 share/locale/uk/LC_MESSAGES/gnome-user-share.mo
 share/locale/vi/LC_MESSAGES/gnome-user-share.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo
@@ -181,6 +186,8 @@ share/omf/gnome-user-share/gnome-user-share-zh_CN.omf
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index cbaee3d3933b..eda3d7c5e73b 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.9 2010/06/22 20:20:38 kwm Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.177 2010/11/15 16:59:05 kwm Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.30.3
+PORTVERSION=	3.32.1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,7 +28,7 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -39,7 +39,8 @@ PLIST_SUB=	VERSION="3.14"
 post-patch:
 	@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
 	    	${WRKSRC}/intltool-merge.in
-	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g ; \
+	    	s|-DGDK_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 78d2c84e0067..59301a05e64f 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtkhtml-3.30.3.tar.bz2) = 0d11cebd0f1fe25435ab00d7cd26df7b
-SHA256 (gnome2/gtkhtml-3.30.3.tar.bz2) = 99795c154f1c6459063bb8018066ad46baf086a2419510ed959167d4d9e35fae
-SIZE (gnome2/gtkhtml-3.30.3.tar.bz2) = 1354771
+SHA256 (gnome2/gtkhtml-3.32.1.tar.bz2) = 78b6da6c1f4f61947f77de505a626a028ee3ecb6ad3c7c06cc4a6273e16d95c6
+SIZE (gnome2/gtkhtml-3.32.1.tar.bz2) = 1196875
diff --git a/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c b/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c
new file mode 100644
index 000000000000..ec390b5d8173
--- /dev/null
+++ b/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c
@@ -0,0 +1,13 @@
+--- components/editor/gtkhtml-spell-dialog.c.orig	2010-09-19 17:57:00.000000000 +0000
++++ components/editor/gtkhtml-spell-dialog.c	2010-09-19 17:57:41.000000000 +0000
+@@ -443,7 +443,9 @@ spell_dialog_init (GtkhtmlSpellDialog *d
+ 
+ 	gtk_dialog_add_button (
+ 		GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++#if !GTK_CHECK_VERSION(2,90,7)
++	g_object_set (dialog, "has-separator", FALSE, NULL);
++#endif
+ 	gtk_window_set_title (GTK_WINDOW (dialog), _("Spell Checker"));
+ 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ 
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 919730fbe361..3a36ed5b8cbf 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -19,11 +19,11 @@ lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.la
 lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.19
-lib/libgtkhtml-editor.a
-lib/libgtkhtml-editor.la
-lib/libgtkhtml-editor.so
-lib/libgtkhtml-editor.so.0
-libdata/pkgconfig/gtkhtml-editor.pc
+lib/libgtkhtml-editor-%%VERSION%%.a
+lib/libgtkhtml-editor-%%VERSION%%.la
+lib/libgtkhtml-editor-%%VERSION%%.so
+lib/libgtkhtml-editor-%%VERSION%%.so.0
+libdata/pkgconfig/gtkhtml-editor-%%VERSION%%.pc
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gtkhtml-%%VERSION%%/gtkhtml-editor-builder.ui
 share/gtkhtml-%%VERSION%%/gtkhtml-editor-manager.ui
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index 42d344a2c9a6..fb74b1982399 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -24,6 +24,7 @@ USE_AUTOTOOLS=	libtool:22
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-nostdinc++||g ; \
+		 s|-DGTK_DISABLE_DEPRECATED||g ; \
 		 s|-Werror -ansi||g ; \
 		 s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure
 
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 1ff75ed332fc..e791d29bc59f 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/www/webkit-gtk2/Makefile,v 1.1 2010/07/14 13:43:27 kwm Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.70 2010/10/20 12:46:17 kwm Exp $
 #
 
 PORTNAME=	webkit
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/
 PKGNAMESUFFIX=	-gtk2
@@ -16,13 +17,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An opensource browser engine
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
+		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant \
 		curl.6:${PORTSDIR}/ftp/curl \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
 
 USE_GETTEXT=	yes
 WANT_GSTREAMER=	yes
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir b/www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir
new file mode 100644
index 000000000000..8a13bac74d97
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir
@@ -0,0 +1,22 @@
+--- WebKit/gtk/JSCore-1.0.gir.orig	2010-09-19 16:07:49.000000000 +0000
++++ WebKit/gtk/JSCore-1.0.gir	2010-09-19 16:08:26.000000000 +0000
+@@ -1,12 +1,14 @@
+ <?xml version="1.0"?>
+-<repository version="1.0"
++<repository version="1.2"
+             xmlns="http://www.gtk.org/introspection/core/1.0"
+             xmlns:c="http://www.gtk.org/introspection/c/1.0">
+   <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
+-    <alias name="GlobalContextRef"
+-           target="none"
+-           c:type="JSGlobalContextRef"/>
+-    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
++    <alias name="GlobalContextRef" target="none">
++      <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
++    </alias>
++    <alias name="ObjectRef" target="none">
++      <type name="JSObjectRef" c:type="JSObjectRef"/>
++    </alias>
+     <function name="EvaluateScript" c:identifier="JSEvaluateScript">
+       <return-value transfer-ownership="none">
+         <type name="none" c:type="void"/>