Update to last release before the rewrite. Added options framework for

inotify (enabled by default), gnome, kde{3,4}, and fuse PKG_OPTIONS.
PLIST is handled accordingly. USE_TOOLS+=xgettext msgmerge; Moved
PKG_OPTIONS in Makefile to options.mk. Fix DLLIBS using
BUILDLINK_TRANSFORM. Buildlink pango (build), dlopen, glib2,
libxml2, libXext, and libX11. From NEWS:

Release 0.8.8 (2011-03-30 Danny Baumann <dannybaumann@web.de>)
==============================================================
Maintenance release.

Various focus and stacking fixes.

Removed usages of deprecated GTK API.

Fixed drawing of switcher background with KDE4 window decorator.

Release 0.8.6 (2010-03-28 Danny Baumann <dannybaumann@web.de>)
==============================================================
Maintenance release.

Various focus and window placement fixes.

Fixed handling of windows that have a (server-drawn) border.

Fixed handling of window icons that have a colour depth of 1 bit.

Added KDE 4.4 support to KDE4 window decorator.

7 files changed, 120 insertions, 72 deletions

diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 89a232c2c93..f8033b7ef03 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2013/06/06 12:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2013/06/30 20:30:09 rodent Exp $
 #
 
-PKGVER=		0.8.4
+PKGVER=		0.8.8
 DISTNAME=	compiz-${PKGVER}
-PKGREVISION=	36
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
@@ -13,7 +12,7 @@ COMMENT=	Compositing window manager
 LICENSE=	mit
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		intltool pkg-config msgfmt gmake
+USE_TOOLS+=		gmake intltool msgfmt msgmerge pkg-config xgettext
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -56,54 +55,39 @@ 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/decoration.xml.in
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_STAGE.paths=	post-patch
 
