Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

8 files changed, 42 insertions, 38 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 9db9546d7ccd..c4e8d5625e0a 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.16.6
+PORTVERSION=	2.18.3
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -44,7 +44,7 @@ USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
-CONFIGURE_ARGS=	--enable-static --with-xinput=yes
+CONFIGURE_ARGS=	--enable-static --with-xinput=yes --with-libjasper
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index be741d8cebee..d4f7d977df7b 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.16.6.tar.bz2) = 416412b336d9f3b6b78ca887395d1726
-SHA256 (gnome2/gtk+-2.16.6.tar.bz2) = 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
-SIZE (gnome2/gtk+-2.16.6.tar.bz2) = 18518781
+MD5 (gnome2/gtk+-2.18.3.tar.bz2) = 369e173600efc272131b53b1902679e8
+SHA256 (gnome2/gtk+-2.18.3.tar.bz2) = 1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
+SIZE (gnome2/gtk+-2.18.3.tar.bz2) = 19069010
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 88bfe209d8ae..416fbb3f007e 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	Fri Oct 24 21:47:52 2003
-+++ docs/Makefile.in	Fri Oct 24 23:35:09 2003
-@@ -179,7 +179,7 @@
+--- docs/Makefile.in.orig	2009-09-05 11:12:17.000000000 +0200
++++ docs/Makefile.in	2009-09-05 11:16:52.000000000 +0200
+@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+ LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
  MSGFMT = @MSGFMT@
- MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index a7c07057c598..0a4e1022fa27 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	2008-02-23 10:25:17.000000000 -0500
-+++ docs/reference/Makefile.in	2008-02-23 10:26:36.000000000 -0500
-@@ -372,7 +372,7 @@
+--- docs/reference/Makefile.in.orig	2009-09-05 11:17:44.000000000 +0200
++++ docs/reference/Makefile.in	2009-09-05 11:18:15.000000000 +0200
+@@ -359,7 +359,7 @@ XVFB_START = \
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
- 
 -SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
- subdir = docs/reference
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+ GITIGNOREFILES = */*.1
+ all: all-recursive
+ 
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
index 1bedfdf55f2c..04ce78984f84 100644
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
@@ -1,15 +1,14 @@
---- gdk-pixbuf/Makefile.in.orig	Wed Mar  2 15:56:36 2005
-+++ gdk-pixbuf/Makefile.in	Wed Mar  2 15:57:08 2005
-@@ -519,10 +519,10 @@
- 
- bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
+--- gdk-pixbuf/Makefile.in.orig	2009-09-05 11:19:07.000000000 +0200
++++ gdk-pixbuf/Makefile.in	2009-09-05 11:20:19.000000000 +0200
+@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ test_gdk_pixbuf_LDADD = $(LDADDS)
  gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
 -gdk_pixbuf_csource_LDADD = $(LDADDS)
 +gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
- 
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
 -gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
 +gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
- 
  gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
  
+ #
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 610ece8f33ac..8037cf952ad2 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig	Sat May  6 04:47:11 2006
-+++ gtk/Makefile.in	Sat May  6 04:48:06 2006
-@@ -1009,11 +1009,11 @@ LDADDS = \
- bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+--- gtk/Makefile.in.orig	2009-09-05 11:21:40.000000000 +0200
++++ gtk/Makefile.in	2009-09-05 11:22:57.000000000 +0200
+@@ -1310,9 +1310,9 @@ LDADDS = \
  
+ bin_SCRIPTS = gtk-builder-convert
  gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
- 
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- 
 -gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 +gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
- 
- gtk_update_icon_cache_SOURCES = updateiconcache.c
+ gtk_update_icon_cache_SOURCES = \
+ 	updateiconcache.c 
  
diff --git a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c
index 9003cc7d095e..206257551dbe 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c
+++ b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c
@@ -1,6 +1,6 @@
---- gtk/updateiconcache.c.orig	2008-02-16 11:33:25.000000000 -0500
-+++ gtk/updateiconcache.c	2008-02-16 11:33:33.000000000 -0500
-@@ -1477,7 +1477,7 @@ build_cache (const gchar *path)
+--- gtk/updateiconcache.c.orig	2009-05-11 18:05:35.000000000 +0200
++++ gtk/updateiconcache.c	2009-05-30 12:03:39.000000000 +0200
+@@ -1505,7 +1505,7 @@ opentmp:
    if (!validate_file (tmp_cache_path))
      {
        g_printerr (_("The generated cache was invalid.\n"));
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 830f0e739210..d65ae42f666a 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -110,6 +110,7 @@ include/gtk-2.0/gtk/gtkdnd.h
 include/gtk-2.0/gtk/gtkdrawingarea.h
 include/gtk-2.0/gtk/gtkeditable.h
 include/gtk-2.0/gtk/gtkentry.h
+include/gtk-2.0/gtk/gtkentrybuffer.h
 include/gtk-2.0/gtk/gtkentrycompletion.h
 include/gtk-2.0/gtk/gtkenums.h
 include/gtk-2.0/gtk/gtkeventbox.h
@@ -138,6 +139,7 @@ include/gtk-2.0/gtk/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkicontheme.h
 include/gtk-2.0/gtk/gtkiconview.h
+include/gtk-2.0/gtk/gtkinfobar.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
@@ -413,6 +415,7 @@ share/gtk-2.0/demo/demo.ui
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_buffer.c
 share/gtk-2.0/demo/entry_completion.c
 share/gtk-2.0/demo/expander.c
 share/gtk-2.0/demo/floppybuddy.gif
@@ -430,8 +433,12 @@ share/gtk-2.0/demo/hypertext.c
 share/gtk-2.0/demo/iconview.c
 share/gtk-2.0/demo/iconview_edit.c
 share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/infobar.c
 share/gtk-2.0/demo/list_store.c
+share/gtk-2.0/demo/links.c
 share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/offscreen_window.c
+share/gtk-2.0/demo/offscreen_window2.c
 share/gtk-2.0/demo/panes.c
 share/gtk-2.0/demo/pickers.c
 share/gtk-2.0/demo/pixbufs.c