The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

5 files changed, 21 insertions, 36 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 49328678402d..28669172fa31 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-wm/metacity/Makefile,v 1.1 2007/12/02 03:21:33 mezz Exp $
+#   $MCom: ports/x11-wm/metacity/Makefile,v 1.124 2008/03/09 23:56:13 marcus Exp $
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.20.2
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,7 +24,7 @@ USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack
+USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-render
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index fce962ad5ac7..06c7549488cf 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.20.2.tar.bz2) = 3b986030629860674b219fc35c226b1b
-SHA256 (gnome2/metacity-2.20.2.tar.bz2) = 69f292f92895bb4f915a0547e44b7682577f9c168aea3638ccfc4bba8bb6aabe
-SIZE (gnome2/metacity-2.20.2.tar.bz2) = 2035610
+MD5 (gnome2/metacity-2.22.0.tar.bz2) = 8cb6d02cf66a1003532b4f5d2754d696
+SHA256 (gnome2/metacity-2.22.0.tar.bz2) = 3c670b41a214311006dc05f9a005696b9d3fdcb5c80f1275367416600103b3bf
+SIZE (gnome2/metacity-2.22.0.tar.bz2) = 2071931
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index f38f1ce514c1..bbb9c5e9b0a5 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-16 11:47:50.000000000 -0400
-+++ configure	2007-09-16 11:48:17.000000000 -0400
-@@ -28087,7 +28087,6 @@
+--- configure.orig	2008-03-09 19:48:04.000000000 -0400
++++ configure	2008-03-09 19:48:24.000000000 -0400
+@@ -26539,7 +26539,6 @@ echo "${ECHO_T}$have_xrender" >&6; }
  
    if test x$have_xrender = xyes; then
       echo "Building with Render"
@@ -8,10 +8,10 @@
    fi
  fi ## have_composite
  
-@@ -33175,7 +33174,7 @@
+@@ -31011,7 +31010,7 @@ metacity-$VERSION:
  "
  
- METACITY_MINOR_VERSION=20
+ METACITY_MINOR_VERSION=22
 -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_window-props.c b/x11-wm/metacity/files/patch-src_window-props.c
deleted file mode 100644
index e32aacf7ffa7..000000000000
--- a/x11-wm/metacity/files/patch-src_window-props.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/window-props.c.orig	Wed Dec 14 09:27:03 2005
-+++ src/window-props.c	Wed Dec 14 09:28:57 2005
-@@ -20,6 +20,7 @@
-  * 02111-1307, USA.
-  */
- 
-+#include <sys/param.h>
- #include <config.h>
- #include "window-props.h"
- #include "xprops.h"
-@@ -194,6 +195,7 @@ reload_net_wm_user_time (MetaWindow    *
- }
- 
- #define MAX_TITLE_LENGTH 512
-+#define HOST_NAME_MAX MAXHOSTNAMELEN
- 
- /**
-  * Called by set_window_title and set_icon_title to set the value of
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index bfd30f331423..0b66d8b5ab3f 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -20,6 +20,7 @@ share/gnome-control-center/keybindings/50-metacity-key.xml
 share/gnome/wm-properties/metacity.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
+share/locale/as/LC_MESSAGES/metacity.mo
 share/locale/az/LC_MESSAGES/metacity.mo
 share/locale/be/LC_MESSAGES/metacity.mo
 share/locale/be@latin/LC_MESSAGES/metacity.mo
@@ -200,19 +201,19 @@ share/themes/Simple/metacity-1/maximized.png
 share/themes/Simple/metacity-1/metacity-theme-1.xml
 share/themes/Simple/metacity-1/minimize.png
 @dirrm share/themes/Simple/metacity-1
-@dirrm share/themes/Simple
+@dirrmtry share/themes/Simple
 @dirrm share/themes/Metabox/metacity-1
-@dirrm share/themes/Metabox
+@dirrmtry share/themes/Metabox
 @dirrm share/themes/Esco/metacity-1
-@dirrm share/themes/Esco
+@dirrmtry share/themes/Esco
 @dirrm share/themes/Crux/metacity-1
-@dirrm share/themes/Crux
+@dirrmtry share/themes/Crux
 @dirrm share/themes/Bright/metacity-1
-@dirrm share/themes/Bright
+@dirrmtry share/themes/Bright
 @dirrm share/themes/Atlanta/metacity-1
-@dirrm share/themes/Atlanta
+@dirrmtry share/themes/Atlanta
 @dirrm share/themes/AgingGorilla/metacity-1
-@dirrm share/themes/AgingGorilla
+@dirrmtry share/themes/AgingGorilla
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
 @dirrm include/metacity-1/metacity-private
@@ -241,3 +242,5 @@ share/themes/Simple/metacity-1/minimize.png
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as