- Update compiz-fusion components to 0.6.0.

- Add new compiz-fusion meta-port.

Submitted by:	maintainer

37 files changed, 168 insertions, 759 deletions

diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index b6088f7b8cb8..048fb99ecbd4 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	compiz-bcop
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0
 #PORTREVISION=	0
 CATEGORIES=	devel x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
@@ -15,7 +15,8 @@ MAINTAINER=	rnoland@2hip.net
 COMMENT=	Code generator for Compiz Fusion Plugins
 
 # This annoys me...
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
+		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -25,7 +26,9 @@ USE_GNOME=	pkgconfig libxslt
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+	@${REINPLACE_CMD} \
+		-e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+		-e 's|getopt|${LOCALBASE}/bin/getopt|' \
 		${WRKSRC}/src/bcop.in
 	@${REINPLACE_CMD} -e \
 		's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/devel/compiz-bcop/distinfo b/devel/compiz-bcop/distinfo
index f7180f1a0892..ce8faf733c14 100644
--- a/devel/compiz-bcop/distinfo
+++ b/devel/compiz-bcop/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-bcop-0.5.2.tar.bz2) = b31e8e2ad3de2e5a23628bb0eacc11dc
-SHA256 (compiz-bcop-0.5.2.tar.bz2) = b53ecab9a54c0436be03b9ef32a4bd82b8c584ca399a4db1cc550c0947b31691
-SIZE (compiz-bcop-0.5.2.tar.bz2) = 68297
+MD5 (compiz-bcop-0.6.0.tar.bz2) = fa5173efb8927ffa052d59b540bae67d
+SHA256 (compiz-bcop-0.6.0.tar.bz2) = 0e6dd481d569fd699e2b3cbe63205e607c8656aff778cc8a18df24c3f78e8243
+SIZE (compiz-bcop-0.6.0.tar.bz2) = 69808
diff --git a/x11-wm/compiz-fusion-plugins-extra/Makefile b/x11-wm/compiz-fusion-plugins-extra/Makefile
index 6f4b436cd1fc..0e489c937730 100644
--- a/x11-wm/compiz-fusion-plugins-extra/Makefile
+++ b/x11-wm/compiz-fusion-plugins-extra/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz-fusion-plugins-extra
-PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTVERSION=	0.6.0
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
@@ -40,7 +40,6 @@ GCONF_SCHEMAS=	compiz-addhelper.schemas \
 		compiz-fadedesktop.schemas \
 		compiz-firepaint.schemas \
 		compiz-gears.schemas \
-		compiz-gotovp.schemas \
 		compiz-group.schemas \
 		compiz-mblur.schemas \
 		compiz-reflex.schemas \
