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

5 files changed, 36 insertions, 13 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 41c6cbaba1bb..e1f82f0c14cc 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-wm/metacity/Makefile,v 1.145 2009/03/26 17:34:42 marcus Exp $
+#   $MCom: ports/x11-wm/metacity/Makefile,v 1.151 2009/09/22 20:27:27 kwm Exp $
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.26.0
-PORTREVISION=	1
+PORTVERSION=	2.28.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,10 +16,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A window manager for the adult in you
 
 BUILD_DEPENDS=  zenity:${PORTSDIR}/x11/zenity
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+    		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=    zenity:${PORTSDIR}/x11/zenity
 
-CONFLICTS=	expocity-[0-9]*
 USE_BZIP2=	yes
 USE_XORG=	x11 xcomposite xdamage
 USE_GETTEXT=	yes
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 092049327eaa..3cdf65382e0e 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.26.0.tar.bz2) = eafb624e79fbcdab6da59acc222430b1
-SHA256 (gnome2/metacity-2.26.0.tar.bz2) = 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078
-SIZE (gnome2/metacity-2.26.0.tar.bz2) = 2289848
+MD5 (gnome2/metacity-2.28.0.tar.bz2) = 9d87e390cf9979978f2290aebc41f83b
+SHA256 (gnome2/metacity-2.28.0.tar.bz2) = 0621553a6f21fcf40c5dc4c7907b5745c6d853e6b7637bb45b863ec39f595545
+SIZE (gnome2/metacity-2.28.0.tar.bz2) = 2288241
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index dc37d41d93d6..e05059e0ae57 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig	2009-03-17 18:59:17.000000000 +0100
-+++ configure	2009-03-17 19:00:03.000000000 +0100
-@@ -23806,7 +23806,7 @@
+--- configure.orig	2009-09-22 22:18:43.000000000 +0200
++++ configure	2009-09-22 22:19:29.000000000 +0200
+@@ -18211,7 +18211,7 @@ metacity-$VERSION:
  "
  
- METACITY_MINOR_VERSION=26
+ METACITY_MINOR_VERSION=28
 -if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
 +if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then
     stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
diff --git a/x11-wm/metacity/files/patch-src_core_main.c b/x11-wm/metacity/files/patch-src_core_main.c
new file mode 100644
index 000000000000..a88ecf2af527
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_core_main.c
@@ -0,0 +1,24 @@
+--- src/core/main.c.orig	2009-09-08 16:55:35.000000000 -0400
++++ src/core/main.c	2009-10-02 23:36:53.000000000 -0400
+@@ -58,7 +58,11 @@
+ 
+ #include <stdlib.h>
+ #include <sys/types.h>
++#ifdef __linux__
+ #include <wait.h>
++#else
++#include <sys/wait.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
+@@ -378,6 +382,9 @@ sigterm_handler (int signum)
+ }
+ 
+ static guint sigchld_signal_id = 0;
++#ifndef CLD_EXITED
++#define CLD_EXITED 1
++#endif
+ 
+ static void
+ sigchld_handler (int signum, siginfo_t *info, void *context)
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 82b209e925f7..4e15080e2fa5 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -14,7 +14,6 @@ lib/libmetacity-private.la
 lib/libmetacity-private.so
 lib/libmetacity-private.so.0
 libdata/pkgconfig/libmetacity-private.pc
-libexec/metacity-dialog
 share/applications/metacity.desktop
 share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
 share/gnome-control-center/keybindings/50-metacity-key.xml
@@ -30,6 +29,7 @@ share/locale/be@latin/LC_MESSAGES/metacity.mo
 share/locale/bg/LC_MESSAGES/metacity.mo
 share/locale/bn/LC_MESSAGES/metacity.mo
 share/locale/bn_IN/LC_MESSAGES/metacity.mo
+share/locale/br/LC_MESSAGES/metacity.mo
 share/locale/bs/LC_MESSAGES/metacity.mo
 share/locale/ca/LC_MESSAGES/metacity.mo
 share/locale/ca@valencia/LC_MESSAGES/metacity.mo