12 files changed, 288 insertions, 15 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 9d1e012e222a..9fe97eae6574 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -83,6 +83,7 @@
     SUBDIR += matwm2
     SUBDIR += metacity
     SUBDIR += musca
+    SUBDIR += mutter
     SUBDIR += nickleby
     SUBDIR += obconf
     SUBDIR += obmenu
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 61df6dcf9b67..0689520579b3 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	compiz
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -83,7 +83,8 @@ DESKTOP_ENTRIES=	"Compiz Manager" \
 			false
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|libpng|libpng12|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager
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
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
new file mode 100644
index 000000000000..b813b829eb6a
--- /dev/null
+++ b/x11-wm/mutter/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:   mutter
+# Date created:        14 Aug 2009
+# Whom:                Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-wm/mutter/Makefile,v 1.6 2009/10/07 22:59:24 kwm Exp $
+#
+
+PORTNAME=	mutter
+PORTVERSION=	2.28.0
+CATEGORIES=	x11-wm
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Window and compositing manager based on Clutter
+
+BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+		${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+		clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+		${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+
+USE_BZIP2=	yes
+USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:22
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	mutter.schemas
+
+MAN1=		mutter-message.1 mutter-theme-viewer.1 \
+		mutter-window-demo.1 mutter.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Werror||g' \
+	    	${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo
new file mode 100644
index 000000000000..e668aca176f2
--- /dev/null
+++ b/x11-wm/mutter/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/mutter-2.28.0.tar.bz2) = 3926895782024cff7af7ca480df46b4f
+SHA256 (gnome2/mutter-2.28.0.tar.bz2) = f1917172fa4fa622dcc2aa1d82a6c4796c2981566a5c9dc1df7da2a38cd8da80
+SIZE (gnome2/mutter-2.28.0.tar.bz2) = 1986736
diff --git a/x11-wm/mutter/files/patch-src_core_main.c b/x11-wm/mutter/files/patch-src_core_main.c
new file mode 100644
index 000000000000..9980fe9099c6
--- /dev/null
+++ b/x11-wm/mutter/files/patch-src_core_main.c
@@ -0,0 +1,14 @@
+--- src/core/main.c.orig	2009-08-14 00:40:56.000000000 +0000
++++ src/core/main.c	2009-08-14 00:41:22.000000000 +0000
+@@ -59,7 +59,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>
diff --git a/x11-wm/mutter/pkg-descr b/x11-wm/mutter/pkg-descr
new file mode 100644
index 000000000000..54c14b743c7e
--- /dev/null
+++ b/x11-wm/mutter/pkg-descr
@@ -0,0 +1,7 @@
+mutter is a minimal X window manager aimed at nontechnical users and is
+designed  to  integrate well with the GNOME desktop.  mutter lacks some
+features that may be expected by traditional UNIX  or  other  technical
+users;  these users may want to investigate other available window man-
+agers for use with GNOME or standalone.
+
+WWW: -
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
new file mode 100644
index 000000000000..523a02c687ca
--- /dev/null
+++ b/x11-wm/mutter/pkg-plist
@@ -0,0 +1,180 @@
+bin/mutter
+bin/mutter-message
+bin/mutter-theme-viewer
+bin/mutter-window-demo
+include/mutter/mutter-private/atomnames.h
+include/mutter/mutter-private/boxes.h
+include/mutter/mutter-private/common.h
+include/mutter/mutter-private/compositor-mutter.h
+include/mutter/mutter-private/compositor.h
+include/mutter/mutter-private/display.h
+include/mutter/mutter-private/errors.h
+include/mutter/mutter-private/gradient.h
+include/mutter/mutter-private/group.h
+include/mutter/mutter-private/keybindings.h
+include/mutter/mutter-private/main.h
+include/mutter/mutter-private/mutter-plugin.h
+include/mutter/mutter-private/mutter-window.h
+include/mutter/mutter-private/prefs.h
+include/mutter/mutter-private/preview-widget.h
+include/mutter/mutter-private/screen.h
+include/mutter/mutter-private/theme-parser.h
+include/mutter/mutter-private/theme.h
+include/mutter/mutter-private/types.h
+include/mutter/mutter-private/util.h
+include/mutter/mutter-private/window.h
+include/mutter/mutter-private/workspace.h
+lib/libmutter-private.a
+lib/libmutter-private.la
+lib/libmutter-private.so
+lib/libmutter-private.so.0
+lib/mutter/Meta-2.28.gir
+lib/mutter/Meta-2.28.typelib
+lib/mutter/plugins/default.so
+libdata/pkgconfig/libmutter-private.pc
+libdata/pkgconfig/mutter-plugins.pc
+share/applications/mutter.desktop
+share/gnome/wm-properties/mutter-wm.desktop
+share/locale/am/LC_MESSAGES/mutter.mo
+share/locale/ar/LC_MESSAGES/mutter.mo
+share/locale/as/LC_MESSAGES/mutter.mo
+share/locale/ast/LC_MESSAGES/mutter.mo
+share/locale/az/LC_MESSAGES/mutter.mo
+share/locale/be/LC_MESSAGES/mutter.mo
+share/locale/be@latin/LC_MESSAGES/mutter.mo
+share/locale/bg/LC_MESSAGES/mutter.mo
+share/locale/bn/LC_MESSAGES/mutter.mo
+share/locale/bn_IN/LC_MESSAGES/mutter.mo
+share/locale/br/LC_MESSAGES/mutter.mo
+share/locale/bs/LC_MESSAGES/mutter.mo
+share/locale/ca/LC_MESSAGES/mutter.mo
+share/locale/ca@valencia/LC_MESSAGES/mutter.mo
+share/locale/cs/LC_MESSAGES/mutter.mo
+share/locale/cy/LC_MESSAGES/mutter.mo
+share/locale/da/LC_MESSAGES/mutter.mo
+share/locale/de/LC_MESSAGES/mutter.mo
+share/locale/dz/LC_MESSAGES/mutter.mo
+share/locale/el/LC_MESSAGES/mutter.mo
+share/locale/en_CA/LC_MESSAGES/mutter.mo
+share/locale/en_GB/LC_MESSAGES/mutter.mo
+share/locale/es/LC_MESSAGES/mutter.mo
+share/locale/et/LC_MESSAGES/mutter.mo
+share/locale/eu/LC_MESSAGES/mutter.mo
+share/locale/fa/LC_MESSAGES/mutter.mo
+share/locale/fi/LC_MESSAGES/mutter.mo
+share/locale/fr/LC_MESSAGES/mutter.mo
+share/locale/ga/LC_MESSAGES/mutter.mo
+share/locale/gl/LC_MESSAGES/mutter.mo
+share/locale/gu/LC_MESSAGES/mutter.mo
+share/locale/ha/LC_MESSAGES/mutter.mo
+share/locale/he/LC_MESSAGES/mutter.mo
+share/locale/hi/LC_MESSAGES/mutter.mo
+share/locale/hr/LC_MESSAGES/mutter.mo
+share/locale/hu/LC_MESSAGES/mutter.mo
+share/locale/hy/LC_MESSAGES/mutter.mo
+share/locale/id/LC_MESSAGES/mutter.mo
+share/locale/ig/LC_MESSAGES/mutter.mo
+share/locale/is/LC_MESSAGES/mutter.mo
+share/locale/it/LC_MESSAGES/mutter.mo
+share/locale/ja/LC_MESSAGES/mutter.mo
+share/locale/ka/LC_MESSAGES/mutter.mo
+share/locale/kn/LC_MESSAGES/mutter.mo
+share/locale/ko/LC_MESSAGES/mutter.mo
+share/locale/ku/LC_MESSAGES/mutter.mo
+share/locale/la/LC_MESSAGES/mutter.mo
+share/locale/lt/LC_MESSAGES/mutter.mo
+share/locale/lv/LC_MESSAGES/mutter.mo
+share/locale/mai/LC_MESSAGES/mutter.mo
+share/locale/mg/LC_MESSAGES/mutter.mo
+share/locale/mk/LC_MESSAGES/mutter.mo
+share/locale/ml/LC_MESSAGES/mutter.mo
+share/locale/mn/LC_MESSAGES/mutter.mo
+share/locale/mr/LC_MESSAGES/mutter.mo
+share/locale/ms/LC_MESSAGES/mutter.mo
+share/locale/nb/LC_MESSAGES/mutter.mo
+share/locale/ne/LC_MESSAGES/mutter.mo
+share/locale/nl/LC_MESSAGES/mutter.mo
+share/locale/nn/LC_MESSAGES/mutter.mo
+share/locale/oc/LC_MESSAGES/mutter.mo
+share/locale/or/LC_MESSAGES/mutter.mo
+share/locale/pa/LC_MESSAGES/mutter.mo
+share/locale/pl/LC_MESSAGES/mutter.mo
+share/locale/pt/LC_MESSAGES/mutter.mo
+share/locale/pt_BR/LC_MESSAGES/mutter.mo
+share/locale/ro/LC_MESSAGES/mutter.mo
+share/locale/ru/LC_MESSAGES/mutter.mo
+share/locale/rw/LC_MESSAGES/mutter.mo
+share/locale/si/LC_MESSAGES/mutter.mo
+share/locale/sk/LC_MESSAGES/mutter.mo
+share/locale/sl/LC_MESSAGES/mutter.mo
+share/locale/sq/LC_MESSAGES/mutter.mo
+share/locale/sr/LC_MESSAGES/mutter.mo
+share/locale/sr@latin/LC_MESSAGES/mutter.mo
+share/locale/sv/LC_MESSAGES/mutter.mo
+share/locale/ta/LC_MESSAGES/mutter.mo
+share/locale/te/LC_MESSAGES/mutter.mo
+share/locale/th/LC_MESSAGES/mutter.mo
+share/locale/tk/LC_MESSAGES/mutter.mo
+share/locale/tr/LC_MESSAGES/mutter.mo
+share/locale/uk/LC_MESSAGES/mutter.mo
+share/locale/vi/LC_MESSAGES/mutter.mo
+share/locale/wa/LC_MESSAGES/mutter.mo
+share/locale/xh/LC_MESSAGES/mutter.mo
+share/locale/yo/LC_MESSAGES/mutter.mo
+share/locale/zh_CN/LC_MESSAGES/mutter.mo
+share/locale/zh_HK/LC_MESSAGES/mutter.mo
+share/locale/zh_TW/LC_MESSAGES/mutter.mo
+%%DATADIR%%/icons/mutter-window-demo.png
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry lib/girepository-1.0
+@dirrm lib/mutter/plugins
+@dirrm lib/mutter
+@dirrm include/mutter/mutter-private
+@dirrm include/mutter
+@dirrmtry share/applications
+@dirrmtry share/gir-1.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@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
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as