diff --git a/x11-wm/compiz-fusion-plugins-extra/distinfo b/x11-wm/compiz-fusion-plugins-extra/distinfo
index a2b4ea67178d..2f0a154a01bf 100644
--- a/x11-wm/compiz-fusion-plugins-extra/distinfo
+++ b/x11-wm/compiz-fusion-plugins-extra/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-fusion-plugins-extra-0.5.2.tar.bz2) = 866a4e5decb8b40df6bd0161dbd24a53
-SHA256 (compiz-fusion-plugins-extra-0.5.2.tar.bz2) = 0fa0259bea5983df832c782751e509b4d392f34124163fb91d387746c93c4f6b
-SIZE (compiz-fusion-plugins-extra-0.5.2.tar.bz2) = 1647092
+MD5 (compiz-fusion-plugins-extra-0.6.0.tar.bz2) = eb5a4ed9c54aa9e0fdf47b24d94b2262
+SHA256 (compiz-fusion-plugins-extra-0.6.0.tar.bz2) = 7eb7a636d327a68da55c1db38a268c6b821203d2fc96fb365ff80817fa3904cd
+SIZE (compiz-fusion-plugins-extra-0.6.0.tar.bz2) = 2293746
diff --git a/x11-wm/compiz-fusion-plugins-extra/files/patch-metadata-widget.xml.in b/x11-wm/compiz-fusion-plugins-extra/files/patch-metadata-widget.xml.in
deleted file mode 100644
index 5cac61b46763..000000000000
--- a/x11-wm/compiz-fusion-plugins-extra/files/patch-metadata-widget.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- metadata/widget.xml.in.orig	2007-08-13 08:12:47.000000000 -0400
-+++ metadata/widget.xml.in	2007-08-24 17:56:48.000000000 -0400
-@@ -6,6 +6,7 @@
- 		<deps>
- 			<relation type="before">
- 				<plugin>fade</plugin>
-+				<plugin>animation</plugin>
- 			</relation>
- 		</deps>
- 		<display>
diff --git a/x11-wm/compiz-fusion-plugins-extra/files/patch-src-widget-widget.c b/x11-wm/compiz-fusion-plugins-extra/files/patch-src-widget-widget.c
deleted file mode 100644
index ce64f3ced01f..000000000000
--- a/x11-wm/compiz-fusion-plugins-extra/files/patch-src-widget-widget.c
+++ /dev/null
@@ -1,288 +0,0 @@
---- src/widget/widget.c.orig	2007-08-24 18:24:42.000000000 -0400
-+++ src/widget/widget.c	2007-08-24 18:25:02.000000000 -0400
-@@ -68,7 +68,6 @@
-     PreparePaintScreenProc preparePaintScreen;
-     DonePaintScreenProc    donePaintScreen;
-     PaintWindowProc        paintWindow;
--    WindowAddNotifyProc    windowAddNotify;
- 
-     WidgetState state;
- 
-@@ -82,7 +81,9 @@
- {
-     Bool                isWidget;
-     Bool                wasUnmapped;
-+    CompWindow          *parentWidget;
-     CompTimeoutHandle   matchUpdateHandle;
-+    CompTimeoutHandle   inferiorUpdateHandle;
-     WidgetPropertyState propertyState;
- } WidgetWindow;
- 
-@@ -106,6 +107,41 @@
- 		       GET_WIDGET_SCREEN  (w->screen,            \
- 		       GET_WIDGET_DISPLAY (w->screen->display)))
- 
-+static void
-+widgetUpdateTreeStatus (CompWindow *w)
-+{
-+    CompWindow   *p;
-+    WidgetWindow *pww;
-+
-+    WIDGET_SCREEN (w->screen);
-+
-+    /* first clear out every reference to our window */
-+    for (p = w->screen->windows; p; p = p->next)
-+    {
-+	pww = GET_WIDGET_WINDOW (p, ws);
-+	if (pww->parentWidget == w)
-+	    pww->parentWidget = NULL;
-+    }
-+
-+    for (p = w->screen->windows; p; p = p->next)
-+    {
-+	Window clientLeader;
-+
-+	if (p->attrib.override_redirect)
-+	    clientLeader = getClientLeader (p);
-+	else
-+	    clientLeader = p->clientLeader;
-+
-+	if ((clientLeader == w->clientLeader) && (w->id != p->id))
-+	{
-+	    WIDGET_SCREEN (w->screen);
-+
-+	    pww = GET_WIDGET_WINDOW (p, ws);
-+	    pww->parentWidget = w;
-+	}
-+    }
-+}
-+
- static Bool
- widgetUpdateWidgetStatus (CompWindow *w)
- {
-@@ -131,7 +167,7 @@
-     return retval;
- }
- 
--static void
-+static Bool
- widgetUpdateWidgetPropertyState (CompWindow *w)
- {
-     CompDisplay   *d = w->screen->display;
-@@ -144,7 +180,7 @@
-     WIDGET_WINDOW (w);
- 
-     result = XGetWindowProperty (d->display, w->id, wd->compizWidgetAtom,
--				 0, 1L, FALSE, XA_CARDINAL, &retType,
-+				 0, 1L, FALSE, AnyPropertyType, &retType,
- 				 &format, &nitems, &remain, &data);
- 
-     if (result == Success && nitems && data)
-@@ -159,7 +195,7 @@
-     else
- 	ww->propertyState = PropertyNotSet;
- 
--    widgetUpdateWidgetStatus (w);
-+    return widgetUpdateWidgetStatus (w);
- }
- 
- static void
-@@ -271,6 +307,8 @@
- 		map = !ww->isWidget || (ws->state != StateOff);
- 		widgetUpdateWidgetMapState (w, map);
- 
-+		widgetUpdateTreeStatus (w);
-+
- 		(*d->matchPropertyChanged) (d, w);
- 	    }
-     }
-@@ -295,19 +333,13 @@
- 
- 	switch (ws->state) {
- 	case StateOff:
-+	case StateFadeOut:
- 	    widgetSetWidgetLayerMapState (s, TRUE);
- 	    ws->fadeTime = 1000.0f * widgetGetFadeTime (s);
- 	    ws->state = StateFadeIn;
- 	    break;
--	case StateFadeIn:
--	    ws->fadeTime = (1000.0f * widgetGetFadeTime (s)) - ws->fadeTime;
--	    ws->state = StateFadeOut;
--	    break;
--	case StateFadeOut:
--	    ws->fadeTime = (1000.0f * widgetGetFadeTime (s)) - ws->fadeTime;
--	    ws->state = StateFadeIn;
--	    break;
- 	case StateOn:
-+	case StateFadeIn:
- 	    widgetSetWidgetLayerMapState (s, FALSE);
- 	    ws->fadeTime = 1000.0f * widgetGetFadeTime (s);
- 	    ws->state = StateFadeOut;
-@@ -345,8 +377,33 @@
- 	    w = findWindowAtDisplay (d, event->xproperty.window);
- 	    if (w)
- 	    {
--		widgetUpdateWidgetPropertyState (w);
--		(*d->matchPropertyChanged) (d, w);
-+		if (widgetUpdateWidgetPropertyState (w))
-+		{
-+		    Bool map;
-+
-+		    WIDGET_SCREEN (w->screen);
-+		    WIDGET_WINDOW (w);
-+
-+		    map = !ww->isWidget || (ws->state != StateOff);
-+		    widgetUpdateWidgetMapState (w, map);
-+		    widgetUpdateTreeStatus (w);
-+		    (*d->matchPropertyChanged) (d, w);
-+		}
-+	    }
-+	}
-+	else if (event->xproperty.atom == d->wmClientLeaderAtom)
-+	{
-+	    CompWindow *w;
-+
-+	    w = findWindowAtDisplay (d, event->xproperty.window);
-+	    if (w)
-+	    {
-+		WIDGET_WINDOW (w);
-+
-+		if (ww->isWidget)
-+		    widgetUpdateTreeStatus (w);
-+		else if (ww->parentWidget)
-+		    widgetUpdateTreeStatus (ww->parentWidget);
- 	    }
- 	}
- 	break;
-@@ -368,7 +425,7 @@
- 		    {
- 			WIDGET_WINDOW (w);
- 
--			if (!ww->isWidget)
-+			if (!ww->isWidget && !ww->parentWidget)
- 			{
- 			    CompOption o;
- 
-@@ -409,12 +466,54 @@
-     WIDGET_WINDOW (w);
- 
-     if (widgetUpdateWidgetStatus (w))
-+    {
-+	widgetUpdateTreeStatus (w);
- 	(*w->screen->display->matchPropertyChanged) (w->screen->display, w);
-+    }
- 
-     ww->matchUpdateHandle = 0;
-     return FALSE;
- }
- 
-+static Bool
-+widgetUpdateInferiors (void *closure)
-+{
-+    CompWindow *w = (CompWindow *) closure;
-+    Window     clientLeader;
-+
-+    WIDGET_WINDOW (w);
-+
-+    if (w->attrib.override_redirect)
-+	clientLeader = getClientLeader (w);
-+    else
-+	clientLeader = w->clientLeader;
-+
-+    if (ww->isWidget)
-+    {
-+	widgetUpdateTreeStatus (w);
-+    }
-+    else if (clientLeader)
-+    {
-+	CompWindow *lw;
-+
-+	lw = findWindowAtScreen (w->screen, clientLeader);
-+	if (lw)
-+	{
-+	    WidgetWindow *lww;
-+
-+	    WIDGET_SCREEN (w->screen);
-+	    lww = GET_WIDGET_WINDOW (lw, ws);
-+
-+	    if (lww->isWidget)
-+		ww->parentWidget = lw;
-+	    else if (lww->parentWidget)
-+		ww->parentWidget = lww->parentWidget;
-+	}
-+    }
-+
-+    ww->inferiorUpdateHandle = 0;
-+    return FALSE;
-+}
- 
- static void
- widgetMatchPropertyChanged (CompDisplay *d,
-@@ -435,20 +534,6 @@
-     WRAP (wd, d, matchPropertyChanged, widgetMatchPropertyChanged);
- }
- 
--static void
--widgetWindowAddNotify (CompWindow *w)
--{
--    WIDGET_SCREEN (w->screen);
--    WIDGET_WINDOW (w);
--
--    if (ww->isWidget)
--	widgetUpdateWidgetMapState (w, (ws->state != StateOff));
--
--    UNWRAP (ws, w->screen, windowAddNotify);
--    (*w->screen->windowAddNotify) (w);
--    WRAP (ws, w->screen, windowAddNotify, widgetWindowAddNotify);
--}
--
- static Bool
- widgetPaintWindow (CompWindow              *w,
- 		   const WindowPaintAttrib *attrib,
-@@ -478,7 +563,7 @@
- 	    fadeProgress = 1.0f - fadeProgress;
- 	}
- 
--	if (!ww->isWidget)
-+	if (!ww->isWidget && !ww->parentWidget)
- 	{
- 	    float progress;
- 
-@@ -572,6 +657,7 @@
- 		    map = !ww->isWidget || (ws->state != StateOff);
- 		    widgetUpdateWidgetMapState (w, map);
- 
-+		    widgetUpdateTreeStatus (w);
- 		    (*s->display->matchPropertyChanged) (s->display, w);
- 		}
- 	}
-@@ -700,12 +786,18 @@
-         return FALSE;
- 
-     ww->isWidget = FALSE;
-+    ww->parentWidget = NULL;
-     ww->wasUnmapped = FALSE;
-     ww->matchUpdateHandle = 0;
-+    ww->inferiorUpdateHandle = 0;
- 
-     w->privates[ws->windowPrivateIndex].ptr = ww;
- 
--    widgetUpdateWidgetPropertyState (w);
-+    if (widgetUpdateWidgetPropertyState (w))
-+	widgetUpdateWidgetMapState (w, (ws->state != StateOff));
-+
-+    ww->inferiorUpdateHandle = compAddTimeout (0, widgetUpdateInferiors,
-+					       (void *) w);
- 
-     return TRUE;
- }
-@@ -722,6 +814,9 @@
-     if (ww->matchUpdateHandle)
- 	compRemoveTimeout (ww->matchUpdateHandle);
- 
-+    if (ww->inferiorUpdateHandle)
-+	compRemoveTimeout (ww->inferiorUpdateHandle);
-+
-     free (ww);
- }
- 
diff --git a/x11-wm/compiz-fusion-plugins-extra/pkg-plist b/x11-wm/compiz-fusion-plugins-extra/pkg-plist
index 1282f620984a..359b61e91d37 100644
--- a/x11-wm/compiz-fusion-plugins-extra/pkg-plist
+++ b/x11-wm/compiz-fusion-plugins-extra/pkg-plist
@@ -26,9 +26,6 @@ lib/compiz/libfirepaint.la
 lib/compiz/libfirepaint.a
 lib/compiz/libgears.la
 lib/compiz/libgears.a
