Update metacity to 2.26.0.

2.26.0
======

Thanks to Luca Ferretti, Matt Kraai, and Neil Jagdish Patel for
improvements in this version.

  - queue frame resize on window undecorate (Neil)
  - fix description of desktop background (Luca) (#569649)
  - wrap g_error calls in braces (Matt)

Translations
  Amitakhya Phukan (as), Mikel González (ast), Ihar Hrachyshka (be@latin), Runa
  Bhattacharjee (bn_IN), David Planella (ca), Petr Kovar (cs), Ask Hjorth
  Larsen (da), Christian Kirbach (de), Jennie Petoumenou (el), David Lodge (en_GB),
  Jorge González (es), Mattias Põldaru (et), Iñaki Larrañaga Murgoitio (eu),
  Ilkka Tuohela (fi), Claude Paroz (fr), Ankit Patel (gu), Mark Krapivner (he),
  Rajesh Ranjan (hi), Gabor Kelemen (hu), Luca Ferretti (it), Takeshi AIHANA (ja),
  Changwoo Ryu (ko), Gintautas Miliauskas (lt), Sangeeta Kumari (mai), Sandeep
  Shedmake (mr), Wouter Bolsterlee (nl), Manoj Kumar Giri (or), Duarte Loreto (pt),
  Leonardo Ferreira Fontenelle (pt_BR), Adi Roiban (ro), Yuriy Penkin (ru), Daniel
  Nylander (sv), I. Felix (ta), Krishna Babu K (te), Theppitak Karoonboonyanan (th),
  Clytie Siddall (vi), Chao-Hsiung Liao (zh_HK), Chao-Hsiung Liao (zh_TW)

2.25.144
========

Thanks to Matthias Claesen, Matt Kraai, Elijah Newren, Owen Taylor, and Thomas
Thurman for improvements in this version.

  - Optimise window property lookup (Thomas) (#549886)
  - Fix slip in the above (Matt)
  - Several memory leaks fixed (Matthias) (#552303, #552973, #552307)
  - Fix longstanding crasher about colourmaps (Owen) (#568365)
  - Alt+middle/right buttons can be switched (Thomas) (#437910)
  - Support _NET_WM_MOVERESIZE_CANCEL (Elijah)
  - minor fix paving the way for a theme editor (Thomas)

Translations
  David Planella (ca), Jorge González (es), Mattias Põldaru (et), saudat
  mohammed (ha), Yuval Tanny\n (he), Gabor Kelemen (hu), Onye, Sylvester (ig),
  Changwoo Ryu (ko), Raivis Dejus (lv), Kjartan Maraas (nb), Daniel Nylander (sv),
  Fajuyitan, Sunday Ayo (yo), 甘露 (Gan Lu) (zh_CN)

2.25.89
=======

Thanks to Yanko Kaneti, Frederic Peters, Thomas Thurman, and Colin Walters for
improvements in this version.

  - The maximisation key is a toggle. (Thomas) (#343824)
  - "Unmaximise" is now called "restore". (Thomas) (#343824)
  - New thread handling call for gconf (Frederic) (#565517)
  - Add screenshot commands back which had been removed (Yanko) (#565343)
  - move_to_corner_se keybinding fixed (Thomas)
  - Windows on other workspaces which attempt to present themselves
    are marked as needing attention (Colin) (#482354)
  - End the grab op when the user clicks the titlebar (Thomas) (#401028)

Translations
  Jorge González (es)

2.25.55
=======

Thanks to Erwann Chenede for improvements in this version.

  - Fix build on Solaris (Erwann) (#564123)

Translations
  Mattias Põldaru (et), Luca Ferretti (it)

2.25.34
=======

Thanks to Matt Kraai for improvements in this version.

  - Fixes to Thomas's earlier fixes (Matt) (#562939)

Translations
  None

2.25.21
=======

Thanks to Thomas Thurman for improvements in this version.

  - Fixes to allow building without compositor again (Thomas)
  - Fixes for -Wall problems (Thomas)
  - Various tool updates (Thomas)

Translations: none


2.25.13
=======

Thanks to Thomas Thurman for improvements in this version.

  - Add casts to fix failure to build from source on 64bit hosts (Thomas) (#562106)
  - Added script to produce annoucements (Thomas)

Translations
  Jorge González (es)

2.25.8
======

Thanks to Brian Cameron, Maxim Ermilov, Daniel Macks, Elijah Newren, Frederic
Peters, Thomas Thurman, David Trowbridge, and Olav Vitters for improvements in
this version.

  - Reorder compiler flags (Daniel) (#562033)
  - Fix compositor switch (Daniel) (#560990)
  - Remove spurious warnings about operations on window "none" (Thomas)
  - Fix _POSIX_C_SOURCE which was breaking OS X builds (Thomas) (#561962)
  - -Werror -Wall and -ansi are now standard compile flags (Thomas)
  - Merge screen and window keybindings files; fix minor alt-tab bug
    in the process (Thomas) (#528337)
  - Support _NET_WM_FULLSCREEN_MONITORS (David)
  - Remove some deprecated calls (Thomas) (#560445)
  - Clean up #includes (Maxim) (#560449)
  - Update description of raise_on_click (Elijah)
  - First dialogue delegated to zenity (Thomas)
  - fix theme-parser typo (Olav)
  - double-quote variable names in messages (Thomas) (#558309)
  - fix accidental renaming of run_command_terminal (Thomas) (#557943)
  - some null checks; problems exposed by new GDM (Brian) (#558058)
  - ignore mouse button modifier if it's missing (Thomas) (Launchpad 258054, Launchpad 266929)
  - fix docbook markup (Frederic)

Translations
  Astur (ast), Jorge González (es), Thomas Thurman (la), Leonardo Ferreira
  Fontenelle (pt_BR), Daniel Nylander (sv)

2.25.5
======

Thanks to Thomas Thurman for improvements in this version.

  - Allow third-party apps to decide whether a window appears
    on all workspaces (Thomas) (#557536)
  - Fixed keybindings script (again) (Thomas)

Translations
  David Planella (ca), Robert Millan (ca@valencia)

2.25.3
======

Brown paper bag release which fixes numerous build problems from last night's
release of 2.25.2.  Apologies.

Thanks to Murray Cumming, Thomas Thurman, and Götz Waschk for improvements
in this version.

  - Fix distcheck (Thomas) (#557356)
  - add libm reference (Götz) (#557357)
  - fix docbook tags (Murray) (#557337)

Translations
  Yavor Doganov (bg), David Planella (ca), Robert Millan (ca@valencia), Kenneth
  Nielsen (da), Hendrik Richter (de), Ivar Smolin (et), Claude Paroz (fr), Seán de
  Búrca (ga), Launchpad Translations Administrators (hr), Gabor Kelemen (hu),
  Thomas Thurman (la), Žygimantas Beručka (lt), Kjartan Maraas (nb), Duarte
  Loreto (pt), Djavan Fagundes (pt_BR), Mugurel Tudor (ro), Pavol Šimo (sk),
  Laurent Dhima (sq), Горан Ракић (sr), Theppitak Karoonboonyanan (th),
  Funda Wang (zh_CN)

2.25.2
======

Thanks to Joe Marcus Clarke, Murray Cumming, Tomas Frydrych, William Lachance,
Matthew Martin, Christian Persch, Thomas Thurman, and Vincent Untz for
improvements in this version.

  - Add handler for SIGTERM (Joe) (#553980)
  - Minimised windows are necessarily obscured (Matthew) (#528927)
  - Build fixes with the above (Christian, Tomas, Thomas) (#557335)
    (#557201) (#469361)
  - Changed keybindings to be in a single place (Thomas) (#469361)
  - Add new document about themes (Murray)
  - Remove obsolete support for fallback icons (Thomas)
  - Pass modified mouse events to panels (William) (#554428)
  - Change where desktop files should go (Vincent) (#549479)

Translations
  Yavor Doganov (bg), David Planella (ca), Kenneth Nielsen (da), Hendrik
  Richter (de), Ivar Smolin (et), Claude Paroz (fr), Seán de Búrca (ga), Launchpad
  Translations Administrators (hr), Gabor Kelemen (hu), Thomas Thurman (la),
  Žygimantas Beručka (lt), Kjartan Maraas (nb), Duarte Loreto (pt), Djavan
  Fagundes (pt_BR), Mugurel Tudor (ro), Pavol Šimo (sk), Laurent Dhima (sq),
  Горан Ракић (sr), Theppitak Karoonboonyanan (th), Funda Wang (zh_CN)
2.25.1
======

Thanks to Thomas Thurman for improvements in this version.

  - Fix small memory leak, found by Matthias Clasen (Thomas) (#549952)
  - Added move_to_center keybinding suggested by
    Khanh-Dang Nguyen Thu Lam (Thomas) (#549979)
  - Compositor can be turned on and off from the command line
    (#545323) (Thomas)

Translations
  Khaled Hosny (ar), Petr Kovar (cs), Iñaki Larrañaga Murgoitio (eu), Ilkka
  Tuohela (fi), Žygimantas Beručka (lt), Duarte Loreto (pt), Djavan
  Fagundes (pt_BR), Laurent Dhima (sq)

2.25.0
======

Thanks to Patrick Niklaus, Ted Percival, Eric Piel, Akira TAGOH, and Thomas
Thurman for improvements in this version.

  - Fix memory allocation problem in struts (Eric) (probably #468075)
  - Ensure windows which start maximised know where to jump back
    to, so they don't warp to other screens (Ted) (#504692)
  - Added header comments to some files (Thomas)
  - Icons for windows which are uncooperative enough not to provide
    an icon are taken from the theme, not built in (Patrick) (#524343)
  - Added manual page for metacity-message (Akira, from Debian downstream)

Translations
  Khaled Hosny (ar), Petr Kovar (cs), Ilkka Tuohela (fi), Duarte Loreto (pt), Djavan
  Fagundes (pt_BR)

3 files changed, 22 insertions, 8 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 64aa79d413b..767f520e52c 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.79 2008/12/24 18:49:55 jmcneill Exp $
+# $NetBSD: Makefile,v 1.80 2009/03/16 20:10:19 jmcneill Exp $
 #
 
-DISTNAME=	metacity-2.24.0
+DISTNAME=	metacity-2.26.0
 CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -45,6 +45,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
@@ -53,4 +54,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+DEPENDS+=	zenity-[0-9]*:../../x11/zenity
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index ab6e07e64ad..6f583f1d230 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2008/10/16 15:37:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.29 2009/03/16 20:10:19 jmcneill Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -15,15 +15,18 @@ lib/pkgconfig/libmetacity-private.pc
 libexec/metacity-dialog
 man/man1/metacity-theme-viewer.1
 man/man1/metacity-window-demo.1
+man/man1/metacity-message.1
 man/man1/metacity.1
 share/applications/metacity.desktop
 share/gconf/schemas/metacity.schemas
 share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
 share/gnome-control-center/keybindings/50-metacity-key.xml
+share/gnome/help/creating-metacity-themes/C/creating-metacity-themes.xml
 share/gnome/wm-properties/metacity-wm.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
 share/locale/as/LC_MESSAGES/metacity.mo
+share/locale/ast/LC_MESSAGES/metacity.mo
 share/locale/az/LC_MESSAGES/metacity.mo
 share/locale/be/LC_MESSAGES/metacity.mo
 share/locale/be@latin/LC_MESSAGES/metacity.mo
@@ -32,6 +35,7 @@ share/locale/bn/LC_MESSAGES/metacity.mo
 share/locale/bn_IN/LC_MESSAGES/metacity.mo
 share/locale/bs/LC_MESSAGES/metacity.mo
 share/locale/ca/LC_MESSAGES/metacity.mo
+share/locale/ca@valencia/LC_MESSAGES/metacity.mo
 share/locale/cs/LC_MESSAGES/metacity.mo
 share/locale/cy/LC_MESSAGES/metacity.mo
 share/locale/da/LC_MESSAGES/metacity.mo
@@ -49,12 +53,14 @@ share/locale/fr/LC_MESSAGES/metacity.mo
 share/locale/ga/LC_MESSAGES/metacity.mo
 share/locale/gl/LC_MESSAGES/metacity.mo
 share/locale/gu/LC_MESSAGES/metacity.mo
+share/locale/ha/LC_MESSAGES/metacity.mo
 share/locale/he/LC_MESSAGES/metacity.mo
 share/locale/hi/LC_MESSAGES/metacity.mo
 share/locale/hr/LC_MESSAGES/metacity.mo
 share/locale/hu/LC_MESSAGES/metacity.mo
 share/locale/hy/LC_MESSAGES/metacity.mo
 share/locale/id/LC_MESSAGES/metacity.mo
+share/locale/ig/LC_MESSAGES/metacity.mo
 share/locale/is/LC_MESSAGES/metacity.mo
 share/locale/it/LC_MESSAGES/metacity.mo
 share/locale/ja/LC_MESSAGES/metacity.mo
@@ -62,8 +68,10 @@ share/locale/ka/LC_MESSAGES/metacity.mo
 share/locale/kn/LC_MESSAGES/metacity.mo
 share/locale/ko/LC_MESSAGES/metacity.mo
 share/locale/ku/LC_MESSAGES/metacity.mo
+share/locale/la/LC_MESSAGES/metacity.mo
 share/locale/lt/LC_MESSAGES/metacity.mo
 share/locale/lv/LC_MESSAGES/metacity.mo
+share/locale/mai/LC_MESSAGES/metacity.mo
 share/locale/mg/LC_MESSAGES/metacity.mo
 share/locale/mk/LC_MESSAGES/metacity.mo
 share/locale/ml/LC_MESSAGES/metacity.mo
@@ -91,6 +99,7 @@ share/locale/sr/LC_MESSAGES/metacity.mo
 share/locale/sr@latin/LC_MESSAGES/metacity.mo
 share/locale/sv/LC_MESSAGES/metacity.mo
 share/locale/ta/LC_MESSAGES/metacity.mo
+share/locale/te/LC_MESSAGES/metacity.mo
 share/locale/th/LC_MESSAGES/metacity.mo
 share/locale/tk/LC_MESSAGES/metacity.mo
 share/locale/tr/LC_MESSAGES/metacity.mo
@@ -98,6 +107,7 @@ share/locale/uk/LC_MESSAGES/metacity.mo
 share/locale/vi/LC_MESSAGES/metacity.mo
 share/locale/wa/LC_MESSAGES/metacity.mo
 share/locale/xh/LC_MESSAGES/metacity.mo
+share/locale/yo/LC_MESSAGES/metacity.mo
 share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_HK/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
@@ -222,6 +232,8 @@ share/themes/Simple/metacity-1/minimize.png
 @dirrm share/metacity
 @comment in gnome2-dirs: @dirrm share/gnome/wm-properties
 @dirrm share/gnome-control-center/keybindings
+@dirrm share/gnome/help/creating-metacity-themes/C
+@dirrm share/gnome/help/creating-metacity-themes
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm include/metacity-1/metacity-private
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index f86cc5288df..5c05d679cb8 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.38 2008/12/24 18:49:55 jmcneill Exp $
+$NetBSD: distinfo,v 1.39 2009/03/16 20:10:19 jmcneill Exp $
 
-SHA1 (metacity-2.24.0.tar.bz2) = 0b2e37e372498e26a6926fbb68e96556c6db6497
-RMD160 (metacity-2.24.0.tar.bz2) = 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5
-Size (metacity-2.24.0.tar.bz2) = 2160557 bytes
+SHA1 (metacity-2.26.0.tar.bz2) = 70593f69148960a0248527c8ae8d442a3d251d08
+RMD160 (metacity-2.26.0.tar.bz2) = 26b75abb9b705f9fd7711dfbbff134e600dcfd56
+Size (metacity-2.26.0.tar.bz2) = 2289848 bytes
 SHA1 (patch-aa) = e57853437a8485399f302553a4a4289e607d3780