Update to 2.4.34. Some changes since 2.4.1:

 - tons of new translations
 - add new theme Simple and make it the default
 - match key handlers to key codes instead of key syms
   which fixes some occasional keybinding bugs
 - don't show workspace menu items if there's only one workspace
 - fix fullscreen mode workaround for xine/mplayer
 - fix startup sequences that use StartupWMClass
 - fix 64-bit bug in async-getprop.c that caused a lockup
 - put metacity-properties.c in the tarball
 - don't mess up the focus window in mouse focus mode when
   switching workspaces
 - improve event compression to speed up window move/resize
   a bit more
 - don't jump mozilla windows between workspaces
 - don't stick the tab/workspace-switch popup
   on machines under heavy load or slow machines
 - fix for #103317 (windows getting "stuck" when unfullscreened)
 - support up to 32 run_command keybindings (Rob Adams)
 - add compression for motion events, somewhat suboptimally,
   a better patch is pending for GNOME 2.2.1, should fix "slow
   move/resize" for most people (especially when combined
   with Alex's nautilus fixes)
 - fix configure options (Akira Tagoh)
 - we were making all dialogs skip the taskbar, even non-transient
   ones, though this was supposedly fixed a while ago. Now really
   fixed.
 - change back to Alt+click by default for the window drag feature.
 - assign Alt+F12 to shade window
 - fix not deleting enough workspaces when the number
   was reduced via the pager config dialog (readams@hmc.edu)
 - don't allow windows under the top panel ever, even if they
   are tall windows (Arvind)
 - fix up the window layout for directional workspace nav,
   so you always stop at the edges and always end up
   where you expect (hp, with tweaks from readams@hmc.edu)
 - focus new windows in mouse focus mode (readams@hmc.edu)
 - support xeyes, oclock, etc. by applying shape mask
   to the window manager frame (yeah it resizes slow, deal)
 - fix vertical/horizontal maximize
 - handle crossing events resizing for more opaque resize goodness
   (Soeren)
 - add wacky _METACITY_UPDATE_COUNTER experimental extension
   to do nice opaque resizing (does nothing without a GTK patch)
 - fix a crash setting workspace names
 - fix internationalized WM_NAME reading

Changes in the package:
- Use GConf2/schemas.mk to register schema files in the GConf2 database.
- Depend on gnome2-dirs to handle shared directories.
- Drop dependancy on ptl2.
- Provide a buildlink2.mk file because of the new library.

5 files changed, 111 insertions, 55 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index b411c0617a8..1b74f3f44e6 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2003/01/10 07:53:35 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/14 20:59:44 jmmv Exp $
 #
 
-DISTNAME=	metacity-2.4.1
-PKGREVISION=	1
+DISTNAME=	metacity-2.4.34
 CATEGORIES=	wm
-MASTER_SITES=	http://people.redhat.com/~hp/metacity/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.4/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
-#HOMEPAGE=	
+HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity
 COMMENT=	gnome-compliant window manager
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-included-gettext
@@ -21,10 +22,11 @@ USE_X11=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 
+GCONF2_SCHEMAS=		metacity.schemas
+
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
-.include "../../devel/ptl2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 33b9451c133..0fb35c231fc 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,36 +1,47 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/21 12:49:15 grant Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/02/14 20:59:44 jmmv Exp $
 bin/metacity
 bin/metacity-message
-bin/metacity-properties
 bin/metacity-theme-viewer
 bin/metacity-window-demo
-etc/gconf/gconf.xml.defaults/apps/metacity/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings/%gconf.xml
-etc/gconf/schemas/metacity.schemas
+include/metacity-1/metacity-private/common.h
+include/metacity-1/metacity-private/gradient.h
+include/metacity-1/metacity-private/preview-widget.h
+include/metacity-1/metacity-private/theme-parser.h
+include/metacity-1/metacity-private/theme.h
+include/metacity-1/metacity-private/util.h
+lib/libmetacity-private.a
+lib/libmetacity-private.la
+lib/libmetacity-private.so
+lib/libmetacity-private.so.0
+lib/libmetacity-private.so.0.0
+lib/pkgconfig/libmetacity-private.pc
 libexec/metacity-dialog