-lib/compiz/libgotovp.so
-lib/compiz/libgotovp.la
-lib/compiz/libgotovp.a
 lib/compiz/libgroup.so
 lib/compiz/libgroup.la
 lib/compiz/libgroup.a
@@ -58,9 +55,14 @@ share/locale/el/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/it/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-extra.mo
-share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-extra.mo
-share/locale/pl_PL/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/compiz/addhelper.xml
 share/compiz/bench.xml
 share/compiz/crashhandler.xml
@@ -70,7 +72,6 @@ share/compiz/extrawm.xml
 share/compiz/fadedesktop.xml
 share/compiz/firepaint.xml
 share/compiz/gears.xml
-share/compiz/gotovp.xml
 share/compiz/group.xml
 share/compiz/mblur.xml
 share/compiz/reflex.xml
@@ -80,3 +81,7 @@ share/compiz/splash.xml
 share/compiz/trailfocus.xml
 share/compiz/widget.xml
 share/compiz/reflection.png
+share/compiz/fusioncap.png
+share/compiz/compizcap.png
+share/compiz/splash_background.png
+share/compiz/splash_logo.png
diff --git a/x11-wm/compiz-fusion-plugins-main/Makefile b/x11-wm/compiz-fusion-plugins-main/Makefile
index 0ea75c30ca66..42007c4d7a11 100644
--- a/x11-wm/compiz-fusion-plugins-main/Makefile
+++ b/x11-wm/compiz-fusion-plugins-main/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz-fusion-plugins-main
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.0
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
diff --git a/x11-wm/compiz-fusion-plugins-main/distinfo b/x11-wm/compiz-fusion-plugins-main/distinfo
index 486076043608..a352cbdc057c 100644
--- a/x11-wm/compiz-fusion-plugins-main/distinfo
+++ b/x11-wm/compiz-fusion-plugins-main/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-fusion-plugins-main-0.5.2.tar.bz2) = cb5703d8e59697dd6c7b075c483e81cc
-SHA256 (compiz-fusion-plugins-main-0.5.2.tar.bz2) = 72f32fe4ee5ad0a04899b10a598573d08bff728802832e04da48d5e9ad2ceaf8
-SIZE (compiz-fusion-plugins-main-0.5.2.tar.bz2) = 606991
+MD5 (compiz-fusion-plugins-main-0.6.0.tar.bz2) = a500d34eb2a2a2ffaa933b6434b03656
+SHA256 (compiz-fusion-plugins-main-0.6.0.tar.bz2) = 716bf78c0ebee6f8b1426369242de4a8db384dab2d87eb2855e2bd9f29d2c6de
+SIZE (compiz-fusion-plugins-main-0.6.0.tar.bz2) = 784887
diff --git a/x11-wm/compiz-fusion-plugins-main/files/patch-src-text-text.c b/x11-wm/compiz-fusion-plugins-main/files/patch-src-text-text.c
deleted file mode 100644
index 9c765e7ba50c..000000000000
--- a/x11-wm/compiz-fusion-plugins-main/files/patch-src-text-text.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/text/text.c.orig	2007-08-12 15:51:59.000000000 -0400
-+++ src/text/text.c	2007-08-17 22:31:24.000000000 -0400
-@@ -75,7 +75,11 @@
- 	return NULL;
-     }
- 
--    retval = strndup (val, nitems);
-+    if ((retval = (char *) malloc(nitems + 1)) != NULL) {
-+		bzero (retval, nitems + 1);
-+		strncpy (retval, val, nitems);
-+    }
-+
-     XFree (val);
- 
-     return retval;
-@@ -92,7 +96,11 @@
-     text.nitems = 0;
-     if (XGetTextProperty (d->display, id, &text, atom))
-     {
--	retval = strndup ((char *)text.value,text.nitems);
-+	if ((retval = (char *) malloc(text.nitems + 1)) != NULL) {
-+		bzero (retval, text.nitems + 1);
-+		strncpy (retval, (char *)text.value, text.nitems);
-+	}
-+
- 	if (text.value)
- 	    XFree (text.value);
-     }
diff --git a/x11-wm/compiz-fusion-plugins-main/pkg-plist b/x11-wm/compiz-fusion-plugins-main/pkg-plist
index b2f16094f232..1570c90295ad 100644
--- a/x11-wm/compiz-fusion-plugins-main/pkg-plist
+++ b/x11-wm/compiz-fusion-plugins-main/pkg-plist
@@ -63,9 +63,14 @@ share/locale/el/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/it/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-main.mo
-share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-main.mo
-share/locale/pl_PL/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/compiz/animation.xml
 share/compiz/colorfilter.xml
 share/compiz/expo.xml
