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

7 files changed, 29 insertions, 124 deletions

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 827f9b310a47..77c66579ecb3 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libcanberra
-PORTVERSION=	0.10
-PORTREVISION=	5
+PORTVERSION=	0.22
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -20,7 +19,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22 libltdl:22
-CONFIGURE_ARGS=	--disable-lynx
+CONFIGURE_ARGS=	--disable-lynx --disable-tdb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -29,6 +28,8 @@ GCONF_SCHEMAS=	libcanberra.schemas
 OPTIONS=	PULSE "Enable Pulse Audio support" off \
 		GSTREAMER "Enable GStreamer audio support" off
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PULSE)
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 7adb467b8697..f771edecc145 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcanberra-0.10.tar.gz) = 2623370bfcecaeecaeb85e5ec445f340
-SHA256 (libcanberra-0.10.tar.gz) = b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272
-SIZE (libcanberra-0.10.tar.gz) = 826222
+MD5 (libcanberra-0.22.tar.gz) = e24e2f956fedfbcc58edfa40471b18d8
+SHA256 (libcanberra-0.22.tar.gz) = 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
+SIZE (libcanberra-0.22.tar.gz) = 459404
diff --git a/audio/libcanberra/files/patch-Makefile.in b/audio/libcanberra/files/patch-Makefile.in
deleted file mode 100644
index bd5972c313b2..000000000000
--- a/audio/libcanberra/files/patch-Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.in.orig	2008-12-20 13:42:12.000000000 -0500
-+++ Makefile.in	2008-12-20 20:43:22.000000000 -0500
-@@ -271,7 +271,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- dist_doc_DATA = README
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
--SUBDIRS = src gtkdoc libltdl doc
-+SUBDIRS = src gtkdoc doc
- MAINTAINERCLEANFILES = README
- noinst_DATA = README
- pkgconfigdir = $(prefix)/libdata/pkgconfig
-@@ -794,11 +794,11 @@ uninstall-am: uninstall-dist_docDATA uni
- 
- 
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@                if test -z "$(DESTDIR)" ; then \
--@GCONF_SCHEMAS_INSTALL_TRUE@                        for p in $(schemas_DATA) ; do \
--@GCONF_SCHEMAS_INSTALL_TRUE@                                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
--@GCONF_SCHEMAS_INSTALL_TRUE@                        done \
--@GCONF_SCHEMAS_INSTALL_TRUE@                fi
-+@GCONF_SCHEMAS_INSTALL_TRUE@	if test -z "$(DESTDIR)" ; then \
-+@GCONF_SCHEMAS_INSTALL_TRUE@		for p in $(schemas_DATA) ; do \
-+@GCONF_SCHEMAS_INSTALL_TRUE@			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@		done ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@	fi
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
- 
- README:
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure
deleted file mode 100644
index 7d643125157c..000000000000
--- a/audio/libcanberra/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	2008-12-19 19:07:23.000000000 -0500
-+++ configure	2008-12-19 19:08:01.000000000 -0500
-@@ -791,7 +791,6 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--enable_option_checking=no
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- GTK_DOC_USE_LIBTOOL_FALSE
-@@ -878,7 +877,6 @@ USE_VERSION_SCRIPT_FALSE
- USE_VERSION_SCRIPT_TRUE
- OS_IS_WIN32_FALSE
- OS_IS_WIN32_TRUE
--subdirs
- LIBLTDL
- LTDLINCL
- LIBTOOL
-@@ -1054,7 +1052,7 @@ TDB_CFLAGS
- TDB_LIBS
- VORBIS_CFLAGS
- VORBIS_LIBS'
--ac_subdirs_all='libltdl'
-+
- 
- # Initialize some variables set by options.
- ac_init_help=
diff --git a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in b/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
deleted file mode 100644
index c779f3f6e450..000000000000
--- a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 14 Dec 2008 22:04:01 +0100
-Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session
-
-There is no need to make g-s wait for this lc-l-s when it plays the
-welcome tune. Hence move it to "Application" phase instead of "Desktop"
-phase.
-
-This is a result of a discussion with Behdad Esfahbod to optimize the
-login time.
----
- src/libcanberra-login-sound.desktop.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
-index 5b4cf7f..9fcf357 100644
---- src/libcanberra-login-sound.desktop.in
-+++ src/libcanberra-login-sound.desktop.in
-@@ -4,6 +4,6 @@ Name=GNOME Login Sound
- Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
- OnlyShowIn=GNOME;
- AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
--X-GNOME-Autostart-Phase=Desktop
-+X-GNOME-Autostart-Phase=Application
- X-GNOME-Provides=login-sound
- X-GNOME-Autostart-Notify=true
--- 
-1.6.0.5
-
diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c
index ec8bdc3c4011..d4b910a3c0a8 100644
--- a/audio/libcanberra/files/patch-src_oss.c
+++ b/audio/libcanberra/files/patch-src_oss.c
@@ -1,15 +1,6 @@
---- src/oss.c.orig	2008-09-01 19:53:47.000000000 -0400
-+++ src/oss.c	2008-12-21 13:51:09.000000000 -0500
-@@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc
-     ca_return_val_if_fail(c, CA_ERROR_INVALID);
-     ca_return_val_if_fail(c->private, CA_ERROR_STATE);
-     ca_return_val_if_fail(out, CA_ERROR_INVALID);
--    ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) > 2, CA_ERROR_NOTSUPPORTED);
-+    ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
- 
-     p = PRIVATE(c);
- 
-@@ -258,7 +258,7 @@ static int open_oss(ca_context *c, struc
+--- src/oss.c.orig	2009-08-26 21:58:16.000000000 -0400
++++ src/oss.c	2009-11-25 20:47:07.000000000 -0500
+@@ -260,7 +260,7 @@ static int open_oss(ca_context *c, struc
              val = AFMT_S16_NE;
              break;
          case CA_SAMPLE_S16RE:
@@ -18,11 +9,3 @@
              val = AFMT_S16_BE;
  #else
              val = AFMT_S16_LE;
-@@ -423,6 +423,7 @@ int driver_play(ca_context *c, uint32_t 
-     out->callback = cb;
-     out->userdata = userdata;
-     out->pipe_fd[0] = out->pipe_fd[1] = -1;
-+    out->pcm = -1;
- 
-     if (pipe(out->pipe_fd) < 0) {
-         ret = CA_ERROR_SYSTEM;
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
index 816a75992ec4..e32487a18e5e 100644
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -15,18 +15,18 @@ lib/libcanberra.so.0
 %%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.a
 %%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.la
 %%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.so
-lib/libcanberra/libcanberra-multi.a
-lib/libcanberra/libcanberra-multi.la
-lib/libcanberra/libcanberra-multi.so
-lib/libcanberra/libcanberra-null.a
-lib/libcanberra/libcanberra-null.la
-lib/libcanberra/libcanberra-null.so
-lib/libcanberra/libcanberra-oss.a
-lib/libcanberra/libcanberra-oss.la
-lib/libcanberra/libcanberra-oss.so
-%%PULSE%%lib/libcanberra/libcanberra-pulse.a
-%%PULSE%%lib/libcanberra/libcanberra-pulse.la
-%%PULSE%%lib/libcanberra/libcanberra-pulse.so
+lib/libcanberra-%%VERSION%%/libcanberra-multi.a
+lib/libcanberra-%%VERSION%%/libcanberra-multi.la
+lib/libcanberra-%%VERSION%%/libcanberra-multi.so
+lib/libcanberra-%%VERSION%%/libcanberra-null.a
+lib/libcanberra-%%VERSION%%/libcanberra-null.la
+lib/libcanberra-%%VERSION%%/libcanberra-null.so
+lib/libcanberra-%%VERSION%%/libcanberra-oss.a
+lib/libcanberra-%%VERSION%%/libcanberra-oss.la
+lib/libcanberra-%%VERSION%%/libcanberra-oss.so
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.a
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.la
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
 libdata/pkgconfig/libcanberra-gtk.pc
 libdata/pkgconfig/libcanberra.pc
 %%DOCSDIR%%/README
@@ -42,8 +42,14 @@ libdata/pkgconfig/libcanberra.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
+share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 share/gnome/autostart/libcanberra-login-sound.desktop
 share/gnome/shutdown/libcanberra-logout-sound.sh
+share/vala/vapi/libcanberra-gtk.vapi
+share/vala/vapi/libcanberra.vapi
 @dirrmtry share/gnome/shutdown
+@dirrmtry share/gdm/autostart/LoginWindow
+@dirrmtry share/gdm/autostart
+@dirrmtry share/gdm
 @dirrm %%DOCSDIR%%
-@dirrm lib/libcanberra
+@dirrm lib/libcanberra-%%VERSION%%