3 files changed, 84 insertions, 11 deletions

diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 7f0e5a755582..01326aa2f1c7 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	compiz
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.2
 #PORTREVISION=	1
 CATEGORIES=	x11-wm
 
@@ -19,13 +19,48 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 XORG_CAT=	app
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
+USE_TGZ=	yes
+USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GL=		glu
-USE_GNOME=	gnomehack gnomeprefix gconf2
+USE_GNOME=	gnomehack gconf2
 USE_XORG=	xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
 USE_LDCONFIG=	yes
-GCONF_SCHEMAS=	compiz.schemas gwd.schemas
+USE_AUTOTOOLS=	libtool:15
+
+GCONF_SCHEMAS=	gwd.schemas \
+		compiz-annotate.schemas \
+		compiz-blur.schemas \
+		compiz-clone.schemas \
+		compiz-core.schemas \
+		compiz-cube.schemas \
+		compiz-dbus.schemas \
+		compiz-decoration.schemas \
+		compiz-fade.schemas \
+		compiz-fs.schemas \
+		compiz-gconf.schemas \
+		compiz-glib.schemas \
+		compiz-ini.schemas \
+		compiz-inotify.schemas \
+		compiz-minimize.schemas \
+		compiz-move.schemas \
+		compiz-place.schemas \
+		compiz-plane.schemas \
+		compiz-png.schemas \
+		compiz-regex.schemas \
+		compiz-resize.schemas \
+		compiz-rotate.schemas \
+		compiz-scale.schemas \
+		compiz-screenshot.schemas \
+		compiz-svg.schemas \
+		compiz-switcher.schemas \
+		compiz-video.schemas \
+		compiz-water.schemas \
+		compiz-wobbly.schemas \
+		compiz-zoom.schemas
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
index 965c0099259d..c5f87b3312c5 100644
--- a/x11-wm/compiz/distinfo
+++ b/x11-wm/compiz/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/compiz-0.5.0.tar.bz2) = 7a35a9f52155b945aa195f826d3d607a
-SHA256 (xorg/app/compiz-0.5.0.tar.bz2) = 4191745d86bec37de4cdc79bf0031afde1d28079eac2e3fc29aed18cd7a2a4e6
-SIZE (xorg/app/compiz-0.5.0.tar.bz2) = 926090
+MD5 (xorg/app/compiz-0.5.2.tar.gz) = 7a38a921359573fb57d53e057f481f08
+SHA256 (xorg/app/compiz-0.5.2.tar.gz) = e1cc3f3bd144d32d0ebd1e505a7ea7727fb0246f36e5fcea53b808e27adf197c
+SIZE (xorg/app/compiz-0.5.2.tar.gz) = 1778046
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index 866e7bd38ed2..3b101941e1c1 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -2,7 +2,9 @@
 bin/compiz
 %%GTK%%bin/gtk-window-decorator
 include/compiz/compiz.h
+include/compiz/cube.h
 include/compiz/decoration.h
+include/compiz/scale.h
 lib/libdecoration.so.0
 lib/libdecoration.so
 lib/libdecoration.la
@@ -10,6 +12,9 @@ lib/libdecoration.a
 lib/compiz/libgconf.so
 lib/compiz/libgconf.la
 lib/compiz/libgconf.a
+lib/compiz/libglib.so
+lib/compiz/libglib.la
+lib/compiz/libglib.a
 lib/compiz/libdecoration.so
 lib/compiz/libdecoration.la
 lib/compiz/libdecoration.a
@@ -85,10 +90,43 @@ lib/compiz/libini.a
 lib/compiz/libannotate.so
 lib/compiz/libannotate.la
 lib/compiz/libannotate.a
-libdata/pkgconfig/libdecoration.pc
 libdata/pkgconfig/compiz.pc
-share/gnome/compiz/icon.png
-share/gnome/compiz/freedesktop.png
+libdata/pkgconfig/compiz-cube.pc
+libdata/pkgconfig/compiz-scale.pc
+libdata/pkgconfig/compiz-gconf.pc
+libdata/pkgconfig/libdecoration.pc
+%%DATADIR%%/icon.png
+%%DATADIR%%/freedesktop.png
+%%DATADIR%%/core.xml
+%%DATADIR%%/annotate.xml
+%%DATADIR%%/blur.xml
+%%DATADIR%%/clone.xml
+%%DATADIR%%/cube.xml
+%%DATADIR%%/dbus.xml
+%%DATADIR%%/decoration.xml
+%%DATADIR%%/fade.xml
+%%DATADIR%%/fs.xml
+%%DATADIR%%/gconf.xml
+%%DATADIR%%/glib.xml
+%%DATADIR%%/ini.xml
+%%DATADIR%%/inotify.xml
+%%DATADIR%%/minimize.xml
+%%DATADIR%%/move.xml
+%%DATADIR%%/place.xml
+%%DATADIR%%/plane.xml
+%%DATADIR%%/png.xml
+%%DATADIR%%/regex.xml
+%%DATADIR%%/resize.xml
+%%DATADIR%%/rotate.xml
+%%DATADIR%%/scale.xml
+%%DATADIR%%/screenshot.xml
+%%DATADIR%%/svg.xml
+%%DATADIR%%/switcher.xml
+%%DATADIR%%/video.xml
+%%DATADIR%%/water.xml
+%%DATADIR%%/wobbly.xml
+%%DATADIR%%/zoom.xml
+%%DATADIR%%/schemas.xslt
 %%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
 %%GNOME%%share/gnome/wm-properties/compiz.desktop
 %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
@@ -161,6 +199,6 @@ share/locale/zu/LC_MESSAGES/compiz.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
-@dirrmtry share/gnome/compiz
+@dirrmtry %%DATADIR%%
 @dirrmtry lib/compiz
 @dirrmtry include/compiz