@@ -85,5 +90,8 @@ share/compiz/workarounds.xml
 share/compiz/scaleaddon.xml
 share/compiz/vpswitch.xml
 share/compiz/shift.xml
-@dirrmtry share/locale/pl_PL/LC_MESSAGES
-@dirrmtry share/locale/pl_PL
+share/compiz/filters/negative
+share/compiz/filters/contrast
+share/compiz/filters/negative-green
+share/compiz/filters/grayscale
+@dirrmtry share/compiz/filters
diff --git a/x11-wm/compiz-fusion-plugins-unsupported/Makefile b/x11-wm/compiz-fusion-plugins-unsupported/Makefile
index cc25b4f024b1..5640c1de8ad6 100644
--- a/x11-wm/compiz-fusion-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-fusion-plugins-unsupported/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz-fusion-plugins-unsupported
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.0
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
@@ -39,5 +39,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/compiz-fusion-plugins-unsupported/distinfo b/x11-wm/compiz-fusion-plugins-unsupported/distinfo
index d093c077fca0..8b361ad2441d 100644
--- a/x11-wm/compiz-fusion-plugins-unsupported/distinfo
+++ b/x11-wm/compiz-fusion-plugins-unsupported/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-fusion-plugins-unsupported-0.5.2.tar.bz2) = 71395f26d844be0417817b0953d0b9f6
-SHA256 (compiz-fusion-plugins-unsupported-0.5.2.tar.bz2) = cc3d1f3b620f3d6e2979a21b65c971ed06b29656ebb4fceabadc4cfd2143b24d
-SIZE (compiz-fusion-plugins-unsupported-0.5.2.tar.bz2) = 409777
+MD5 (compiz-fusion-plugins-unsupported-0.6.0.tar.bz2) = a5349418d781e3abff026fb2cf3e36d8
+SHA256 (compiz-fusion-plugins-unsupported-0.6.0.tar.bz2) = 14c0a4abed43af90ab29494bced8d8fc9cf2ac883f832a8761f9107b4e7362f8
+SIZE (compiz-fusion-plugins-unsupported-0.6.0.tar.bz2) = 411166
diff --git a/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist b/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist
index d539e686ce95..f1867a3a7cc9 100644
--- a/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist
+++ b/x11-wm/compiz-fusion-plugins-unsupported/pkg-plist
@@ -16,8 +16,8 @@ share/locale/el/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/it/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
-share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
+share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/pl_PL/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/compiz/fakeargb.xml
 share/compiz/mswitch.xml
diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
new file mode 100644
index 000000000000..6aca368cb6a7
--- /dev/null
+++ b/x11-wm/compiz-fusion/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for:	compiz-fusion
+# Date created:				2007-10-22
+# Whom:					Robert C. Noland III <rnoland@2hip.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	compiz-fusion
+PORTVERSION=	0.6.0
+#PORTREVISION=	0
+CATEGORIES=	x11-wm
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	rnoland@2hip.net
+COMMENT=	Metaport of compiz-fusion
+
+LIB_DEPENDS=	compizconfig:${PORTSDIR}/x11-wm/libcompizconfig
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \
+		${LOCALBASE}/lib/compiz/libanimation.so:${PORTSDIR}/x11-wm/compiz-fusion-plugins-main \
+		${LOCALBASE}/bin/ccsm:${PORTSDIR}/x11-wm/ccsm
+
+NO_BUILD=	yes
+
+OPTIONS=	EXTRA "Enable extra plugins" on \
+		UNSUP "Enable unsupported plugins" off \
+		EMERALD "Enable emerald window decorator" on \
+		GCONF "Enable the gconf backend" on
+# Hold off on this until I can get a clean tb run...
+#		KCONFIG "Enable kconfig backend" off
+
+do-install:	# empty
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_EXTRA)
+RUN_DEPENDS+=	${LOCALBASE}/lib/compiz/libaddhelper.so:${PORTSDIR}/x11-wm/compiz-fusion-plugins-extra
+.endif
+
+.if defined(WITH_UNSUP)
+RUN_DEPENDS+=	${LOCALBASE}/lib/compiz/libfakeargb.so:${PORTSDIR}/x11-wm/compiz-fusion-plugins-unsupported
+.endif
+
+.if !defined(WITHOUT_EMERALD)
+RUN_DEPENDS+=	${LOCALBASE}/bin/emerald:${PORTSDIR}/x11-wm/emerald \
+		${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.ini:${PORTSDIR}/x11-themes/emerald-themes
+.endif
+
+.if !defined(WITHOUT_GCONF)
+RUN_DEPENDS+=	${LOCALBASE}/lib/compizconfig/backends/libgconf.so:${PORTSDIR}/x11-wm/compizconfig-backend-gconf
+.endif
+
+#.if defined(WITH_KCONFIG)
+#RUN_DEPENDS+=	${LOCALBASE}/lib/compizconfig/backends/libkconfig.so:${PORTSDIR}/x11-wm/compizconfig-backend-kconfig
+#.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-wm/compiz-fusion/pkg-descr b/x11-wm/compiz-fusion/pkg-descr
new file mode 100644
index 000000000000..21e24545da2f
--- /dev/null
+++ b/x11-wm/compiz-fusion/pkg-descr
@@ -0,0 +1,3 @@
+This is a metaport for compiz-fusion.
+
+WWW:	http://forums.compiz-fusion.org/
diff --git a/x11-wm/compiz-fusion/pkg-plist b/x11-wm/compiz-fusion/pkg-plist
new file mode 100644
index 000000000000..8fb5cc4556d5
--- /dev/null
+++ b/x11-wm/compiz-fusion/pkg-plist
@@ -0,0 +1 @@
+@comment $FreeBSD$
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 6f4b436cd1fc..0e489c937730 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz-fusion-plugins-extra
-PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTVERSION=	0.6.0
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
@@ -40,7 +40,6 @@ GCONF_SCHEMAS=	compiz-addhelper.schemas \
 		compiz-fadedesktop.schemas \
 		compiz-firepaint.schemas \
 		compiz-gears.schemas \
-		compiz-gotovp.schemas \
 		compiz-group.schemas \
 		compiz-mblur.schemas \
 		compiz-reflex.schemas \
diff --git a/x11-wm/compiz-plugins-extra/distinfo b/x11-wm/compiz-plugins-extra/distinfo
index a2b4ea67178d..2f0a154a01bf 100644
--- a/x11-wm/compiz-plugins-extra/distinfo
+++ b/x11-wm/compiz-plugins-extra/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-fusion-plugins-extra-0.5.2.tar.bz2) = 866a4e5decb8b40df6bd0161dbd24a53
-SHA256 (compiz-fusion-plugins-extra-0.5.2.tar.bz2) = 0fa0259bea5983df832c782751e509b4d392f34124163fb91d387746c93c4f6b
-SIZE (compiz-fusion-plugins-extra-0.5.2.tar.bz2) = 1647092
+MD5 (compiz-fusion-plugins-extra-0.6.0.tar.bz2) = eb5a4ed9c54aa9e0fdf47b24d94b2262
+SHA256 (compiz-fusion-plugins-extra-0.6.0.tar.bz2) = 7eb7a636d327a68da55c1db38a268c6b821203d2fc96fb365ff80817fa3904cd
+SIZE (compiz-fusion-plugins-extra-0.6.0.tar.bz2) = 2293746
diff --git a/x11-wm/compiz-plugins-extra/files/patch-metadata-widget.xml.in b/x11-wm/compiz-plugins-extra/files/patch-metadata-widget.xml.in
deleted file mode 100644
index 5cac61b46763..000000000000
--- a/x11-wm/compiz-plugins-extra/files/patch-metadata-widget.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- metadata/widget.xml.in.orig	2007-08-13 08:12:47.000000000 -0400
-+++ metadata/widget.xml.in	2007-08-24 17:56:48.000000000 -0400
-@@ -6,6 +6,7 @@
- 		<deps>
- 			<relation type="before">
- 				<plugin>fade</plugin>
-+				<plugin>animation</plugin>
- 			</relation>
- 		</deps>
- 		<display>
diff --git a/x11-wm/compiz-plugins-extra/files/patch-src-widget-widget.c b/x11-wm/compiz-plugins-extra/files/patch-src-widget-widget.c
deleted file mode 100644
index ce64f3ced01f..000000000000
--- a/x11-wm/compiz-plugins-extra/files/patch-src-widget-widget.c
+++ /dev/null
@@ -1,288 +0,0 @@
---- src/widget/widget.c.orig	2007-08-24 18:24:42.000000000 -0400
-+++ src/widget/widget.c	2007-08-24 18:25:02.000000000 -0400
-@@ -68,7 +68,6 @@
-     PreparePaintScreenProc preparePaintScreen;
-     DonePaintScreenProc    donePaintScreen;
-     PaintWindowProc        paintWindow;
--    WindowAddNotifyProc    windowAddNotify;
- 
-     WidgetState state;
- 
-@@ -82,7 +81,9 @@
- {
-     Bool                isWidget;
-     Bool                wasUnmapped;
-+    CompWindow          *parentWidget;
-     CompTimeoutHandle   matchUpdateHandle;
-+    CompTimeoutHandle   inferiorUpdateHandle;
-     WidgetPropertyState propertyState;
- } WidgetWindow;
- 
-@@ -106,6 +107,41 @@
- 		       GET_WIDGET_SCREEN  (w->screen,            \
- 		       GET_WIDGET_DISPLAY (w->screen->display)))
- 
-+static void
-+widgetUpdateTreeStatus (CompWindow *w)
-+{
-+    CompWindow   *p;
-+    WidgetWindow *pww;
-+
-+    WIDGET_SCREEN (w->screen);
-+
-+    /* first clear out every reference to our window */
-+    for (p = w->screen->windows; p; p = p->next)
-+    {
-+	pww = GET_WIDGET_WINDOW (p, ws);
-+	if (pww->parentWidget == w)
-+	    pww->parentWidget = NULL;
-+    }
-+
-+    for (p = w->screen->windows; p; p = p->next)
-+    {
-+	Window clientLeader;
-+
-+	if (p->attrib.override_redirect)
-+	    clientLeader = getClientLeader (p);
-+	else
-+	    clientLeader = p->clientLeader;
-+
-+	if ((clientLeader == w->clientLeader) && (w->id != p->id))
-+	{
-+	    WIDGET_SCREEN (w->screen);
-+
-+	    pww = GET_WIDGET_WINDOW (p, ws);
-+	    pww->parentWidget = w;
-+	}
-+    }
-+}
-+
- static Bool
- widgetUpdateWidgetStatus (CompWindow *w)
- {
-@@ -131,7 +167,7 @@
-     return retval;
- }
- 
--static void
-+static Bool
- widgetUpdateWidgetPropertyState (CompWindow *w)
- {
-     CompDisplay   *d = w->screen->display;
-@@ -144,7 +180,7 @@
-     WIDGET_WINDOW (w);
- 
-     result = XGetWindowProperty (d->display, w->id, wd->compizWidgetAtom,
--				 0, 1L, FALSE, XA_CARDINAL, &retType,
-+				 0, 1L, FALSE, AnyPropertyType, &retType,
- 				 &format, &nitems, &remain, &data);
- 
-     if (result == Success && nitems && data)
-@@ -159,7 +195,7 @@
-     else
- 	ww->propertyState = PropertyNotSet;
- 
--    widgetUpdateWidgetStatus (w);
-+    return widgetUpdateWidgetStatus (w);
- }
- 
- static void
-@@ -271,6 +307,8 @@
- 		map = !ww->isWidget || (ws->state != StateOff);
- 		widgetUpdateWidgetMapState (w, map);
- 
-+		widgetUpdateTreeStatus (w);
-+
- 		(*d->matchPropertyChanged) (d, w);
- 	    }
-     }
-@@ -295,19 +333,13 @@
- 
- 	switch (ws->state) {
- 	case StateOff:
-+	case StateFadeOut:
- 	    widgetSetWidgetLayerMapState (s, TRUE);
- 	    ws->fadeTime = 1000.0f * widgetGetFadeTime (s);
- 	    ws->state = StateFadeIn;
- 	    break;
--	case StateFadeIn:
--	    ws->fadeTime = (1000.0f * widgetGetFadeTime (s)) - ws->fadeTime;
--	    ws->state = StateFadeOut;
--	    break;
--	case StateFadeOut:
--	    ws->fadeTime = (1000.0f * widgetGetFadeTime (s)) - ws->fadeTime;
--	    ws->state = StateFadeIn;
--	    break;
- 	case StateOn:
-+	case StateFadeIn:
- 	    widgetSetWidgetLayerMapState (s, FALSE);
- 	    ws->fadeTime = 1000.0f * widgetGetFadeTime (s);
- 	    ws->state = StateFadeOut;
-@@ -345,8 +377,33 @@
- 	    w = findWindowAtDisplay (d, event->xproperty.window);
- 	    if (w)
- 	    {
--		widgetUpdateWidgetPropertyState (w);
--		(*d->matchPropertyChanged) (d, w);
-+		if (widgetUpdateWidgetPropertyState (w))
-+		{
-+		    Bool map;
-+
-+		    WIDGET_SCREEN (w->screen);
-+		    WIDGET_WINDOW (w);
-+
-+		    map = !ww->isWidget || (ws->state != StateOff);
-+		    widgetUpdateWidgetMapState (w, map);
-+		    widgetUpdateTreeStatus (w);
-+		    (*d->matchPropertyChanged) (d, w);
-+		}
-+	    }
-+	}
-+	else if (event->xproperty.atom == d->wmClientLeaderAtom)
-+	{
-+	    CompWindow *w;
-+
-+	    w = findWindowAtDisplay (d, event->xproperty.window);
-+	    if (w)
-+	    {
-+		WIDGET_WINDOW (w);
-+
-+		if (ww->isWidget)
-+		    widgetUpdateTreeStatus (w);
-+		else if (ww->parentWidget)
-+		    widgetUpdateTreeStatus (ww->parentWidget);
- 	    }
- 	}
- 	break;
-@@ -368,7 +425,7 @@
- 		    {
- 			WIDGET_WINDOW (w);
- 
--			if (!ww->isWidget)
-+			if (!ww->isWidget && !ww->parentWidget)
- 			{
- 			    CompOption o;
- 
-@@ -409,12 +466,54 @@
-     WIDGET_WINDOW (w);
- 
-     if (widgetUpdateWidgetStatus (w))
-+    {
-+	widgetUpdateTreeStatus (w);
- 	(*w->screen->display->matchPropertyChanged) (w->screen->display, w);
-+    }
- 
-     ww->matchUpdateHandle = 0;
-     return FALSE;
- }
- 
-+static Bool
-+widgetUpdateInferiors (void *closure)
-+{
-+    CompWindow *w = (CompWindow *) closure;
-+    Window     clientLeader;
-+
-+    WIDGET_WINDOW (w);
-+
-+    if (w->attrib.override_redirect)
-+	clientLeader = getClientLeader (w);
-+    else
-+	clientLeader = w->clientLeader;
-+
-+    if (ww->isWidget)
-+    {
-+	widgetUpdateTreeStatus (w);
-+    }
-+    else if (clientLeader)
-+    {
-+	CompWindow *lw;
-+
-+	lw = findWindowAtScreen (w->screen, clientLeader);
-+	if (lw)
-+	{
-+	    WidgetWindow *lww;
-+
-+	    WIDGET_SCREEN (w->screen);
-+	    lww = GET_WIDGET_WINDOW (lw, ws);
-+
-+	    if (lww->isWidget)
-+		ww->parentWidget = lw;
-+	    else if (lww->parentWidget)
-+		ww->parentWidget = lww->parentWidget;
-+	}
-+    }
-+
-+    ww->inferiorUpdateHandle = 0;
-+    return FALSE;
-+}
- 
- static void
- widgetMatchPropertyChanged (CompDisplay *d,
-@@ -435,20 +534,6 @@
-     WRAP (wd, d, matchPropertyChanged, widgetMatchPropertyChanged);
- }
- 
--static void
--widgetWindowAddNotify (CompWindow *w)
--{
--    WIDGET_SCREEN (w->screen);
--    WIDGET_WINDOW (w);
--
--    if (ww->isWidget)
--	widgetUpdateWidgetMapState (w, (ws->state != StateOff));
--
--    UNWRAP (ws, w->screen, windowAddNotify);
--    (*w->screen->windowAddNotify) (w);
--    WRAP (ws, w->screen, windowAddNotify, widgetWindowAddNotify);
--}
--
- static Bool
- widgetPaintWindow (CompWindow              *w,
- 		   const WindowPaintAttrib *attrib,
-@@ -478,7 +563,7 @@
- 	    fadeProgress = 1.0f - fadeProgress;
- 	}
- 
--	if (!ww->isWidget)
-+	if (!ww->isWidget && !ww->parentWidget)
- 	{
- 	    float progress;
- 
-@@ -572,6 +657,7 @@
- 		    map = !ww->isWidget || (ws->state != StateOff);
- 		    widgetUpdateWidgetMapState (w, map);
- 
-+		    widgetUpdateTreeStatus (w);
- 		    (*s->display->matchPropertyChanged) (s->display, w);
- 		}
- 	}
-@@ -700,12 +786,18 @@
-         return FALSE;
- 
-     ww->isWidget = FALSE;
-+    ww->parentWidget = NULL;
-     ww->wasUnmapped = FALSE;
-     ww->matchUpdateHandle = 0;
-+    ww->inferiorUpdateHandle = 0;
- 
-     w->privates[ws->windowPrivateIndex].ptr = ww;
- 
--    widgetUpdateWidgetPropertyState (w);
-+    if (widgetUpdateWidgetPropertyState (w))
-+	widgetUpdateWidgetMapState (w, (ws->state != StateOff));
-+
-+    ww->inferiorUpdateHandle = compAddTimeout (0, widgetUpdateInferiors,
-+					       (void *) w);
- 
-     return TRUE;
- }
-@@ -722,6 +814,9 @@
-     if (ww->matchUpdateHandle)
- 	compRemoveTimeout (ww->matchUpdateHandle);
- 
-+    if (ww->inferiorUpdateHandle)
-+	compRemoveTimeout (ww->inferiorUpdateHandle);
-+
-     free (ww);
- }
- 
diff --git a/x11-wm/compiz-plugins-extra/pkg-plist b/x11-wm/compiz-plugins-extra/pkg-plist
index 1282f620984a..359b61e91d37 100644
--- a/x11-wm/compiz-plugins-extra/pkg-plist
+++ b/x11-wm/compiz-plugins-extra/pkg-plist
@@ -26,9 +26,6 @@ lib/compiz/libfirepaint.la
 lib/compiz/libfirepaint.a
 lib/compiz/libgears.la
 lib/compiz/libgears.a
