-switch compiz to 0.4.0 which is the actual stable version

-add "gnome" and "kde" options to build extended support for these
 platforms. gnome works well, kde builds fine but is untested otherwise

3 files changed, 81 insertions, 9 deletions

diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 626d1d95f3d..1d31832cf86 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/03/28 13:28:38 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/17 21:54:35 drochner Exp $
 #
 
-DISTNAME=	compiz-0.3.6
+DISTNAME=	compiz-0.4.0
 CATEGORIES=	wm x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,8 +11,6 @@ HOMEPAGE=	http://www.go-compiz.org/
 COMMENT=	Compositing window manager
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 USE_TOOLS+=		pkg-config msgfmt
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
@@ -23,12 +21,39 @@ GCONF2_SCHEMAS+=	compiz.schemas
 PKGCONFIG_OVERRIDE+=	compiz.pc.in
 PKGCONFIG_OVERRIDE+=	libdecoration/libdecoration.pc.in
 
+CONFIGURE_ARGS+=	--disable-inotify
+
+PKG_SUPPORTED_OPTIONS=	gnome kde
+PKG_OPTIONS_VAR=	PKG_OPTIONS.compiz
+
+.include "../../mk/bsd.options.mk"
+
 # this is as much as needed for the basic window decorator
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=	--enable-librsvg
+PLIST_SUBST+=		GNOME=""
+.include "../../x11/gnome2-control-center/buildlink3.mk"
+.include "../../wm/metacity/buildlink3.mk"
+.include "../../graphics/librsvg2/buildlink3.mk"
+.else
+PLIST_SUBST+=		GNOME="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mkde)
+PLIST_SUBST+=		KDE=""
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../sysutils/dbus-qt3/buildlink3.mk"
+.else
+PLIST_SUBST+=		KDE="@comment "
+.endif
+
 .include "../../devel/GConf2/schemas.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
@@ -40,4 +65,5 @@ PKGCONFIG_OVERRIDE+=	libdecoration/libdecoration.pc.in
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST
index 8790b4277e2..022a8614fd1 100644
--- a/wm/compiz/PLIST
+++ b/wm/compiz/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/23 19:42:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/17 21:54:35 drochner Exp $
 bin/compiz
 bin/gtk-window-decorator
+${KDE}bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/decoration.h
 lib/compiz/libannotate.la
+lib/compiz/libblur.la
 lib/compiz/libclone.la
 lib/compiz/libcube.la
+lib/compiz/libdbus.la
 lib/compiz/libdecoration.la
 lib/compiz/libfade.la
 lib/compiz/libgconf.la
@@ -18,6 +21,7 @@ lib/compiz/libresize.la
 lib/compiz/librotate.la
 lib/compiz/libscale.la
 lib/compiz/libscreenshot.la
+${GNOME}lib/compiz/libsvg.la
 lib/compiz/libswitcher.la
 lib/compiz/libwater.la
 lib/compiz/libwobbly.la
@@ -25,23 +29,65 @@ lib/compiz/libzoom.la
 lib/libdecoration.la
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
+${GNOME}lib/window-manager-settings/libcompiz.la
 share/compiz/freedesktop.png
 share/compiz/icon.png
 share/gconf/schemas/compiz.schemas
 share/gconf/schemas/gwd.schemas
+${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
+share/locale/bn/LC_MESSAGES/compiz.mo
+share/locale/bs/LC_MESSAGES/compiz.mo
+share/locale/ca/LC_MESSAGES/compiz.mo
 share/locale/cs/LC_MESSAGES/compiz.mo
+share/locale/cy/LC_MESSAGES/compiz.mo
+share/locale/da/LC_MESSAGES/compiz.mo
 share/locale/de/LC_MESSAGES/compiz.mo
+share/locale/el/LC_MESSAGES/compiz.mo
+share/locale/en_GB/LC_MESSAGES/compiz.mo
+share/locale/en_US/LC_MESSAGES/compiz.mo
 share/locale/es/LC_MESSAGES/compiz.mo
+share/locale/et/LC_MESSAGES/compiz.mo
 share/locale/fi/LC_MESSAGES/compiz.mo
 share/locale/fr/LC_MESSAGES/compiz.mo
+share/locale/gl/LC_MESSAGES/compiz.mo
+share/locale/gu/LC_MESSAGES/compiz.mo
+share/locale/he/LC_MESSAGES/compiz.mo
+share/locale/hi/LC_MESSAGES/compiz.mo
+share/locale/hr/LC_MESSAGES/compiz.mo
 share/locale/hu/LC_MESSAGES/compiz.mo
+share/locale/id/LC_MESSAGES/compiz.mo
 share/locale/it/LC_MESSAGES/compiz.mo
 share/locale/ja/LC_MESSAGES/compiz.mo
+share/locale/ka/LC_MESSAGES/compiz.mo
+share/locale/km/LC_MESSAGES/compiz.mo
+share/locale/ko/LC_MESSAGES/compiz.mo
+share/locale/lo/LC_MESSAGES/compiz.mo
+share/locale/lt/LC_MESSAGES/compiz.mo
+share/locale/mk/LC_MESSAGES/compiz.mo
+share/locale/mr/LC_MESSAGES/compiz.mo
+share/locale/nb/LC_MESSAGES/compiz.mo
+share/locale/nl/LC_MESSAGES/compiz.mo
+share/locale/pa/LC_MESSAGES/compiz.mo
 share/locale/pl/LC_MESSAGES/compiz.mo
+share/locale/pt/LC_MESSAGES/compiz.mo
 share/locale/pt_BR/LC_MESSAGES/compiz.mo
+share/locale/ro/LC_MESSAGES/compiz.mo
+share/locale/ru/LC_MESSAGES/compiz.mo
+share/locale/sk/LC_MESSAGES/compiz.mo
+share/locale/sl/LC_MESSAGES/compiz.mo
+share/locale/sr/LC_MESSAGES/compiz.mo
 share/locale/sv/LC_MESSAGES/compiz.mo
+share/locale/ta/LC_MESSAGES/compiz.mo
+share/locale/tr/LC_MESSAGES/compiz.mo
+share/locale/uk/LC_MESSAGES/compiz.mo
+share/locale/vi/LC_MESSAGES/compiz.mo
+share/locale/xh/LC_MESSAGES/compiz.mo
 share/locale/zh_CN/LC_MESSAGES/compiz.mo
 share/locale/zh_TW/LC_MESSAGES/compiz.mo
+share/locale/zu/LC_MESSAGES/compiz.mo
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/compiz
 @dirrm lib/compiz
diff --git a/wm/compiz/distinfo b/wm/compiz/distinfo
index f4f782819b8..c8d672c62eb 100644
--- a/wm/compiz/distinfo
+++ b/wm/compiz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/23 19:42:38 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/04/17 21:54:35 drochner Exp $
 
-SHA1 (compiz-0.3.6.tar.bz2) = 5deca0d7a426aef4d2a854b7efbf6ff44c7752f8
-RMD160 (compiz-0.3.6.tar.bz2) = d379ae44b474cba8f179bb1ab2ecb0181228a0aa
-Size (compiz-0.3.6.tar.bz2) = 722782 bytes
+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