Make compiz work out of the box:

  o Install schemas for compiz core and plugins, not just gwd
  o Patch compiz-core schema to load a sane set of plugins by default
  o Patch compiz-decorator schema to workaround a bug in the
    xf86-video-intel driver related to drop shadows.
  o Enable gnome PKG_OPTION by default.
  o Bump pkg revision.

5 files changed, 114 insertions, 5 deletions

diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 0a70fa1bfa3..a22ea4eefdd 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/04/23 22:48:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/12 01:57:37 jmcneill Exp $
 #
 
 DISTNAME=	compiz-0.6.2
-#PKGREVISION=	8
+PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/app/
 
@@ -16,15 +16,58 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
+COMPIZ_GCONF_SCHEMAS+=		compiz-annotate.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-blur.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-clone.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-core.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-cube.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-dbus.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-decoration.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-fade.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-fs.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-gconf.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-glib.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-ini.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-inotify.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-minimize.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-move.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-place.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-plane.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-png.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-regex.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-resize.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-rotate.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-scale.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-screenshot.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-svg.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-switcher.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-video.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-water.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-wobbly.schemas
+COMPIZ_GCONF_SCHEMAS+=		compiz-zoom.schemas
+
 GCONF_SCHEMAS+=		gwd.schemas
+GCONF_SCHEMAS+=		${COMPIZ_GCONF_SCHEMAS}
+
 PKGCONFIG_OVERRIDE+=	compiz.pc.in
 PKGCONFIG_OVERRIDE+=	libdecoration/libdecoration.pc.in
 
 CONFIGURE_ARGS+=	--disable-inotify
 
 PKG_SUPPORTED_OPTIONS=	gnome kde
+PKG_SUGGESTED_OPTIONS=	gnome
 PKG_OPTIONS_VAR=	PKG_OPTIONS.compiz
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	metadata/compiz-decoration.schemas
+SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	post-patch
+
+post-install:
+.for schema in ${COMPIZ_GCONF_SCHEMAS}
+	${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${PREFIX}/share/gconf/schemas
+.endfor
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST
index ad7dc96071b..07f0d9558ce 100644
--- a/wm/compiz/PLIST
+++ b/wm/compiz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/04/23 22:48:35 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/05/12 01:57:37 jmcneill Exp $
 bin/compiz
 bin/gtk-window-decorator
 include/compiz/compiz.h
@@ -37,7 +37,7 @@ lib/pkgconfig/compiz-gconf.pc
 lib/pkgconfig/compiz-scale.pc
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
-${PLIST.gnome}window-manager-settings/libcompiz.la
+${PLIST.gnome}lib/window-manager-settings/libcompiz.la
 share/compiz/annotate.xml
 share/compiz/blur.xml
 share/compiz/clone.xml
@@ -70,6 +70,35 @@ share/compiz/video.xml
 share/compiz/water.xml
 share/compiz/wobbly.xml
 share/compiz/zoom.xml
+share/gconf/schemas/compiz-annotate.schemas
+share/gconf/schemas/compiz-blur.schemas
+share/gconf/schemas/compiz-clone.schemas
+share/gconf/schemas/compiz-core.schemas
+share/gconf/schemas/compiz-cube.schemas
+share/gconf/schemas/compiz-dbus.schemas
+share/gconf/schemas/compiz-decoration.schemas
+share/gconf/schemas/compiz-fade.schemas
+share/gconf/schemas/compiz-fs.schemas
+share/gconf/schemas/compiz-gconf.schemas
+share/gconf/schemas/compiz-glib.schemas
+share/gconf/schemas/compiz-ini.schemas
+share/gconf/schemas/compiz-inotify.schemas
+share/gconf/schemas/compiz-minimize.schemas
+share/gconf/schemas/compiz-move.schemas
+share/gconf/schemas/compiz-place.schemas
+share/gconf/schemas/compiz-plane.schemas
+share/gconf/schemas/compiz-png.schemas
+share/gconf/schemas/compiz-regex.schemas
+share/gconf/schemas/compiz-resize.schemas
+share/gconf/schemas/compiz-rotate.schemas
+share/gconf/schemas/compiz-scale.schemas
+share/gconf/schemas/compiz-screenshot.schemas
+share/gconf/schemas/compiz-svg.schemas
+share/gconf/schemas/compiz-switcher.schemas
+share/gconf/schemas/compiz-video.schemas
+share/gconf/schemas/compiz-water.schemas
+share/gconf/schemas/compiz-wobbly.schemas
+share/gconf/schemas/compiz-zoom.schemas
 share/gconf/schemas/gwd.schemas
 ${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 ${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-key.xml
diff --git a/wm/compiz/distinfo b/wm/compiz/distinfo
index 7eaa8003c0f..f9bbaede0d1 100644
--- a/wm/compiz/distinfo
+++ b/wm/compiz/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2008/04/23 18:17:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2008/05/12 01:57:37 jmcneill Exp $
 
 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
+SHA1 (patch-aa) = 1b6ab48fd459bc2fa4173f8f1d4936aa0d5c00be
+SHA1 (patch-ab) = 273430fa119b4c904287115be1f5273868073899
diff --git a/wm/compiz/patches/patch-aa b/wm/compiz/patches/patch-aa
new file mode 100644
index 00000000000..99468754dd7
--- /dev/null
+++ b/wm/compiz/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2008/05/12 01:57:37 jmcneill Exp $
+
+--- metadata/compiz-core.schemas.orig	2008-05-11 20:43:31.000000000 -0400
++++ metadata/compiz-core.schemas	2008-05-11 20:44:03.000000000 -0400
+@@ -7,7 +7,7 @@
+       <owner>compiz</owner>
+       <type>list</type>
+       <list_type>string</list_type>
+-      <default>[]</default>
++      <default>[gconf,decoration,wobbly,fade,minimize,switcher,move,resize,place,rotate,zoom,scale]</default>
+       <locale name="C">
+         <short>Active Plugins</short>
+         <long>List of currently active plugins</long>
diff --git a/wm/compiz/patches/patch-ab b/wm/compiz/patches/patch-ab
new file mode 100644
index 00000000000..c666d162024
--- /dev/null
+++ b/wm/compiz/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2008/05/12 01:57:37 jmcneill Exp $
+
+--- metadata/compiz-decoration.schemas.orig	2007-10-01 13:43:31.000000000 -0400
++++ metadata/compiz-decoration.schemas	2008-05-11 21:38:39.000000000 -0400
+@@ -6,7 +6,7 @@
+       <applyto>/apps/compiz/plugins/decoration/allscreens/options/shadow_radius</applyto>
+       <owner>compiz</owner>
+       <type>float</type>
+-      <default>8.0</default>
++      <default>9.0</default>
+       <locale name="C">
+         <short>Shadow Radius</short>
+         <long>Drop shadow radius (0.1 - 18.0)</long>
+@@ -337,7 +337,7 @@
+       <applyto>/apps/compiz/plugins/decoration/allscreens/options/command</applyto>
+       <owner>compiz</owner>
+       <type>string</type>
+-      <default/>
++      <default>@PREFIX@/bin/gtk-window-decorator</default>
+       <locale name="C">
+         <short>Command</short>
+         <long>Decorator command line that is executed if no decorator is already running</long>