-lib/compiz/libgotovp.so
-lib/compiz/libgotovp.la
-lib/compiz/libgotovp.a
 lib/compiz/libgroup.so
 lib/compiz/libgroup.la
 lib/compiz/libgroup.a
@@ -58,9 +55,14 @@ share/locale/el/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/it/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-extra.mo
-share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-extra.mo
-share/locale/pl_PL/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-extra.mo
+share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-extra.mo
 share/compiz/addhelper.xml
 share/compiz/bench.xml
 share/compiz/crashhandler.xml
@@ -70,7 +72,6 @@ share/compiz/extrawm.xml
 share/compiz/fadedesktop.xml
 share/compiz/firepaint.xml
 share/compiz/gears.xml
-share/compiz/gotovp.xml
 share/compiz/group.xml
 share/compiz/mblur.xml
 share/compiz/reflex.xml
@@ -80,3 +81,7 @@ share/compiz/splash.xml
 share/compiz/trailfocus.xml
 share/compiz/widget.xml
 share/compiz/reflection.png
+share/compiz/fusioncap.png
+share/compiz/compizcap.png
+share/compiz/splash_background.png
+share/compiz/splash_logo.png
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 0ea75c30ca66..42007c4d7a11 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz-fusion-plugins-main
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.0
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
diff --git a/x11-wm/compiz-plugins-main/distinfo b/x11-wm/compiz-plugins-main/distinfo
index 486076043608..a352cbdc057c 100644
--- a/x11-wm/compiz-plugins-main/distinfo
+++ b/x11-wm/compiz-plugins-main/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-fusion-plugins-main-0.5.2.tar.bz2) = cb5703d8e59697dd6c7b075c483e81cc
-SHA256 (compiz-fusion-plugins-main-0.5.2.tar.bz2) = 72f32fe4ee5ad0a04899b10a598573d08bff728802832e04da48d5e9ad2ceaf8
-SIZE (compiz-fusion-plugins-main-0.5.2.tar.bz2) = 606991
+MD5 (compiz-fusion-plugins-main-0.6.0.tar.bz2) = a500d34eb2a2a2ffaa933b6434b03656
+SHA256 (compiz-fusion-plugins-main-0.6.0.tar.bz2) = 716bf78c0ebee6f8b1426369242de4a8db384dab2d87eb2855e2bd9f29d2c6de
+SIZE (compiz-fusion-plugins-main-0.6.0.tar.bz2) = 784887
diff --git a/x11-wm/compiz-plugins-main/files/patch-src-text-text.c b/x11-wm/compiz-plugins-main/files/patch-src-text-text.c
deleted file mode 100644
index 9c765e7ba50c..000000000000
--- a/x11-wm/compiz-plugins-main/files/patch-src-text-text.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/text/text.c.orig	2007-08-12 15:51:59.000000000 -0400
-+++ src/text/text.c	2007-08-17 22:31:24.000000000 -0400
-@@ -75,7 +75,11 @@
- 	return NULL;
-     }
- 
--    retval = strndup (val, nitems);
-+    if ((retval = (char *) malloc(nitems + 1)) != NULL) {
-+		bzero (retval, nitems + 1);
-+		strncpy (retval, val, nitems);
-+    }
-+
-     XFree (val);
- 
-     return retval;
-@@ -92,7 +96,11 @@
-     text.nitems = 0;
-     if (XGetTextProperty (d->display, id, &text, atom))
-     {
--	retval = strndup ((char *)text.value,text.nitems);
-+	if ((retval = (char *) malloc(text.nitems + 1)) != NULL) {
-+		bzero (retval, text.nitems + 1);
-+		strncpy (retval, (char *)text.value, text.nitems);
-+	}
-+
- 	if (text.value)
- 	    XFree (text.value);
-     }
diff --git a/x11-wm/compiz-plugins-main/pkg-plist b/x11-wm/compiz-plugins-main/pkg-plist
index b2f16094f232..1570c90295ad 100644
--- a/x11-wm/compiz-plugins-main/pkg-plist
+++ b/x11-wm/compiz-plugins-main/pkg-plist
@@ -63,9 +63,14 @@ share/locale/el/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/it/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-main.mo
-share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-main.mo
-share/locale/pl_PL/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/ca/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/gl/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/nb/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/pl/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/pt/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/sv/LC_MESSAGES/compiz-fusion-plugins-main.mo
+share/locale/tr/LC_MESSAGES/compiz-fusion-plugins-main.mo
 share/compiz/animation.xml
 share/compiz/colorfilter.xml
 share/compiz/expo.xml
