Update to 2.6.3, based on work done by xtraeme@:

2.6.3
 - fix to right, left, bottom onscreen resize constraints
 - detect case where we fail to get a pointer grab when the mouse
   is clicked, to avoid "this window is stuck to my mouse!"
 - keep panels at the end of the focus MRU list so we don't
   focus them all the time in annoying ways

2.6.2
 - fix to repaint after resize always, so on maximize
   and theme changes we get things drawn properly
 - fix a compile issue on HPUX
 - fix translations of metacity-message output
 - fix to update window icons when they change
 - put a limit on number of characters displayed in
   window titles during Alt+tab
 - fix configure check for Xrandr
 - fix 64-bit bug in property reading that broke
   things badly on 64-bit
 - don't move focus when clicking close button on a window
 - fix a crash in getting pixmap icons
 - spawn dialogs and child processes on the proper
   screen in multihead situations
 - if the focus gets set to None, set it back to
   something sane
 - load accessibility modules and set accessibility roles
 - fix hang after displaying warning dialogs
 - fix a memory corruption when sticking/unsticking windows
   that lead to a frequent crash and windows appearing
   in Alt+tab improperly
 - fix some handling of partial-width panel struts
 - more translations

2.6.1
 - rebuild with fixed glib-gettext.m4

2.6.0
 - some additional translations

2.5.5
 - fix aspect ratio handling
 - fix "shake loose" functionality for maximized windows
 - handle Xrandr size changes properly again
 - fix fullscreen window detection
 - fix workspace name handling
 - don't steal button press events on root window
 - nuke metacity.spec due to nonmaintenance
 - allow too-large-for-screen windows to move their titlebar offscreen
 - keep an MRU list of windows per-workspace and use it to focus
   the next window when the focused window disappears
 - fix cursor when moving
 - improve appearance of opaque resize
 - make BELOW window state work
 - fix a crash when gdk_pixmap_foreign_new() returned NULL

2.5.3
 - fixups to .desktop file
 - activate window prior to grab end, avoiding
   extra focus events
 - add support for partial-width panels (fixes corner panel
   and xinerama window position constraints)
 - added keybinding to toggle window as "always on top"
 - support --disable-schemas-install option to configure
 - destroy support for legacy GNOME 1.x hints; metacity
   no longer works with GNOME 1.x
 - disable raise-on-click for mouse focus modes
 - fix bug that broke many Javascript popup menus with mozilla
 - allow "shaking loose" maximized windows, to move them
   between Xinerama heads or whatever
 - honor desktop-wide double click timeout
 - handle window placement properly for windows that
   start out maximized
 - integrate Ximian patch to go ahead and log out after 4 minutes
   even if a dialog is open
 - fix a segfault
 - fix bug where window groups weren't always kept up to date
 - fix bug where focus got confused when switching workspaces
   with mouse focus mode
 - fix 64-bit crash on s390x
 - chdir to user's homedir on startup
 - keep window in fullscreen layer when its transients are focused
 - fix keybindings bug when you had ScrollLock enabled
 - many translation updates

2.5.2
 - improved wording/UI for some dialogs
 - while clicking a window button, if you move the mouse outside
   the button such that releasing the mouse button won't activate
   the window button, visually indicate by "popping out" the button.
 - fix some valgrind errors
 - change "show desktop mode" to convert to "everything is minimized
   mode" if you open a new window while showing desktop, rather
   than previous behavior of simply leaving show desktop mode.
 - fix a trivial memory leak
 - change "move to workspace N" so it doesn't switch workspaces,
   just moves the window.
 - translation updates

2.5.1
 - fix bug where fullscreen windows were below top panels
 - build fix for Solaris
 - support diagonal window movement with numeric keypad
 - multihead fix
 - build fix for Cygwin
 - place on xinerama containing the pointer
 - fix totally hosed window placement/movement for frameless
   windows
 - improvement to smoothness of window move/resize

2.5.0
 - many new translations
 - fix an infinite loop while holding a server grab triggered by
   some recent Qt versions doing weird stuff
 - fix bug where Alt+rightclick repeatedly on titlebar resulted
   in zillions of menus
 - fix Alt+Tab to *actually* put minimized windows at the end,
   though this was always intended
 - rewrite size/positions constraint code (currently known
   to be quite buggy, e.g. xmms is hosed)
 - enforce size of at least 1x1 on windows
 - reduce latency of managing new windows still further
   by using async properties code in more places
 - don't grab keybindings on docks, so gnome-panel
   can handle them
 - suck in the panel's screenshot and run dialog global
   bindings
 - lots of improvements to window placement
 - sync max number of workspaces with pager applet
 - fix to keep focus when inside window frame in
   strict mouse focus mode
 - make it possible to start a reverse tab with
   shift+alt+tab (vs. alt+tab then shift)
 - fix a multihead issue with constraints between two
   windows on different heads
 - require GTK+ 2.2.0 and fontconfig
 - default theme is now Simple
 - add visual bell feature
 - incorporate many fixes from 2.4.34
 - other stuff

4 files changed, 20 insertions, 14 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index f7d08ab5c44..fcaf7003603 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/14 20:33:25 jmmv Exp $
 #
 
-DISTNAME=	metacity-2.4.55
-PKGREVISION=	2
+DISTNAME=	metacity-2.6.3
 CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity
+HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity/
 COMMENT=	GNOME-compliant window manager
 
 BUILD_USES_MSGFMT=	YES
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 95aafaaee5f..9e443af206c 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/23 15:34:17 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/12/14 20:33:25 jmmv Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -22,30 +22,36 @@ ${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/bn/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/metacity.mo
 ${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/hi/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/hu/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
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/lt/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
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/metacity.mo
@@ -54,12 +60,15 @@ ${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/sq/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/ta/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/metacity.mo
 share/metacity/glade/metacity-properties.glade
@@ -172,7 +181,6 @@ share/themes/Simple/metacity-1/minimize.png
 @dirrm share/metacity/glade
 @dirrm share/metacity
 @comment in gnome2-dirs: @dirrm share/gnome/wm-properties
-@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
diff --git a/wm/metacity/buildlink2.mk b/wm/metacity/buildlink2.mk
index 0d34def3181..fd4bf2e509b 100644
--- a/wm/metacity/buildlink2.mk
+++ b/wm/metacity/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/14 20:33:25 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use metacity.
 #
@@ -9,14 +9,13 @@
 METACITY_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			metacity
-BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.55nb2
+BUILDLINK_DEPENDS.metacity?=		metacity>=2.6.3
 BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.metacity=metacity
 BUILDLINK_PREFIX.metacity_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.metacity+=	include/metacity-1/metacity-private/*
 BUILDLINK_FILES.metacity+=	lib/libmetacity-private.*
-BUILDLINK_FILES.metacity+=	lib/pkgconfig/libmetacity-private.pc
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 3c4882ea399..bc6c19d57bf 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/07/23 15:34:18 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/12/14 20:33:25 jmmv Exp $
 
-SHA1 (metacity-2.4.55.tar.bz2) = 450462a4e9d78e3ed422b97f6168f43bb395d4a4
-Size (metacity-2.4.55.tar.bz2) = 1350118 bytes
+SHA1 (metacity-2.6.3.tar.bz2) = 0b1b44a2e3a4bcf35cdb51e98887053dc60a4574
+Size (metacity-2.6.3.tar.bz2) = 1749859 bytes