6 files changed, 81 insertions, 24 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index cef8a3fc3825..f81ad05c167d 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,15 +3,14 @@
 # Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-wm/metacity/Makefile,v 1.124 2008/03/09 23:56:13 marcus Exp $
+#   $MCom: ports/x11-wm/metacity/Makefile,v 1.140 2008/10/08 04:21:46 marcus Exp $
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.22.0
-PORTREVISION=	2
+PORTVERSION=	2.24.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,13 +20,12 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 CONFLICTS=	expocity-[0-9]*
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_XORG=	x11 xcomposite xdamage
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-render
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 06c7549488cf..a6116af821aa 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/metacity-2.24.0.tar.bz2) = d4aa782d5f71b6c42514b239684a4aa3
+SHA256 (gnome2/metacity-2.24.0.tar.bz2) = 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076
+SIZE (gnome2/metacity-2.24.0.tar.bz2) = 2160557
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index bbb9c5e9b0a5..155c6ecfc4a7 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,17 +1,9 @@
---- 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"
--     METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION"
-   fi
- fi ## have_composite
- 
-@@ -31011,7 +31010,7 @@ metacity-$VERSION:
+--- configure.orig	2008-09-23 00:55:36.000000000 -0400
++++ configure	2008-09-23 00:55:52.000000000 -0400
+@@ -31530,7 +31530,7 @@ metacity-$VERSION:
  "
  
- METACITY_MINOR_VERSION=22
+ METACITY_MINOR_VERSION=24
 -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..db73c224f1bd
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_core_main.c
@@ -0,0 +1,51 @@
+--- src/core/main.c.orig	2008-10-08 00:10:39.000000000 -0400
++++ src/core/main.c	2008-10-08 00:18:44.000000000 -0400
+@@ -312,6 +312,23 @@ void meta_select_display (gchar *display
+   /* DO NOT FREE envVar, putenv() sucks */
+   putenv (envVar);
+ }
++
++static
++void meta_finalize (void)
++{
++  meta_display_close (meta_get_display (),
++                      CurrentTime); /* I doubt correct timestamps matter here */
++
++  meta_session_shutdown ();
++}
++
++static
++void sigterm_handler (int signum)
++{
++	meta_finalize ();
++
++	exit (meta_exit_code);
++}
+     
+ /**
+  * This is where the story begins. It parses commandline options and
+@@ -352,6 +369,11 @@ main (int argc, char **argv)
+                 g_strerror (errno));
+ #endif
+ 
++  act.sa_handler = &sigterm_handler;
++  if (sigaction (SIGTERM, &act, NULL) < 0)
++    g_printerr ("Failed to register SIGTERM handler: %s\n",
++		g_strerror (errno));
++
+   if (g_getenv ("METACITY_VERBOSE"))
+     meta_set_verbose (TRUE);
+   if (g_getenv ("METACITY_DEBUG"))
+@@ -478,11 +500,8 @@ main (int argc, char **argv)
+   
+   g_main_loop_run (meta_main_loop);
+ 
+-  meta_display_close (meta_get_display (),
+-                      CurrentTime); /* I doubt correct timestamps matter here */
++  meta_finalize ();
+ 
+-  meta_session_shutdown ();
+-  
+   if (meta_restart_after_quit)
+     {
+       GError *err;
diff --git a/x11-wm/metacity/files/patch-src_core_util.c b/x11-wm/metacity/files/patch-src_core_util.c
new file mode 100644
index 000000000000..b1799e3516d5
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_core_util.c
@@ -0,0 +1,11 @@
+--- src/core/util.c.orig	2008-02-27 05:42:51.000000000 +0100
++++ src/core/util.c	2008-03-21 21:16:14.000000000 +0100
+@@ -23,7 +23,7 @@
+  */
+ 
+ #define _GNU_SOURCE
+-#define _POSIX_C_SOURCE /* for fdopen() */
++#define _POSIX_C_SOURCE 1 /* for fdopen() */
+ 
+ #include <config.h>
+ #include "util.h"
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 0b66d8b5ab3f..9ea1d2734b78 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -15,9 +15,10 @@ 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
-share/gnome/wm-properties/metacity.desktop
+share/gnome/wm-properties/metacity-wm.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
 share/locale/as/LC_MESSAGES/metacity.mo
@@ -56,6 +57,7 @@ share/locale/is/LC_MESSAGES/metacity.mo
 share/locale/it/LC_MESSAGES/metacity.mo
 share/locale/ja/LC_MESSAGES/metacity.mo
 share/locale/ka/LC_MESSAGES/metacity.mo
+share/locale/kn/LC_MESSAGES/metacity.mo
 share/locale/ko/LC_MESSAGES/metacity.mo
 share/locale/ku/LC_MESSAGES/metacity.mo
 share/locale/lt/LC_MESSAGES/metacity.mo
@@ -84,7 +86,7 @@ share/locale/sk/LC_MESSAGES/metacity.mo
 share/locale/sl/LC_MESSAGES/metacity.mo
 share/locale/sq/LC_MESSAGES/metacity.mo
 share/locale/sr/LC_MESSAGES/metacity.mo
-share/locale/sr@Latn/LC_MESSAGES/metacity.mo
+share/locale/sr@latin/LC_MESSAGES/metacity.mo
 share/locale/sv/LC_MESSAGES/metacity.mo
 share/locale/ta/LC_MESSAGES/metacity.mo
 share/locale/th/LC_MESSAGES/metacity.mo
@@ -218,10 +220,13 @@ share/themes/Simple/metacity-1/minimize.png
 @dirrm %%DATADIR%%
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES