>Number:         18226
>Category:       pkg
>Synopsis:       Update wm/metacity to 2.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 07 15:41:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6G
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar 1.6G NetBSD 1.6G (DARKSTAR) #10: Wed Sep 4 15:25:12 CEST 2002 jmmv@darkstar:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	Our current pkgsrc includes version 2.3.377 of wm/metacity.
	Although, 2.4.0 is out.

	This PR does the update, as well as applies the buildlink2 stuff
	to the package.

	NOTE: You may want to add a dependancy with gnome2-cc (pkg/18223)
	as this package installs a capplet.
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/metacity/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	2002/06/09 21:58:42	1.1
+++ Makefile	2002/09/07 22:37:38
@@ -1,25 +1,30 @@
 # $NetBSD: Makefile,v 1.1 2002/06/09 21:58:42 agc Exp $
 #
 
-DISTNAME=	metacity-2.3.377
+DISTNAME=	metacity-2.4.0
 CATEGORIES=	wm
 MASTER_SITES=	http://people.redhat.com/~hp/metacity/
 
 MAINTAINER=	packages@netbsd.org
-#HOMEPAGE=	
-COMMENT=	gnome-compliant window manager
+HOMEPAGE=	# unknown
+COMMENT=	GNOME-compliant window manager
 
+BUILD_USES_MSGFMT=	yes
+
 GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
+USE_GMAKE=		yes
+USE_GNU_GETTEXT=	yes
+USE_X11BASE=		yes
+
 CONFIGURE_ARGS+=	--without-included-gettext
+
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-CONFIGURE_ENV+=		PKG_CONFIG=${BUILDLINK_DIR}/bin/pkg-config
-
-BUILD_USES_MSGFMT=	yes
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/GConf2/buildlink.mk"
-.include "../../x11/gtk2/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/libglade2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/metacity/PLIST,v
retrieving revision 1.1
diff -u -u -r1.1 PLIST
--- PLIST	2002/06/09 21:58:43	1.1
+++ PLIST	2002/09/07 22:37:38
@@ -1,22 +1,31 @@
 @comment $NetBSD: PLIST,v 1.1 2002/06/09 21:58:43 agc 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
 libexec/metacity-dialog
+share/control-center-2.0/capplets/metacity-properties.desktop
 share/gnome/wm-properties/metacity.desktop
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/metacity.mo
 ${PKGLOCALEDIR}/locale/gl/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
@@ -29,93 +38,124 @@
 ${PKGLOCALEDIR}/locale/sv/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/zh_CN/LC_MESSAGES/metacity.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/metacity.mo
+share/metacity/glade/metacity-properties.glade
 share/metacity/icons/metacity-window-demo.png
