Update to 2.12.1:

2.12.1
==

Thanks to Ray Strode, Havoc Pennington, and Elijah Newren for
improvements in this release.

 - Truncate ridiculously long titles to avoid crashing or letting the
   pager crash (Ray, Havoc, Elijah) [#315070]
 - Get the tabbing window outline to work with gtk+ 2.8.4 again
   (Elijah) [#317528]

Translations
  Mahay Alam Khan (bn), Francisco Javier F. Serrador (es), Ivar Smolin (et),
  Iñaki Larrañaga Murgoitio (eu), Luca Ferretti (it), Christian Rose (sv),
  Clytie Siddall (vi), Funda Wang (zh_CN)

2.12.0
==

Thanks to Brent Smith for finding the crasher in the release candidate!

 - Fix an uninitialized variable problem causing crashes (Brent) [#315000]

Translations
  Bryn Salisbury (cy), Hendrik Richter (de), Christophe Merlet (RedFox) (fr),
  Ignacio Casal Quinteiro (gl), Norayr Chilingaryan (hy), Young-Ho Cha (ko),
  ´ygimantas Berucka (lt), Michiel Sikkes (nl), Leonid Kanter (ru), Danilo
  ¦egan(sr), Baris Cicek (tr)

2.11.3
==

Thanks to Björn Lindqvist and Elijah Newren for improvements in
this release.

 - Check for the right versions of glib and gtk+ (Björn) [#314116]
 - Avoid obscuring centered-on-desktop windows which are denied focus
   (Elijah) [#313234]

Translations
  Vladimir Petkov (bg), Jordi Mallach (ca), Kostas Papadimas (el),
  Ivar Smolin (et), Gabor Kelemen (hu), Mohammad DAMT (id), Duarte
  Loreto (pt), Mugurel Tudor (ro), Laurent Dhima (sq), Maxim
  Dziumanenko (uk)

2.11.2
==

Thanks to Elijah Newren, Jaap Haitsma, Ray Strode, and Brent Smith for
improvements in this release.

 - Fix an easy to trigger crasher in 2.11.1 caused by unneeded
   debugging spew (Elijah) [#311819]
 - Make sure that Metacity dialogs have icons (Jaap) [#309876]
 - Fix an infinite restacking flicker loop in sloppy and mouse focus
   with fullscreen windows (Elijah) [#311400]
 - Change default theme from Simple to Clearlooks (Elijah)
 - Vastly improve the behavior of keyboard move/resize and edge
   snapping (Ray) [#310888]
 - Remove a duplicate string (Brent) [#309774]

Translations
  Yuval Tanny (he), Gnome PL Team (pl), Raphael Higino (pt_BR),
  Chao-Hsiung Liao (zh_TW)

2.11.1
==

Thanks to Elijah Newren, Ken Harris, Matthias Clasen, Christian
Persch, and Billy Biggs for improvements in this release.

 - Fix a miscoloring of parts of the titlebar introduced in the last
   unstable release (Elijah) [follow-up to #169982]
 - Provide a more lenient threshold for drawing rounded corners (Ken)
   [#122065]
 - Make the Xcursor changes in the last unstable release effective
   (Matthias) [follow-up to #308106]
 - Revert the _NET_ACTIVE_WINDOW behavior change made in the 2.9.x
   unstable series; activation includes changing a window to the
   current workspace again (Elijah) [reversion of #128380]
 - Restore original window size if the window was maximized upon
   withdrawing it (Elijah, Christian) [#137185]
 - Fix a raising bug with a window that has more than one child window
   (Elijah, Billy) [part of #307875]
 - Try to place windows denied focus near the focus window and fix a
   xinerama bug with the placement (Elijah) [part of #307875]
 - Avoid modal dialogs being obscured in somewhat pathologically
   strange circumstances that Eclipse seems to be good at triggering
   (Elijah) [part of #307875]

Translations
  Miloslav Trmac (cs), Kostas Papadimas (el), Adam Weinberger (en_CA),
  Francisco Javier F. Serrador (es), Ilkka Tuohela (fi), Christophe
  Merlet (RedFox) (fr), Ignacio Casal Quinteiro (gl), Ankit
  Patel (gu), Yair Hershkovitz (he), Takeshi AIHANA (ja), Kjartan
  Maraas (nb), Kjartan Maraas (no), Marcel Telka (sk), Theppitak
  Karoonboonyanan (th), Clytie Siddall (vi), Funda Wang (zh_CN)

2.11.0
==

This release contains all fixes up to Metacity 2.10.2 plus some new goodies.

Thanks to Matthias Clasen, Aivars Kalvans, Björn Lindqvist, and
Andrew Johnson for improvements in this release.

 - React to cursor theme changes (Matthias) [#308106]
 - Plug a small leak with xinerama information (Aivars) [#307884]
 - Split up main() into more manageable chunks and make use of GOpt
   (Björn) [#305331]
 - Speed up vertical gradients (Andrew) [#169982]

Translations
  Hendrik Richter (de), Ivar Smolin (et), Ignacio Casal
  Quinteiro (gl), Clytie Siddall (vi)

3 files changed, 11 insertions, 9 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 1d937f1cd92..e4283a40936 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2005/08/26 16:46:41 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2005/10/12 21:53:25 jmmv Exp $
 #
 
-DISTNAME=	metacity-2.10.3
+DISTNAME=	metacity-2.12.1
 CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -29,12 +29,13 @@ CONFIGURE_ARGS+=	--disable-xinerama
 .endif
 
 .include "../../devel/GConf2/schemas.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
 .include "../../x11/Xcomposite/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index eebecf17941..e4e4e1302df 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/06/06 14:55:34 hira Exp $
+@comment $NetBSD: PLIST,v 1.18 2005/10/12 21:53:25 jmmv Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -44,6 +44,7 @@ ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/hy/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/metacity.mo
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index b556736db46..7e8a70be9ae 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.23 2005/08/26 16:46:41 drochner Exp $
+$NetBSD: distinfo,v 1.24 2005/10/12 21:53:25 jmmv Exp $
 
-SHA1 (metacity-2.10.3.tar.bz2) = ad69fca36a980b5d2cdc550093af0b58cfd25c67
-RMD160 (metacity-2.10.3.tar.bz2) = dfad68bde4a56bfda9f278ed5e87ef72ba18eb14
-Size (metacity-2.10.3.tar.bz2) = 1684968 bytes
+SHA1 (metacity-2.12.1.tar.bz2) = 4a5d1cca6e4f401617f29b6f398c7236bf876d77
+RMD160 (metacity-2.12.1.tar.bz2) = 7062808f496ffcc3d99cad83baeb35acd4e25a42
+Size (metacity-2.12.1.tar.bz2) = 1668143 bytes