From 1f86ebe2c9c57c73d6e0f98ceefc3f54cf0d7f9e Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Mon, 16 Feb 2004 00:34:12 +0000
Subject: [PATCH] Update to 2.6.5.  The most notable change is that while using
 focus-follows-mouse, clicking inside a window will raise it as it did under
 2.4.x.

---
 x11-wm/metacity/Makefile              |  5 ++---
 x11-wm/metacity/distinfo              |  3 ++-
 x11-wm/metacity/files/patch-configure | 13 -------------
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 x11-wm/metacity/files/patch-configure

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index ae83083eb95d..179edc959e7e 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTVERSION=	2.6.5
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -22,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gconf2 libglade2
+USE_GNOME=	gnomeprefix intlhack gnomehack lthack gnomehier gconf2 libglade2
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index c576cdd312ca..d19032956bdd 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/metacity-2.6.3.tar.bz2) = 370e54af48136a43dcae3596069af791
+MD5 (gnome2/metacity-2.6.5.tar.bz2) = 2530cca3818a6c25caa2f2aa135cfd62
+SIZE (gnome2/metacity-2.6.5.tar.bz2) = 1775893
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
deleted file mode 100644
index bbd8c0a87560..000000000000
--- a/x11-wm/metacity/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/05/22 09:20:39	1.1
-+++ configure	2002/05/22 09:20:59
-@@ -6411,6 +6411,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'