@@ -85,5 +90,8 @@ share/compiz/workarounds.xml
 share/compiz/scaleaddon.xml
 share/compiz/vpswitch.xml
 share/compiz/shift.xml
-@dirrmtry share/locale/pl_PL/LC_MESSAGES
-@dirrmtry share/locale/pl_PL
+share/compiz/filters/negative
+share/compiz/filters/contrast
+share/compiz/filters/negative-green
+share/compiz/filters/grayscale
+@dirrmtry share/compiz/filters
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index cc25b4f024b1..5640c1de8ad6 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz-fusion-plugins-unsupported
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.0
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
@@ -39,5 +39,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/compiz-plugins-unsupported/distinfo b/x11-wm/compiz-plugins-unsupported/distinfo
index d093c077fca0..8b361ad2441d 100644
--- a/x11-wm/compiz-plugins-unsupported/distinfo
+++ b/x11-wm/compiz-plugins-unsupported/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-fusion-plugins-unsupported-0.5.2.tar.bz2) = 71395f26d844be0417817b0953d0b9f6
-SHA256 (compiz-fusion-plugins-unsupported-0.5.2.tar.bz2) = cc3d1f3b620f3d6e2979a21b65c971ed06b29656ebb4fceabadc4cfd2143b24d
-SIZE (compiz-fusion-plugins-unsupported-0.5.2.tar.bz2) = 409777
+MD5 (compiz-fusion-plugins-unsupported-0.6.0.tar.bz2) = a5349418d781e3abff026fb2cf3e36d8
+SHA256 (compiz-fusion-plugins-unsupported-0.6.0.tar.bz2) = 14c0a4abed43af90ab29494bced8d8fc9cf2ac883f832a8761f9107b4e7362f8
+SIZE (compiz-fusion-plugins-unsupported-0.6.0.tar.bz2) = 411166
diff --git a/x11-wm/compiz-plugins-unsupported/pkg-plist b/x11-wm/compiz-plugins-unsupported/pkg-plist
index d539e686ce95..f1867a3a7cc9 100644
--- a/x11-wm/compiz-plugins-unsupported/pkg-plist
+++ b/x11-wm/compiz-plugins-unsupported/pkg-plist
@@ -16,8 +16,8 @@ share/locale/el/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/fr/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/it/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/ja/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
-share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/zh_CN/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
+share/locale/pt_PT/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/locale/pl_PL/LC_MESSAGES/compiz-fusion-plugins-unsupported.mo
 share/compiz/fakeargb.xml
 share/compiz/mswitch.xml
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index 077f728301e8..407e43bc22e6 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	compizconfig-backend-gconf
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0
 #PORTREVISION=	0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
