Update to 0.6.2:

Release 0.6.2 (2007-10-18 Danny Baumann <dannybaumann@web.de>)
==============================================================
Stable release.

Support for automatically starting one decorator per screen.

Various stacking problem fixes.

Fixes for various focus issues.

Minor other bug fixes.

Release 0.6.0 (2007-10-01 Danny Baumann <dannybaumann@web.de>)
==============================================================
Third stable release of Compiz.

Improved focus stealing prevention.

Improved dynamic desktop resizing support.

Added button action configuration options to gtk-window-decorator.

Added UTF-8 window title support to kde-window-decorator.

Various bug fixes and improvements.

... and more, check the NEWS file.

5 files changed, 51 insertions, 55 deletions

diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 92930b59907..aaba0eedf5f 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,24 +1,22 @@
-# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/23 18:17:25 xtraeme Exp $
 #
 
-DISTNAME=	compiz-0.4.0
-PKGREVISION=	8
+DISTNAME=	compiz-0.6.2
+#PKGREVISION=	8
 CATEGORIES=	wm x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/app/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://compiz.org/
 COMMENT=	Compositing window manager
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config msgfmt
+USE_TOOLS+=		intltool pkg-config msgfmt
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
-GCONF_SCHEMAS+=	gwd.schemas
-GCONF_SCHEMAS+=	compiz.schemas
+GCONF_SCHEMAS+=		gwd.schemas
 PKGCONFIG_OVERRIDE+=	compiz.pc.in
 PKGCONFIG_OVERRIDE+=	libdecoration/libdecoration.pc.in
 
@@ -55,9 +53,10 @@ PLIST.kde=		yes
 .include "../../mk/pthread.buildlink3.mk"
 
 .include "../../devel/GConf/schemas.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST
index 576df02f0a9..a679ea0614b 100644
--- a/wm/compiz/PLIST
+++ b/wm/compiz/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/23 18:17:25 xtraeme Exp $
 bin/compiz
 bin/gtk-window-decorator
-${PLIST.kde}bin/kde-window-decorator
 include/compiz/compiz.h
+include/compiz/cube.h
 include/compiz/decoration.h
+include/compiz/scale.h
 lib/compiz/libannotate.la
 lib/compiz/libblur.la
 lib/compiz/libclone.la
@@ -12,29 +13,62 @@ lib/compiz/libdbus.la
 lib/compiz/libdecoration.la
 lib/compiz/libfade.la
 lib/compiz/libgconf.la
+lib/compiz/libglib.la
+lib/compiz/libini.la
 lib/compiz/libminimize.la
 lib/compiz/libmove.la
 lib/compiz/libplace.la
 lib/compiz/libplane.la
 lib/compiz/libpng.la
+lib/compiz/libregex.la
 lib/compiz/libresize.la
 lib/compiz/librotate.la
 lib/compiz/libscale.la
 lib/compiz/libscreenshot.la
-${PLIST.gnome}lib/compiz/libsvg.la
 lib/compiz/libswitcher.la
+lib/compiz/libvideo.la
 lib/compiz/libwater.la
 lib/compiz/libwobbly.la
 lib/compiz/libzoom.la
 lib/libdecoration.la
+lib/pkgconfig/compiz-cube.pc
+lib/pkgconfig/compiz-gconf.pc
+lib/pkgconfig/compiz-scale.pc
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
-${PLIST.gnome}lib/window-manager-settings/libcompiz.la
+share/compiz/annotate.xml
+share/compiz/blur.xml
+share/compiz/clone.xml
+share/compiz/core.xml
+share/compiz/cube.xml
+share/compiz/dbus.xml
+share/compiz/decoration.xml
+share/compiz/fade.xml
 share/compiz/freedesktop.png
+share/compiz/fs.xml
+share/compiz/gconf.xml
+share/compiz/glib.xml
 share/compiz/icon.png