+.include "options.mk"
+
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+
 post-install:
 .for schema in ${COMPIZ_GCONF_SCHEMAS}
 	${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${DESTDIR}${PREFIX}/share/gconf/schemas
 .endfor
 
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
-
 # this is as much as needed for the basic window decorator
+BUILDLINK_DEPMETHOD.pango=	build
+.include "../../devel/pango/buildlink3.mk"
 .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.gnome=		yes
-.include "../../x11/gnome-control-center/buildlink3.mk"
-.include "../../wm/metacity/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mkde)
-PLIST.kde=		yes
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../sysutils/dbus-qt3/buildlink3.mk"
-.endif
-
 # While we don't use threads, we link against libpthread because
-# some plugins do it.
+# some plugins do it. Same for dlopen.
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
@@ -115,7 +99,10 @@ PLIST.kde=		yes
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libXrender+=	libXrender>=0.9.3
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST
index ef17bca4474..19821121845 100644
--- a/wm/compiz/PLIST
+++ b/wm/compiz/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.11 2010/03/16 11:06:17 obache Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/06/30 20:30:09 rodent Exp $
 bin/compiz
 bin/gtk-window-decorator
-${PLIST.kde}bin/kde-window-decorator
+${PLIST.kde3}bin/kde-window-decorator
 include/compiz/compiz-common.h
 include/compiz/compiz-core.h
 include/compiz/compiz-cube.h
@@ -21,7 +21,8 @@ lib/compiz/libgconf.la
 lib/compiz/libglib.la
 lib/compiz/libgnomecompat.la
 lib/compiz/libini.la
-${PLIST.kde}lib/compiz/libkconfig.la
+${PLIST.inotify}lib/compiz/libinotify.la
+${PLIST.kde3}lib/compiz/libkconfig.la
 lib/compiz/libminimize.la
 lib/compiz/libmove.la
 lib/compiz/libobs.la
@@ -41,7 +42,7 @@ lib/compiz/libzoom.la
 lib/libdecoration.la
 lib/pkgconfig/compiz-cube.pc
 lib/pkgconfig/compiz-gconf.pc
-${PLIST.kde}lib/pkgconfig/compiz-kconfig.pc
+${PLIST.kde3}lib/pkgconfig/compiz-kconfig.pc
 lib/pkgconfig/compiz-scale.pc
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
@@ -66,7 +67,7 @@ share/compiz/ini.xml
 share/compiz/inotify.xml
 ${PLIST.kde}share/compiz/kcfg.xslt
 share/compiz/kconfig.xml
-${PLIST.kde}share/compiz/kconfig.xslt
+${PLIST.kde3}share/compiz/kconfig.xslt
 share/compiz/minimize.xml
 share/compiz/move.xml
 share/compiz/obs.xml
@@ -135,7 +136,7 @@ ${PLIST.kde}share/kde/config.kcfg/compiz-glib.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-gnomecompat.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-ini.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-inotify.kcfg
-${PLIST.kde}share/kde/config.kcfg/compiz-kconfig.kcfg
+${PLIST.kde3}share/kde/config.kcfg/compiz-kconfig.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-minimize.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-move.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-obs.kcfg
diff --git a/wm/compiz/buildlink3.mk b/wm/compiz/buildlink3.mk
index cca9a555147..912689d3d7d 100644
--- a/wm/compiz/buildlink3.mk
+++ b/wm/compiz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2013/06/06 12:53:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2013/06/30 20:30:09 rodent Exp $
 
 BUILDLINK_TREE+=	compiz
 
@@ -9,24 +9,44 @@ BUILDLINK_API_DEPENDS.compiz+=	compiz>=0.6.2
 BUILDLINK_ABI_DEPENDS.compiz+=	compiz>=0.8.4nb36
 BUILDLINK_PKGSRCDIR.compiz?=	../../wm/compiz
 
-.include "../../devel/libwnck/buildlink3.mk"
+pkgbase := compiz
+.include "../../mk/pkg-build-options.mk"
+
+#.if !empty(PKG_BUILD_OPTIONS:Mfuse)
+#.include "../../filesystems/fuse/buildlink3.mk"
+#.endif
+
+.if !empty(PKG_BUILD_OPTIONS:Mgnome)
+.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gnome-control-center/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS:Mkde3)
+.include "../../x11/kdebase3/buildlink3.mk"
+.endif
+
+# XXX NLS is supposed to be optional, but it doens't appear to be.
+#.if !empty(PKG_BUILD_OPTIONS:Mnls)
+#.include "../../devel/gettext-lib/buildlink3.mk"
+#.endif
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .endif # COMPIZ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-compiz
diff --git a/wm/compiz/distinfo b/wm/compiz/distinfo
index 82fa955a9b0..1a08aae91b3 100644
--- a/wm/compiz/distinfo
+++ b/wm/compiz/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2010/06/11 23:28:00 wiz Exp $
+$NetBSD: distinfo,v 1.11 2013/06/30 20:30:09 rodent Exp $
 
