4 files changed, 33 insertions, 10 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 11b33dc7bc80..048664510a8d 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-wm/metacity/Makefile,v 1.92 2006/10/03 13:39:50 ahze Exp $
+#    $MCom: ports/x11-wm/metacity/Makefile,v 1.101 2007/03/14 04:17:20 marcus Exp $
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.16.5
+PORTVERSION=	2.18.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,8 +23,8 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gconf2
+USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-render
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index fb9cba2b8ed1..d0b058395671 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.16.5.tar.bz2) = 7ac14eb4caffbb15df91b70b0def2f5e
-SHA256 (gnome2/metacity-2.16.5.tar.bz2) = 50a8d91f2bfb24bd58b23d428e1f42b36b639bb5b4841066ef01c7de1e2dd561
-SIZE (gnome2/metacity-2.16.5.tar.bz2) = 1862796
+MD5 (gnome2/metacity-2.18.0.tar.bz2) = 2af31af033618329d093267ac00e49ff
+SHA256 (gnome2/metacity-2.18.0.tar.bz2) = f948a81eb79a93da7ffde870f5823c6e9122e286a2b353131afbd27d2cf1b02e
+SIZE (gnome2/metacity-2.18.0.tar.bz2) = 1945353
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index 09c5caee784b..9c810e0e2c36 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Jan 10 04:40:58 2005
-+++ configure	Mon Jan 10 04:41:11 2005
-@@ -25377,7 +25377,6 @@
+--- configure.orig	Tue Mar 13 23:11:45 2007
++++ configure	Tue Mar 13 23:13:04 2007
+@@ -29363,7 +29363,6 @@ echo "${ECHO_T}$have_xrender" >&6; }
  
    if test x$have_xrender = xyes; then
       echo "Building with Render"
@@ -8,3 +8,12 @@
    fi
  fi ## have_composite
  
+@@ -34431,7 +34430,7 @@ metacity-$VERSION:
+ "
+ 
+ METACITY_MINOR_VERSION=18
+-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/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 32f737f0cff2..664a04d58278 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -31,6 +31,8 @@ share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
 share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Atlanta/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Bright/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Bright/metacity-1/metacity-theme-2.xml
+share/gnome/themes/Crux/metacity-1/active-above-button.png
 share/gnome/themes/Crux/metacity-1/active-border-top-left-border.png
 share/gnome/themes/Crux/metacity-1/active-border-top-right-border.png
 share/gnome/themes/Crux/metacity-1/active-bottom-left-border.png
@@ -55,6 +57,8 @@ share/gnome/themes/Crux/metacity-1/active-restore-button.png
 share/gnome/themes/Crux/metacity-1/active-right-border.png
 share/gnome/themes/Crux/metacity-1/active-right-top-border-shaded.png
 share/gnome/themes/Crux/metacity-1/active-right-top-border.png
+share/gnome/themes/Crux/metacity-1/active-shade-button.png
+share/gnome/themes/Crux/metacity-1/active-stick-button.png
 share/gnome/themes/Crux/metacity-1/active-top-center-left.png
 share/gnome/themes/Crux/metacity-1/active-top-center-mid-left.png
 share/gnome/themes/Crux/metacity-1/active-top-center-mid-right.png
@@ -65,6 +69,10 @@ share/gnome/themes/Crux/metacity-1/active-top-mid-left-border.png
 share/gnome/themes/Crux/metacity-1/active-top-mid-right-border.png
 share/gnome/themes/Crux/metacity-1/active-top-right-border.png
 share/gnome/themes/Crux/metacity-1/active-top-right-corner.png
+share/gnome/themes/Crux/metacity-1/active-unabove-button.png
+share/gnome/themes/Crux/metacity-1/active-unshade-button.png
+share/gnome/themes/Crux/metacity-1/active-unstick-button.png
+share/gnome/themes/Crux/metacity-1/inactive-above-button.png
 share/gnome/themes/Crux/metacity-1/inactive-border-top-left-border.png
 share/gnome/themes/Crux/metacity-1/inactive-border-top-right-border.png
 share/gnome/themes/Crux/metacity-1/inactive-bottom-left-border.png
@@ -88,6 +96,8 @@ share/gnome/themes/Crux/metacity-1/inactive-restore-button.png
 share/gnome/themes/Crux/metacity-1/inactive-right-border.png
 share/gnome/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
 share/gnome/themes/Crux/metacity-1/inactive-right-top-border.png
+share/gnome/themes/Crux/metacity-1/inactive-shade-button.png
+share/gnome/themes/Crux/metacity-1/inactive-stick-button.png
 share/gnome/themes/Crux/metacity-1/inactive-top-center-left.png
 share/gnome/themes/Crux/metacity-1/inactive-top-center-mid.png
 share/gnome/themes/Crux/metacity-1/inactive-top-center-right.png
@@ -96,7 +106,11 @@ share/gnome/themes/Crux/metacity-1/inactive-top-left-corner.png
 share/gnome/themes/Crux/metacity-1/inactive-top-mid-border.png
 share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png
 share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png
+share/gnome/themes/Crux/metacity-1/inactive-unabove-button.png
+share/gnome/themes/Crux/metacity-1/inactive-unshade-button.png
+share/gnome/themes/Crux/metacity-1/inactive-unstick-button.png
 share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Crux/metacity-1/metacity-theme-2.xml
 share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Simple/metacity-1/close.png