-share/gconf/schemas/compiz.schemas
+share/compiz/ini.xml
+share/compiz/inotify.xml
+share/compiz/minimize.xml
+share/compiz/move.xml
+share/compiz/place.xml
+share/compiz/plane.xml
+share/compiz/png.xml
+share/compiz/regex.xml
+share/compiz/resize.xml
+share/compiz/rotate.xml
+share/compiz/scale.xml
+share/compiz/schemas.xslt
+share/compiz/screenshot.xml
+share/compiz/svg.xml
+share/compiz/switcher.xml
+share/compiz/video.xml
+share/compiz/water.xml
+share/compiz/wobbly.xml
+share/compiz/zoom.xml
 share/gconf/schemas/gwd.schemas
-${PLIST.gnome}share/gnome/wm-properties/compiz.desktop
 share/locale/af/LC_MESSAGES/compiz.mo
 share/locale/ar/LC_MESSAGES/compiz.mo
 share/locale/bg/LC_MESSAGES/compiz.mo
diff --git a/wm/compiz/distinfo b/wm/compiz/distinfo
index 9f1634a72eb..7eaa8003c0f 100644
--- a/wm/compiz/distinfo
+++ b/wm/compiz/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/10/12 16:22:24 drochner Exp $
+$NetBSD: distinfo,v 1.5 2008/04/23 18:17:25 xtraeme Exp $
 
-SHA1 (compiz-0.4.0.tar.bz2) = b2eaec6bcb0513dcd7d8c62c45aa84b218c9e7be
-RMD160 (compiz-0.4.0.tar.bz2) = dbfd9874b28bac61954887e33b4cba126acca141
-Size (compiz-0.4.0.tar.bz2) = 900099 bytes
-SHA1 (patch-aa) = 229e308c58cdf1ba916de218475224420324dcf4
-SHA1 (patch-ab) = ae846e1f536c54df3d2cba94b424f0f9ffff7696
+SHA1 (compiz-0.6.2.tar.gz) = ab5ecad856049a12a803fe6c94c3e55cdfcb5f68
+RMD160 (compiz-0.6.2.tar.gz) = 6cc235570c3ac15573050b27198648045a85a804
+Size (compiz-0.6.2.tar.gz) = 1784471 bytes
diff --git a/wm/compiz/patches/patch-aa b/wm/compiz/patches/patch-aa
deleted file mode 100644
index 0c22ad34c05..00000000000
--- a/wm/compiz/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/07/16 09:39:20 drochner Exp $
-
---- src/Makefile.in.orig	2007-07-15 10:23:02.000000000 +0200
-+++ src/Makefile.in
-@@ -269,7 +269,7 @@ INCLUDES = \
- 	-DPLUGINDIR=\"$(plugindir)\" \
- 	-DIMAGEDIR=\"$(imagedir)\"
- 
--compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
-+compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- compiz_LDFLAGS = -export-dynamic
- compiz_SOURCES = \
- 	main.c	   \
diff --git a/wm/compiz/patches/patch-ab b/wm/compiz/patches/patch-ab
deleted file mode 100644
index 9e2a3eea34b..00000000000
--- a/wm/compiz/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/10/12 16:22:24 drochner Exp $
-
---- gtk/window-decorator/gtk-window-decorator.c.orig	2007-09-29 23:17:39.000000000 +0200
-+++ gtk/window-decorator/gtk-window-decorator.c
-@@ -4248,6 +4248,7 @@ action_menu_map (WnckWindow *win,
-     case WNCK_WINDOW_DOCK:
- 	/* don't allow window action */
- 	return;
-+#if 0 /* libwnck>=2.19.3 has no WNCK_WINDOW_MODAL_DIALOG */
-     case WNCK_WINDOW_NORMAL:
-     case WNCK_WINDOW_DIALOG:
-     case WNCK_WINDOW_MODAL_DIALOG:
-@@ -4255,6 +4256,9 @@ action_menu_map (WnckWindow *win,
-     case WNCK_WINDOW_MENU:
-     case WNCK_WINDOW_UTILITY:
-     case WNCK_WINDOW_SPLASHSCREEN:
-+#else
-+    default:
-+#endif
- 	/* allow window action menu */
- 	break;
-     }