Move the metacity 2.34.x from x11-wm/metacity to x11-wm/metacity3 then

downgrade the x11-wm/metacity to 2.30.x. The GNOME 2 needs metacity 2.30.x
for correct default of theme, fonts, hotkey and etc. Also, function a bit
different.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16054 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 383 insertions, 0 deletions

diff --git a/x11-wm/metacity3/Makefile b/x11-wm/metacity3/Makefile
new file mode 100644
index 000000000..8e0b88d18
--- /dev/null
+++ b/x11-wm/metacity3/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:   metacity
+# Date created:        21 May 2002
+# Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-wm/metacity/Makefile,v 1.160 2011/04/05 19:04:05 kwm Exp $
+#
+
+PORTNAME=	metacity
+PORTVERSION=	2.34.0
+CATEGORIES=	x11-wm
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome3
+
+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 \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+
+CONFLICTS=	metacity-2.30.[0-9]*
+
+LATEST_LINK=	metacity3
+USE_BZIP2=	yes
+USE_XORG=	x11 xcomposite xdamage
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool
+USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
+
+GCONF_SCHEMAS=	metacity.schemas
+
+MAN1=		metacity-message.1 metacity-theme-viewer.1 \
+		metacity-window-demo.1 metacity.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Werror||g' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-wm/metacity3/distinfo b/x11-wm/metacity3/distinfo
new file mode 100644
index 000000000..9fa6207cf
--- /dev/null
+++ b/x11-wm/metacity3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/metacity-2.34.0.tar.bz2) = e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698
+SIZE (gnome3/metacity-2.34.0.tar.bz2) = 2382473
diff --git a/x11-wm/metacity3/files/patch-configure b/x11-wm/metacity3/files/patch-configure
new file mode 100644
index 000000000..5ae975a06
--- /dev/null
+++ b/x11-wm/metacity3/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2011-04-05 20:58:36.000000000 +0200
++++ configure	2011-04-05 20:59:24.000000000 +0200
+@@ -18286,7 +18286,7 @@
+ "
+ 
+ METACITY_MINOR_VERSION=34
+-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))
+    echo "This is the UNSTABLE branch of metacity"
+    echo -n "Use 2.$stable_version.x for stable "
diff --git a/x11-wm/metacity3/files/patch-src_core_delete.c b/x11-wm/metacity3/files/patch-src_core_delete.c
new file mode 100644
index 000000000..c72b0f60a
--- /dev/null
+++ b/x11-wm/metacity3/files/patch-src_core_delete.c
@@ -0,0 +1,10 @@
+--- src/core/delete.c.orig	2010-01-30 18:56:27.000000000 -0500
++++ src/core/delete.c	2010-01-30 18:56:53.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include "workspace.h"
+ 
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <errno.h>
diff --git a/x11-wm/metacity3/files/patch-src_core_main.c b/x11-wm/metacity3/files/patch-src_core_main.c
new file mode 100644
index 000000000..2d5171e5d
--- /dev/null
+++ b/x11-wm/metacity3/files/patch-src_core_main.c
@@ -0,0 +1,14 @@
+--- src/core/main.c.orig	2010-01-21 11:09:25.000000000 -0500
++++ src/core/main.c	2010-01-30 18:53:17.000000000 -0500
+@@ -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>
diff --git a/x11-wm/metacity3/pkg-descr b/x11-wm/metacity3/pkg-descr
new file mode 100644
index 000000000..fb1cb52b9
--- /dev/null
+++ b/x11-wm/metacity3/pkg-descr
@@ -0,0 +1,4 @@
+Metacity is a low-frills Window Manager, and is the default
+Window Manager of the GNOME 2 desktop.  It provides most of
+the features expected of a Window Manager, but leaves everything
+it can up to other components of the GNOME environment.
diff --git a/x11-wm/metacity3/pkg-plist b/x11-wm/metacity3/pkg-plist
new file mode 100644
index 000000000..3a21df0a4
--- /dev/null
+++ b/x11-wm/metacity3/pkg-plist
@@ -0,0 +1,296 @@
+bin/metacity
+bin/metacity-message
+bin/metacity-theme-viewer
+bin/metacity-window-demo
+include/metacity-1/metacity-private/boxes.h
+include/metacity-1/metacity-private/common.h
+include/metacity-1/metacity-private/gradient.h
+include/metacity-1/metacity-private/preview-widget.h
+include/metacity-1/metacity-private/theme-parser.h
+include/metacity-1/metacity-private/theme.h
+include/metacity-1/metacity-private/util.h
+lib/libmetacity-private.a
+lib/libmetacity-private.la
+lib/libmetacity-private.so
+lib/libmetacity-private.so.0
+libdata/pkgconfig/libmetacity-private.pc
+share/applications/metacity.desktop
+share/gnome-control-center/keybindings/50-metacity-launchers.xml
+share/gnome-control-center/keybindings/50-metacity-navigation.xml
+share/gnome-control-center/keybindings/50-metacity-screenshot.xml
+share/gnome-control-center/keybindings/50-metacity-system.xml
+share/gnome-control-center/keybindings/50-metacity-windows.xml
+share/gnome/help/creating-metacity-themes/C/creating-metacity-themes.xml
+share/gnome/help/creating-metacity-themes/de/creating-metacity-themes.xml
+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
+share/locale/ast/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
+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
+share/locale/crh/LC_MESSAGES/metacity.mo
+share/locale/cs/LC_MESSAGES/metacity.mo
+share/locale/cy/LC_MESSAGES/metacity.mo
+share/locale/da/LC_MESSAGES/metacity.mo
+share/locale/de/LC_MESSAGES/metacity.mo
+share/locale/dz/LC_MESSAGES/metacity.mo
+share/locale/el/LC_MESSAGES/metacity.mo
+share/locale/en@shaw/LC_MESSAGES/metacity.mo
+share/locale/en_CA/LC_MESSAGES/metacity.mo
+share/locale/en_GB/LC_MESSAGES/metacity.mo
+share/locale/eo/LC_MESSAGES/metacity.mo
+share/locale/es/LC_MESSAGES/metacity.mo
+share/locale/et/LC_MESSAGES/metacity.mo
+share/locale/eu/LC_MESSAGES/metacity.mo
+share/locale/fa/LC_MESSAGES/metacity.mo
+share/locale/fi/LC_MESSAGES/metacity.mo
+share/locale/fr/LC_MESSAGES/metacity.mo
+share/locale/ga/LC_MESSAGES/metacity.mo
+share/locale/gl/LC_MESSAGES/metacity.mo
+share/locale/gu/LC_MESSAGES/metacity.mo
+share/locale/ha/LC_MESSAGES/metacity.mo
+share/locale/he/LC_MESSAGES/metacity.mo
+share/locale/hi/LC_MESSAGES/metacity.mo
+share/locale/hr/LC_MESSAGES/metacity.mo
+share/locale/hu/LC_MESSAGES/metacity.mo
+share/locale/hy/LC_MESSAGES/metacity.mo
+share/locale/id/LC_MESSAGES/metacity.mo
+share/locale/ig/LC_MESSAGES/metacity.mo
+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/la/LC_MESSAGES/metacity.mo
+share/locale/lt/LC_MESSAGES/metacity.mo
+share/locale/lv/LC_MESSAGES/metacity.mo
+share/locale/mai/LC_MESSAGES/metacity.mo
+share/locale/mg/LC_MESSAGES/metacity.mo
+share/locale/mk/LC_MESSAGES/metacity.mo
+share/locale/ml/LC_MESSAGES/metacity.mo
+share/locale/mn/LC_MESSAGES/metacity.mo
+share/locale/mr/LC_MESSAGES/metacity.mo
+share/locale/ms/LC_MESSAGES/metacity.mo
+share/locale/nb/LC_MESSAGES/metacity.mo
+share/locale/nds/LC_MESSAGES/metacity.mo
+share/locale/ne/LC_MESSAGES/metacity.mo
+share/locale/nl/LC_MESSAGES/metacity.mo
+share/locale/nn/LC_MESSAGES/metacity.mo
+share/locale/oc/LC_MESSAGES/metacity.mo
+share/locale/or/LC_MESSAGES/metacity.mo
+share/locale/pa/LC_MESSAGES/metacity.mo
+share/locale/pl/LC_MESSAGES/metacity.mo
+share/locale/pt/LC_MESSAGES/metacity.mo
+share/locale/pt_BR/LC_MESSAGES/metacity.mo
+share/locale/ro/LC_MESSAGES/metacity.mo
+share/locale/ru/LC_MESSAGES/metacity.mo
+share/locale/rw/LC_MESSAGES/metacity.mo
+share/locale/si/LC_MESSAGES/metacity.mo
+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@latin/LC_MESSAGES/metacity.mo
+share/locale/sv/LC_MESSAGES/metacity.mo
+share/locale/ta/LC_MESSAGES/metacity.mo
+share/locale/te/LC_MESSAGES/metacity.mo
+share/locale/th/LC_MESSAGES/metacity.mo
+share/locale/tk/LC_MESSAGES/metacity.mo
+share/locale/tr/LC_MESSAGES/metacity.mo
+share/locale/ug/LC_MESSAGES/metacity.mo
+share/locale/uk/LC_MESSAGES/metacity.mo
+share/locale/vi/LC_MESSAGES/metacity.mo
+share/locale/wa/LC_MESSAGES/metacity.mo
+share/locale/xh/LC_MESSAGES/metacity.mo
+share/locale/yo/LC_MESSAGES/metacity.mo
+share/locale/zh_CN/LC_MESSAGES/metacity.mo
+share/locale/zh_HK/LC_MESSAGES/metacity.mo
+share/locale/zh_TW/LC_MESSAGES/metacity.mo
+%%DATADIR%%/icons/metacity-window-demo.png
+share/themes/AgingGorilla/metacity-1/active-button.png
+share/themes/AgingGorilla/metacity-1/active-close-button.png
+share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-maximize-button.png
+share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-menu-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/inactive-close-button.png
+share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
+share/themes/AgingGorilla/metacity-1/inactive-menu-button.png
+share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
+share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
+share/themes/Atlanta/metacity-1/metacity-theme-1.xml
+share/themes/Bright/metacity-1/metacity-theme-1.xml
+share/themes/Bright/metacity-1/metacity-theme-2.xml
+share/themes/Crux/metacity-1/active-above-button.png
+share/themes/Crux/metacity-1/active-border-top-left-border.png
+share/themes/Crux/metacity-1/active-border-top-right-border.png
+share/themes/Crux/metacity-1/active-bottom-left-border.png
+share/themes/Crux/metacity-1/active-bottom-left-corner.png
+share/themes/Crux/metacity-1/active-bottom-mid-left-border.png
+share/themes/Crux/metacity-1/active-bottom-mid-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-corner.png
+share/themes/Crux/metacity-1/active-button-prelight.png
+share/themes/Crux/metacity-1/active-button-pressed.png
+share/themes/Crux/metacity-1/active-button.png
+share/themes/Crux/metacity-1/active-close-button.png
+share/themes/Crux/metacity-1/active-left-border.png
+share/themes/Crux/metacity-1/active-left-top-border-shaded.png
+share/themes/Crux/metacity-1/active-left-top-border.png
+share/themes/Crux/metacity-1/active-maximize-button.png
+share/themes/Crux/metacity-1/active-menu-button-prelight.png
+share/themes/Crux/metacity-1/active-menu-button-pressed.png
+share/themes/Crux/metacity-1/active-menu-button.png
+share/themes/Crux/metacity-1/active-minimize-button.png
+share/themes/Crux/metacity-1/active-restore-button.png
+share/themes/Crux/metacity-1/active-right-border.png
+share/themes/Crux/metacity-1/active-right-top-border-shaded.png
+share/themes/Crux/metacity-1/active-right-top-border.png
+share/themes/Crux/metacity-1/active-shade-button.png
+share/themes/Crux/metacity-1/active-stick-button.png
+share/themes/Crux/metacity-1/active-top-center-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-right.png
+share/themes/Crux/metacity-1/active-top-center-right.png
+share/themes/Crux/metacity-1/active-top-left-border.png
+share/themes/Crux/metacity-1/active-top-left-corner.png
+share/themes/Crux/metacity-1/active-top-mid-left-border.png
+share/themes/Crux/metacity-1/active-top-mid-right-border.png
+share/themes/Crux/metacity-1/active-top-right-border.png
+share/themes/Crux/metacity-1/active-top-right-corner.png
+share/themes/Crux/metacity-1/active-unabove-button.png
+share/themes/Crux/metacity-1/active-unshade-button.png
+share/themes/Crux/metacity-1/active-unstick-button.png
+share/themes/Crux/metacity-1/inactive-above-button.png
+share/themes/Crux/metacity-1/inactive-border-top-left-border.png
+share/themes/Crux/metacity-1/inactive-border-top-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-corner.png
+share/themes/Crux/metacity-1/inactive-bottom-mid-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-corner.png
+share/themes/Crux/metacity-1/inactive-button-prelight.png
+share/themes/Crux/metacity-1/inactive-button-pressed.png
+share/themes/Crux/metacity-1/inactive-button.png
+share/themes/Crux/metacity-1/inactive-close-button.png
+share/themes/Crux/metacity-1/inactive-left-border.png
+share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-left-top-border.png
+share/themes/Crux/metacity-1/inactive-maximize-button.png
+share/themes/Crux/metacity-1/inactive-menu-button-prelight.png
+share/themes/Crux/metacity-1/inactive-menu-button-pressed.png
+share/themes/Crux/metacity-1/inactive-menu-button.png
+share/themes/Crux/metacity-1/inactive-minimize-button.png
+share/themes/Crux/metacity-1/inactive-restore-button.png
+share/themes/Crux/metacity-1/inactive-right-border.png
+share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-right-top-border.png
+share/themes/Crux/metacity-1/inactive-shade-button.png
+share/themes/Crux/metacity-1/inactive-stick-button.png
+share/themes/Crux/metacity-1/inactive-top-center-left.png
+share/themes/Crux/metacity-1/inactive-top-center-mid.png
+share/themes/Crux/metacity-1/inactive-top-center-right.png
+share/themes/Crux/metacity-1/inactive-top-left-border.png
+share/themes/Crux/metacity-1/inactive-top-left-corner.png
+share/themes/Crux/metacity-1/inactive-top-mid-border.png
+share/themes/Crux/metacity-1/inactive-top-right-border.png
+share/themes/Crux/metacity-1/inactive-top-right-corner.png
+share/themes/Crux/metacity-1/inactive-unabove-button.png
+share/themes/Crux/metacity-1/inactive-unshade-button.png
+share/themes/Crux/metacity-1/inactive-unstick-button.png
+share/themes/Crux/metacity-1/metacity-theme-1.xml
+share/themes/Crux/metacity-1/metacity-theme-2.xml
+share/themes/Esco/metacity-1/metacity-theme-1.xml
+share/themes/Metabox/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/close.png
+share/themes/Simple/metacity-1/maximize.png
+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
+@dirrmtry share/themes/Simple
+@dirrm share/themes/Metabox/metacity-1
+@dirrmtry share/themes/Metabox
+@dirrm share/themes/Esco/metacity-1
+@dirrmtry share/themes/Esco
+@dirrm share/themes/Crux/metacity-1
+@dirrmtry share/themes/Crux
+@dirrm share/themes/Bright/metacity-1
+@dirrmtry share/themes/Bright
+@dirrm share/themes/Atlanta/metacity-1
+@dirrmtry share/themes/Atlanta
+@dirrm share/themes/AgingGorilla/metacity-1
+@dirrmtry share/themes/AgingGorilla
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/creating-metacity-themes/de
+@dirrm share/gnome/help/creating-metacity-themes/C
+@dirrm share/gnome/help/creating-metacity-themes
+@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/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@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/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@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/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@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