-share/metacity/themes/Atlanta/metacity-theme-1.xml
-share/metacity/themes/Bright/metacity-theme-1.xml
-share/metacity/themes/Crux/active-bottom-left-border.png
-share/metacity/themes/Crux/active-bottom-left-corner.png
-share/metacity/themes/Crux/active-bottom-mid-left-border.png
-share/metacity/themes/Crux/active-bottom-mid-right-border.png
-share/metacity/themes/Crux/active-bottom-right-border.png
-share/metacity/themes/Crux/active-bottom-right-corner.png
-share/metacity/themes/Crux/active-button-prelight.png
-share/metacity/themes/Crux/active-button-pressed.png
-share/metacity/themes/Crux/active-button.png
-share/metacity/themes/Crux/active-close-button.png
-share/metacity/themes/Crux/active-left-border.png
-share/metacity/themes/Crux/active-left-top-border-shaded.png
-share/metacity/themes/Crux/active-left-top-border.png
-share/metacity/themes/Crux/active-maximize-button.png
-share/metacity/themes/Crux/active-menu-button-prelight.png
-share/metacity/themes/Crux/active-menu-button-pressed.png
-share/metacity/themes/Crux/active-menu-button.png
-share/metacity/themes/Crux/active-minimize-button.png
-share/metacity/themes/Crux/active-right-border.png
-share/metacity/themes/Crux/active-right-top-border-shaded.png
-share/metacity/themes/Crux/active-right-top-border.png
-share/metacity/themes/Crux/active-top-center-left.png
-share/metacity/themes/Crux/active-top-center-mid-left.png
-share/metacity/themes/Crux/active-top-center-mid-right.png
-share/metacity/themes/Crux/active-top-center-right.png
-share/metacity/themes/Crux/active-top-left-border.png
-share/metacity/themes/Crux/active-top-right-border.png
-share/metacity/themes/Crux/inactive-bottom-left-border.png
-share/metacity/themes/Crux/inactive-bottom-left-corner.png
-share/metacity/themes/Crux/inactive-bottom-mid-border.png
-share/metacity/themes/Crux/inactive-bottom-right-border.png
-share/metacity/themes/Crux/inactive-bottom-right-corner.png
-share/metacity/themes/Crux/inactive-button-prelight.png
-share/metacity/themes/Crux/inactive-button-pressed.png
-share/metacity/themes/Crux/inactive-button.png
-share/metacity/themes/Crux/inactive-close-button.png
-share/metacity/themes/Crux/inactive-left-border.png
-share/metacity/themes/Crux/inactive-left-top-border-shaded.png
-share/metacity/themes/Crux/inactive-left-top-border.png
-share/metacity/themes/Crux/inactive-maximize-button.png
-share/metacity/themes/Crux/inactive-menu-button-prelight.png
-share/metacity/themes/Crux/inactive-menu-button-pressed.png
-share/metacity/themes/Crux/inactive-menu-button.png
-share/metacity/themes/Crux/inactive-minimize-button.png
-share/metacity/themes/Crux/inactive-right-border.png
-share/metacity/themes/Crux/inactive-right-top-border-shaded.png
-share/metacity/themes/Crux/inactive-right-top-border.png
-share/metacity/themes/Crux/inactive-top-center-left.png
-share/metacity/themes/Crux/inactive-top-center-mid.png
-share/metacity/themes/Crux/inactive-top-center-right.png
-share/metacity/themes/Crux/inactive-top-left-border.png
-share/metacity/themes/Crux/inactive-top-right-border.png
-share/metacity/themes/Crux/metacity-theme-1.xml
-share/metacity/themes/Esco/metacity-theme-1.xml
-share/metacity/themes/Gorilla/active-button.png
-share/metacity/themes/Gorilla/active-close-button.png
-share/metacity/themes/Gorilla/active-maximize-button.png
-share/metacity/themes/Gorilla/active-menu-button.png
-share/metacity/themes/Gorilla/active-minimize-button.png
-share/metacity/themes/Gorilla/inactive-close-button.png
-share/metacity/themes/Gorilla/inactive-maximize-button.png
-share/metacity/themes/Gorilla/inactive-menu-button.png
-share/metacity/themes/Gorilla/inactive-minimize-button.png
-share/metacity/themes/Gorilla/metacity-theme-1.xml
-@dirrm share/metacity/themes/Gorilla
-@dirrm share/metacity/themes/Esco
-@dirrm share/metacity/themes/Crux
-@dirrm share/metacity/themes/Bright
-@dirrm share/metacity/themes/Atlanta
-@dirrm share/metacity/themes
-@dirrm share/metacity/icons
-@dirrm share/metacity
-@dirrm share/locale/ms/LC_MESSAGES
-@dirrm share/locale/lv/LC_MESSAGES
-@dirrm share/gnome/wm-properties
-@dirrm etc/gconf/schemas
+share/pixmaps/metacity-properties.png
+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
+share/themes/Crux/metacity-1/active-border-top-right-border.png
+share/themes/Crux/metacity-1/active-bottom-left-border.png
+share/themes/Crux/metacity-1/active-bottom-left-corner.png
+share/themes/Crux/metacity-1/active-bottom-mid-left-border.png
+share/themes/Crux/metacity-1/active-bottom-mid-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-border.png
+share/themes/Crux/metacity-1/active-bottom-right-corner.png
+share/themes/Crux/metacity-1/active-button-prelight.png
+share/themes/Crux/metacity-1/active-button-pressed.png
+share/themes/Crux/metacity-1/active-button.png
+share/themes/Crux/metacity-1/active-close-button.png
+share/themes/Crux/metacity-1/active-left-border.png
+share/themes/Crux/metacity-1/active-left-top-border-shaded.png
+share/themes/Crux/metacity-1/active-left-top-border.png
+share/themes/Crux/metacity-1/active-maximize-button.png
+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-right-border.png
+share/themes/Crux/metacity-1/active-right-top-border-shaded.png
+share/themes/Crux/metacity-1/active-right-top-border.png
+share/themes/Crux/metacity-1/active-top-center-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-left.png
+share/themes/Crux/metacity-1/active-top-center-mid-right.png
+share/themes/Crux/metacity-1/active-top-center-right.png
+share/themes/Crux/metacity-1/active-top-left-border.png
+share/themes/Crux/metacity-1/active-top-left-corner.png
+share/themes/Crux/metacity-1/active-top-mid-left-border.png
+share/themes/Crux/metacity-1/active-top-mid-right-border.png
+share/themes/Crux/metacity-1/active-top-right-border.png
+share/themes/Crux/metacity-1/active-top-right-corner.png
+share/themes/Crux/metacity-1/inactive-border-top-left-border.png
+share/themes/Crux/metacity-1/inactive-border-top-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-border.png
+share/themes/Crux/metacity-1/inactive-bottom-left-corner.png
+share/themes/Crux/metacity-1/inactive-bottom-mid-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-border.png
+share/themes/Crux/metacity-1/inactive-bottom-right-corner.png
+share/themes/Crux/metacity-1/inactive-button-prelight.png
+share/themes/Crux/metacity-1/inactive-button-pressed.png
+share/themes/Crux/metacity-1/inactive-button.png
+share/themes/Crux/metacity-1/inactive-close-button.png
+share/themes/Crux/metacity-1/inactive-left-border.png
+share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-left-top-border.png
+share/themes/Crux/metacity-1/inactive-maximize-button.png
+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-right-border.png
+share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png
+share/themes/Crux/metacity-1/inactive-right-top-border.png
+share/themes/Crux/metacity-1/inactive-top-center-left.png
+share/themes/Crux/metacity-1/inactive-top-center-mid.png
+share/themes/Crux/metacity-1/inactive-top-center-right.png
+share/themes/Crux/metacity-1/inactive-top-left-border.png
+share/themes/Crux/metacity-1/inactive-top-left-corner.png
+share/themes/Crux/metacity-1/inactive-top-mid-border.png
+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
+@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/schemas/apps
+@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/schemas 2>/dev/null || ${TRUE}
 @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
-@dirrm etc/gconf/gconf.xml.defaults/apps
-@dirrm etc/gconf/gconf.xml.defaults
+@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}
+@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
+@dirrm share/themes/Crux
+@dirrm share/themes/Bright/metacity-1
+@dirrm share/themes/Bright
+@dirrm share/themes/Atlanta/metacity-1
+@dirrm share/themes/Atlanta
+@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/share/control-center-2.0/capplets 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/control-center-2.0 2>/dev/null || ${TRUE}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/metacity/distinfo,v
retrieving revision 1.1
diff -u -u -r1.1 distinfo
--- distinfo	2002/06/09 21:58:43	1.1
+++ distinfo	2002/09/07 22:37:38
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.1 2002/06/09 21:58:43 agc Exp $
 
-SHA1 (metacity-2.3.377.tar.gz) = 447a36960eb022a786f797df7654db06f495cc3e
-Size (metacity-2.3.377.tar.gz) = 583787 bytes
+SHA1 (metacity-2.4.0.tar.gz) = c03a1fe43eae0d3ec2984a86820d959e11d5e075
+Size (metacity-2.4.0.tar.gz) = 1126846 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: