Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

4 files changed, 19 insertions, 8 deletions

diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile
index 62168cc..8250299 100644
--- a/x11-wm/metacity-setup/Makefile
+++ b/x11-wm/metacity-setup/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	metacity-setup
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	metacity-setup
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	marcus@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 0c43c68..aaca2dd 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.4.21
+PORTVERSION=	2.4.34
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
@@ -15,8 +15,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gconf-2:${PORTSDIR}/devel/gconf2 \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		glade-2.0.0:${PORTSDIR}/devel/libglade2
+		glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -25,6 +25,7 @@ USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index adf2530..12d4ccb 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1 +1 @@
-MD5 (gnome2/metacity-2.4.21.tar.bz2) = 538f19286a5a0e126b4548ab3b24e126
+MD5 (gnome2/metacity-2.4.34.tar.bz2) = 69650ff5719b958b20f9969902f3f68d
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index c6162cc..012d94b 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -112,6 +112,11 @@ share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png
 share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
 share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Simple/metacity-1/close.png
+share/gnome/themes/Simple/metacity-1/maximize.png
+share/gnome/themes/Simple/metacity-1/maximized.png
+share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Simple/metacity-1/minimize.png
 share/gnome/wm-properties/metacity.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/az/LC_MESSAGES/metacity.mo
@@ -121,7 +126,9 @@ share/locale/cs/LC_MESSAGES/metacity.mo
 share/locale/da/LC_MESSAGES/metacity.mo
 share/locale/de/LC_MESSAGES/metacity.mo
 share/locale/el/LC_MESSAGES/metacity.mo
+share/locale/en_GB/LC_MESSAGES/metacity.mo
 share/locale/es/LC_MESSAGES/metacity.mo
+share/locale/et/LC_MESSAGES/metacity.mo
 share/locale/fi/LC_MESSAGES/metacity.mo
 share/locale/fr/LC_MESSAGES/metacity.mo
 share/locale/gl/LC_MESSAGES/metacity.mo
@@ -132,7 +139,9 @@ share/locale/ja/LC_MESSAGES/metacity.mo
 share/locale/ko/LC_MESSAGES/metacity.mo
 share/locale/lv/LC_MESSAGES/metacity.mo
 share/locale/mk/LC_MESSAGES/metacity.mo
+share/locale/mn/LC_MESSAGES/metacity.mo
 share/locale/ms/LC_MESSAGES/metacity.mo
+share/locale/nl/LC_MESSAGES/metacity.mo
 share/locale/no/LC_MESSAGES/metacity.mo
 share/locale/pl/LC_MESSAGES/metacity.mo
 share/locale/pt/LC_MESSAGES/metacity.mo
@@ -147,6 +156,8 @@ share/locale/uk/LC_MESSAGES/metacity.mo
 share/locale/vi/LC_MESSAGES/metacity.mo
 share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
+@dirrm share/gnome/themes/Simple/metacity-1
+@dirrm share/gnome/themes/Simple
 @dirrm share/gnome/themes/Metabox/metacity-1
 @dirrm share/gnome/themes/Metabox
 @dirrm share/gnome/themes/AgingGorilla/metacity-1
@@ -159,7 +170,6 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/themes/Bright
 @dirrm share/gnome/themes/Atlanta/metacity-1
 @dirrm share/gnome/themes/Atlanta
-@dirrm share/gnome/themes
 @dirrm share/gnome/metacity/icons
 @dirrm share/gnome/metacity/glade
 @dirrm share/gnome/metacity