-SHA1 (compiz-0.8.4.tar.gz) = 244ac823818209e44944d74df42d8986ec31d9dd
-RMD160 (compiz-0.8.4.tar.gz) = 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63
-Size (compiz-0.8.4.tar.gz) = 1755741 bytes
-SHA1 (patch-aa) = 0772722aea9828c1f05f48ebbdad02387ae9c41a
-SHA1 (patch-ab) = ff3d5515111df0b5fbcdd9f9163a576ab76071ff
+SHA1 (compiz-0.8.8.tar.gz) = 01d065db07f6fd6bcad51811ffba69221aff656e
+RMD160 (compiz-0.8.8.tar.gz) = 421d4f010d1e10d1562e86ea0112e9a8eca711e7
+Size (compiz-0.8.8.tar.gz) = 1758943 bytes
+SHA1 (patch-aa) = dff6929da74854df3b3a9f35b4d61267e89b10dd
diff --git a/wm/compiz/options.mk b/wm/compiz/options.mk
new file mode 100644
index 00000000000..3eb1238f525
--- /dev/null
+++ b/wm/compiz/options.mk
@@ -0,0 +1,60 @@
+# $NetBSD: options.mk,v 1.1 2013/06/30 20:30:09 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.compiz
+PKG_SUPPORTED_OPTIONS=	fuse gnome inotify kde3 kde4
+PKG_SUGGESTED_OPTIONS+=	inotify
+PLIST_VARS+=		gnome inotify kde kde3
+
+.include "../../mk/bsd.options.mk"
+
+# XXX configure needs fuse.pc, which isn't in NetBSD's base for some reason
+.if !empty(PKG_OPTIONS:Mfuse)
+.include "../../filesystems/fuse/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-fuse
+.else
+CONFIGURE_ARGS+=	--disable-fuse
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=	--enable-librsvg
+PLIST.gnome=		yes
+BUILDLINK_DEPMETHOD.gnome-desktop=	build
+.include "../../x11/gnome-desktop/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gnome-control-center=	build
+.include "../../x11/gnome-control-center/buildlink3.mk"
+BUILDLINK_DEPMETHOD.metacity=	build
+.include "../../wm/metacity/buildlink3.mk"
+BUILDLINK_DEPMETHOD.librsvg=	build
+.include "../../graphics/librsvg/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gnome --disable-gnome-keybindings
+.endif
+
+.if !empty(PKG_OPTIONS:Minotify)
+.include "../../devel/libinotify/buildlink3.mk"
+PLIST.inotify=		yes
+.else
+CONFIGURE_ARGS+=	--disable-inotify
+.endif
+
+.if !empty(PKG_OPTIONS:Mkde3)
+# XXX This option is broken on NetBSD 6.0.1/amd64 + pkgsrc-current
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../sysutils/dbus-qt3/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-kconfig
+PLIST.kde=		yes
+PLIST.kde3=		yes
+.else
+CONFIGURE_ARGS+=	--disable-kde --disable-kconfig
+.endif
+
+.if !empty(PKG_OPTIONS:Mkde4)
+# XXX This option is broken on NetBSD 6.0.1/amd64 + pkgsrc-current
+.include "../../x11/kde-workspace4/buildlink3.mk"
+# XXX Test to see which PLIST entries are KDE{3,4}-specific, besides kconfig.
+PLIST.kde=		yes
+#PLIST.kde4=		yes
+.else
+CONFIGURE_ARGS+=	--disable-kde4
+.endif
diff --git a/wm/compiz/patches/patch-aa b/wm/compiz/patches/patch-aa
index 39eb21b7d76..3746968b4b7 100644
--- a/wm/compiz/patches/patch-aa
+++ b/wm/compiz/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2009/11/26 19:46:35 imil Exp $
+$NetBSD: patch-aa,v 1.5 2013/06/30 20:30:09 rodent Exp $
+
+Default to gtk-window-decorator.
 
 --- metadata/decoration.xml.in.orig	2009-11-26 10:26:46.000000000 +0000
 +++ metadata/decoration.xml.in
diff --git a/wm/compiz/patches/patch-ab b/wm/compiz/patches/patch-ab
deleted file mode 100644
index 19475e410a9..00000000000
--- a/wm/compiz/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2010/06/11 23:28:00 wiz Exp $
-
-Needed with compiz-0.8.4 and gtk2-2.20 -- remove on update.
-
---- gtk/window-decorator/gtk-window-decorator.c.orig	2009-08-15 07:24:40.000000000 +0000
-+++ gtk/window-decorator/gtk-window-decorator.c
-@@ -31,14 +31,6 @@
- #include <X11/extensions/Xrender.h>
- #include <X11/Xregion.h>
- 
--#ifndef GDK_DISABLE_DEPRECATED
--#define GDK_DISABLE_DEPRECATED
--#endif
--
--#ifndef GTK_DISABLE_DEPRECATED
--#define GTK_DISABLE_DEPRECATED
--#endif
--
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>