-share/control-center-2.0/capplets/metacity-properties.desktop
+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/bg/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/cs/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/fi/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/fr/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
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/metacity.mo
 ${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/mn/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/nl/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
@@ -38,6 +49,7 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/metacity.mo
 ${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/sv/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/metacity.mo
@@ -47,6 +59,19 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/metacity.mo
 share/metacity/glade/metacity-properties.glade
 share/metacity/icons/metacity-window-demo.png
 share/pixmaps/metacity-properties.png
+share/themes/AgingGorilla/metacity-1/active-button.png
+share/themes/AgingGorilla/metacity-1/active-close-button.png
+share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-maximize-button.png
+share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/active-menu-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-button.png
+share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
+share/themes/AgingGorilla/metacity-1/inactive-close-button.png
+share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
+share/themes/AgingGorilla/metacity-1/inactive-menu-button.png
+share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
+share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
 share/themes/Atlanta/metacity-1/metacity-theme-1.xml
 share/themes/Bright/metacity-1/metacity-theme-1.xml
 share/themes/Crux/metacity-1/active-border-top-left-border.png
@@ -69,6 +94,7 @@ share/themes/Crux/metacity-1/active-menu-button-prelight.png
 share/themes/Crux/metacity-1/active-menu-button-pressed.png
 share/themes/Crux/metacity-1/active-menu-button.png
 share/themes/Crux/metacity-1/active-minimize-button.png
+share/themes/Crux/metacity-1/active-restore-button.png
 share/themes/Crux/metacity-1/active-right-border.png
 share/themes/Crux/metacity-1/active-right-top-border-shaded.png
 share/themes/Crux/metacity-1/active-right-top-border.png
@@ -101,6 +127,7 @@ share/themes/Crux/metacity-1/inactive-menu-button-prelight.png
 share/themes/Crux/metacity-1/inactive-menu-button-pressed.png
 share/themes/Crux/metacity-1/inactive-menu-button.png
 share/themes/Crux/metacity-1/inactive-minimize-button.png
+share/themes/Crux/metacity-1/inactive-restore-button.png
 share/themes/Crux/metacity-1/inactive-right-border.png
 share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
 share/themes/Crux/metacity-1/inactive-right-top-border.png
@@ -114,24 +141,16 @@ share/themes/Crux/metacity-1/inactive-top-right-border.png
 share/themes/Crux/metacity-1/inactive-top-right-corner.png
 share/themes/Crux/metacity-1/metacity-theme-1.xml
 share/themes/Esco/metacity-1/metacity-theme-1.xml
-share/themes/Gorilla/metacity-1/active-button.png
-share/themes/Gorilla/metacity-1/active-close-button.png
-share/themes/Gorilla/metacity-1/active-close-menu-icon.png
-share/themes/Gorilla/metacity-1/active-maximize-button.png
-share/themes/Gorilla/metacity-1/active-maximize-menu-icon.png
-share/themes/Gorilla/metacity-1/active-menu-button.png
-share/themes/Gorilla/metacity-1/active-minimize-button.png
-share/themes/Gorilla/metacity-1/active-minimize-menu-icon.png
-share/themes/Gorilla/metacity-1/inactive-close-button.png
-share/themes/Gorilla/metacity-1/inactive-maximize-button.png
-share/themes/Gorilla/metacity-1/inactive-menu-button.png
-share/themes/Gorilla/metacity-1/inactive-minimize-button.png
-share/themes/Gorilla/metacity-1/metacity-theme-1.xml
 share/themes/Metabox/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/close.png
+share/themes/Simple/metacity-1/maximize.png
+share/themes/Simple/metacity-1/maximized.png
+share/themes/Simple/metacity-1/metacity-theme-1.xml
+share/themes/Simple/metacity-1/minimize.png
+@dirrm share/themes/Simple/metacity-1
+@dirrm share/themes/Simple
 @dirrm share/themes/Metabox/metacity-1
 @dirrm share/themes/Metabox
-@dirrm share/themes/Gorilla/metacity-1
-@dirrm share/themes/Gorilla
 @dirrm share/themes/Esco/metacity-1
 @dirrm share/themes/Esco
 @dirrm share/themes/Crux/metacity-1
@@ -140,22 +159,14 @@ share/themes/Metabox/metacity-1/metacity-theme-1.xml
 @dirrm share/themes/Bright
 @dirrm share/themes/Atlanta/metacity-1
 @dirrm share/themes/Atlanta
+@dirrm share/themes/AgingGorilla/metacity-1
+@dirrm share/themes/AgingGorilla
+@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE}
 @dirrm share/metacity/icons
 @dirrm share/metacity/glade
 @dirrm share/metacity
-@unexec ${RMDIR} %D/share/gnome/wm-properties 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf/schemas 2>/dev/null || ${TRUE}
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/metacity
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/metacity
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf 2>/dev/null || ${TRUE}
+@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
new file mode 100644
index 00000000000..b8bf8b4b1cb
--- /dev/null
+++ b/wm/metacity/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/02/14 20:59:44 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use metacity.
+#
+# This file was created automatically using createbuildlink 2.4.
+#
+
+.if !defined(METACITY_BUILDLINK2_MK)
+METACITY_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			metacity
+BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.34
+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"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	metacity-buildlink
+
+metacity-buildlink: _BUILDLINK_USE
+
+.endif	# METACITY_BUILDLINK2_MK
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 60565a5229e..9cc2af8ba8e 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/09/10 17:17:08 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 20:59:44 jmmv Exp $
 
-SHA1 (metacity-2.4.1.tar.gz) = 42468cd4b57ed801b120d0bdfbb1ac58602666d8
-Size (metacity-2.4.1.tar.gz) = 1254691 bytes
+SHA1 (metacity-2.4.34.tar.bz2) = 2262ceea772107522777ee17463ce9b6184fe285
+Size (metacity-2.4.34.tar.bz2) = 1217155 bytes
+SHA1 (patch-aa) = a5f4d2a89228e9cab834938c3ccb692f2bd0be65
diff --git a/wm/metacity/patches/patch-aa b/wm/metacity/patches/patch-aa
new file mode 100644
index 00000000000..a6cd09857eb
--- /dev/null
+++ b/wm/metacity/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2003/02/14 20:59:44 jmmv Exp $
+
+--- src/Makefile.in.orig	2003-02-13 23:51:38.000000000 +0100
++++ src/Makefile.in
+@@ -679,7 +679,6 @@ maintainer-clean-generic clean mostlycle
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+ 
+ inlinepixbufs.h: $(IMAGES)
+ 	   $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h