Update to 2.4.55 with patch from PR pkg/21767 by Marc Recht:

- some fixes to opaque resize that make it slightly less choppy
- fix some infinite loops caused by stupid apps with transient for cycles
- force window min/max size to be at least 1 pixel
- unfocus window on leaving window border, not on leaving window itself, in
  strict mouse focus mode
- fix handling of workspace names so they don't get all lost/broken/etc.
- fix handling of ignored modifiers (makes key shortcuts work while
  CapsLock/ScrollLock/NumLock are all enabled, most people didn't notice as
  nobody turns on ScrollLock)
- fix multihead crash #106086
- many translation updates

4 files changed, 15 insertions, 11 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 4dafa98c93b..53e22b52d84 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:55:14 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/07/23 15:34:17 jmmv Exp $
 #
 
-DISTNAME=	metacity-2.4.34
-PKGREVISION=	3
+DISTNAME=	metacity-2.4.55
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.4/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,8 +22,6 @@ USE_LIBTOOL=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-CONFIGURE_ARGS=		--without-included-gettext
-
 GCONF2_SCHEMAS=		metacity.schemas
 
 .include "../../devel/GConf2/schemas.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 0fb35c231fc..95aafaaee5f 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/02/14 20:59:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/07/23 15:34:17 jmmv Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -20,6 +20,7 @@ share/gconf/schemas/metacity.schemas
 share/gnome/wm-properties/metacity.desktop
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/metacity.mo
@@ -29,8 +30,10 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/metacity.mo
@@ -39,6 +42,7 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/metacity.mo
@@ -50,6 +54,8 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/metacity.mo
diff --git a/wm/metacity/buildlink2.mk b/wm/metacity/buildlink2.mk
index d8298f2bc2e..adaa40403e8 100644
--- a/wm/metacity/buildlink2.mk
+++ b/wm/metacity/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:53:43 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/07/23 15:34:17 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use metacity.
 #
@@ -9,7 +9,7 @@
 METACITY_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			metacity
-BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.34nb3
+BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.55
 BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.metacity=metacity
@@ -21,6 +21,7 @@ BUILDLINK_FILES.metacity+=	lib/pkgconfig/libmetacity-private.pc
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
+.include "../../x11/startup-notification/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	metacity-buildlink
 
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index f62d7301014..3c4882ea399 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/02/18 20:52:08 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/07/23 15:34:18 jmmv Exp $
 
-SHA1 (metacity-2.4.34.tar.bz2) = 2262ceea772107522777ee17463ce9b6184fe285
-Size (metacity-2.4.34.tar.bz2) = 1217155 bytes
+SHA1 (metacity-2.4.55.tar.bz2) = 450462a4e9d78e3ed422b97f6168f43bb395d4a4
+Size (metacity-2.4.55.tar.bz2) = 1350118 bytes