@@ -30,5 +30,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'	\
 		${WRKSRC}/settings-backend/gconf.c	\
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/compizconfig-backend-gconf/distinfo b/x11-wm/compizconfig-backend-gconf/distinfo
index 7d709a889814..8927618186af 100644
--- a/x11-wm/compizconfig-backend-gconf/distinfo
+++ b/x11-wm/compizconfig-backend-gconf/distinfo
@@ -1,3 +1,3 @@
-MD5 (compizconfig-backend-gconf-0.5.2.tar.bz2) = f64426ae486e62b5d475ab4e40d9d0d3
-SHA256 (compizconfig-backend-gconf-0.5.2.tar.bz2) = 9c62533019683cbf6811e8d71feb4ea7ef1e4e37e44b5a63f701b2b25d12d4c1
-SIZE (compizconfig-backend-gconf-0.5.2.tar.bz2) = 236234
+MD5 (compizconfig-backend-gconf-0.6.0.tar.bz2) = f7a0ec178a3a47c7d087c654eb78f0a5
+SHA256 (compizconfig-backend-gconf-0.6.0.tar.bz2) = 5956e1cbc0c75244d47327aab21bd2eb294fe9c44582a77651f412c6a24e1940
+SIZE (compizconfig-backend-gconf-0.6.0.tar.bz2) = 236287
diff --git a/x11-wm/compizconfig-backend-gconf/files/patch-settings-backend-gconf.c b/x11-wm/compizconfig-backend-gconf/files/patch-settings-backend-gconf.c
deleted file mode 100644
index 9dba9b832ec1..000000000000
--- a/x11-wm/compizconfig-backend-gconf/files/patch-settings-backend-gconf.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- settings-backend/gconf.c.orig	2007-08-14 05:26:13.000000000 -0400
-+++ settings-backend/gconf.c	2007-08-17 21:44:10.000000000 -0400
-@@ -28,7 +28,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <dirent.h>
- 
-@@ -441,7 +441,12 @@
- 
- 	    if (strcmp (token + len - prefixLen, prefix[i]) == 0)
- 	    {
--		char *buffer = strndup (token, len - prefixLen);
-+		char *buffer;
-+		if ((buffer = (char *) malloc(len - prefixLen + 1)) != NULL) {
-+			bzero (buffer, len - prefixLen + 1);
-+			strncpy (buffer, token, len - prefixLen);
-+		}
-+
- 		if (buffer)
- 		{
- 		    setting = ccsFindSetting (plugin, buffer,
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index e0d3fddcf265..852143169589 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	compizconfig-python
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0.1
 #PORTREVISION=	0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
@@ -33,5 +33,4 @@ post-patch:
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/compizconfig-python/distinfo b/x11-wm/compizconfig-python/distinfo
index dc67dbf0ad8c..a1a12609504a 100644
--- a/x11-wm/compizconfig-python/distinfo
+++ b/x11-wm/compizconfig-python/distinfo
@@ -1,3 +1,3 @@
-MD5 (compizconfig-python-0.5.2.tar.bz2) = d3bb6415a3f0adc626e2f5e2bdef4495
-SHA256 (compizconfig-python-0.5.2.tar.bz2) = 8bd8ffde02f2d0d3bc5ed754beaa5f94c69fc43ecdfefc1fba3ec0298c943e1c
-SIZE (compizconfig-python-0.5.2.tar.bz2) = 254604
+MD5 (compizconfig-python-0.6.0.1.tar.bz2) = 903758361f39ce62a8fabbbbbf36887c
+SHA256 (compizconfig-python-0.6.0.1.tar.bz2) = 965409bcb337dde24087aac9db55e9824572ddcbdced3c5a1f0a8c6a7b3da646
+SIZE (compizconfig-python-0.6.0.1.tar.bz2) = 255998
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 240ddd7a740f..7c58cc97ced5 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libcompizconfig
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0
 #PORTREVISION=	0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
@@ -37,5 +37,4 @@ post-patch:
 		${WRKSRC}/src/ini.c			\
 		${WRKSRC}/backend/ini.c
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/libcompizconfig/distinfo b/x11-wm/libcompizconfig/distinfo
index 5320949fe470..e73ae8091a6d 100644
--- a/x11-wm/libcompizconfig/distinfo
+++ b/x11-wm/libcompizconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcompizconfig-0.5.2.tar.bz2) = 75b523f00b92986b4b6df0544112b141
-SHA256 (libcompizconfig-0.5.2.tar.bz2) = a84382c5486c36e2ab78b9e9b3fcf2fc1919170d200032cf594abe5ca374a103
-SIZE (libcompizconfig-0.5.2.tar.bz2) = 318788
+MD5 (libcompizconfig-0.6.0.tar.bz2) = 2aac5c3cc5aa9763f4ffac40ee1abaa5
+SHA256 (libcompizconfig-0.6.0.tar.bz2) = 32cec7f2c6d8af1d331afa1985ad14706c5c744b6e6e4656985e8b8793b8e5dc
+SIZE (libcompizconfig-0.6.0.tar.bz2) = 321353
diff --git a/x11-wm/libcompizconfig/pkg-plist b/x11-wm/libcompizconfig/pkg-plist
index eb1ce06d9f3c..5736dcca2da2 100644
--- a/x11-wm/libcompizconfig/pkg-plist
+++ b/x11-wm/libcompizconfig/pkg-plist
@@ -13,6 +13,8 @@ lib/compiz/libccp.la
 lib/compiz/libccp.a
 libdata/pkgconfig/libcompizconfig.pc
 share/compizconfig/global.xml
+etc/compizconfig/config
+@dirrmtry etc/compizconfig
 @dirrmtry share/compizconfig
 @dirrmtry lib/compizconfig/backends
 @dirrmtry lib/compizconfig