4 files changed, 66 insertions, 12 deletions

diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 29d7e7aff94c..970e10087e3d 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	compiz
-PORTVERSION=	0.6.2
+PORTVERSION=	0.7.8
 #PORTREVISION=	1
-PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 MAINTAINER=	rnoland@FreeBSD.org
@@ -43,10 +42,11 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-glib.schemas \
 		compiz-ini.schemas \
 		compiz-inotify.schemas \
+		compiz-kconfig.schemas \
 		compiz-minimize.schemas \
 		compiz-move.schemas \
+		compiz-obs.schemas \
 		compiz-place.schemas \
-		compiz-plane.schemas \
 		compiz-png.schemas \
 		compiz-regex.schemas \
 		compiz-resize.schemas \
@@ -76,6 +76,10 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
+.if !exists(${LOCALBASE}/libdata/pkgconfig/x11-xcb.pc)
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-xcb
+.endif
+
 .if !defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--enable-librsvg
 USE_GNOME+=		librsvg2
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
index 83acf05f961e..92cf2e918e27 100644
--- a/x11-wm/compiz/distinfo
+++ b/x11-wm/compiz/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/compiz-0.6.2.tar.gz) = 7e6edfdbf0dc46b135313440edae7a53
-SHA256 (xorg/app/compiz-0.6.2.tar.gz) = 89efc2daefd79d28e2421902a6d890145df29e804bf8508773ea5a6eedb53224
-SIZE (xorg/app/compiz-0.6.2.tar.gz) = 1784471
+MD5 (xorg/app/compiz-0.7.8.tar.gz) = e99977d9170a7bd5d571004eed038428
+SHA256 (xorg/app/compiz-0.7.8.tar.gz) = b46f52b776cc78e85357a07688d04b36ec19c65eadeaf6f6cfcca7b8515e6503
+SIZE (xorg/app/compiz-0.7.8.tar.gz) = 1463748
diff --git a/x11-wm/compiz/files/extra-patch-no-xcb b/x11-wm/compiz/files/extra-patch-no-xcb
new file mode 100644
index 000000000000..8882f75054d8
--- /dev/null
+++ b/x11-wm/compiz/files/extra-patch-no-xcb
@@ -0,0 +1,43 @@
+--- configure.orig	2008-07-13 13:43:53.000000000 -0400
++++ configure	2008-07-13 13:44:58.000000000 -0400
+@@ -23100,8 +23100,7 @@
+ metadatadir=$datadir/compiz
+ 
+ 
+-COMPIZ_REQUIRES="x11-xcb    \
+-		 xcomposite \
++COMPIZ_REQUIRES="xcomposite \
+ 		 xfixes	    \
+ 		 xdamage    \
+ 		 xrandr	    \
+--- include/compiz-core.h.orig	2008-05-29 07:58:33.000000000 -0400
++++ include/compiz-core.h	2008-07-12 14:12:53.000000000 -0400
+@@ -33,7 +33,7 @@
+ #include <stdio.h>
+ #include <sys/time.h>
+ 
+-#include <X11/Xlib-xcb.h>
++#include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/extensions/Xdamage.h>
+ #include <X11/extensions/Xcomposite.h>
+@@ -896,8 +896,6 @@
+ 
+     CompDisplay *next;
+ 
+-    xcb_connection_t *connection;
+-
+     Display    *display;
+     CompScreen *screens;
+ 
+--- src/display.c.orig	2008-05-29 07:58:33.000000000 -0400
++++ src/display.c	2008-07-12 14:13:01.000000000 -0400
+@@ -2054,8 +2054,6 @@
+ 	return FALSE;
+     }
+ 
+-    d->connection = XGetXCBConnection (dpy);
+-
+     if (!compInitDisplayOptionsFromMetadata (d,
+ 					     &coreMetadata,
+ 					     coreDisplayOptionInfo,
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index 7404a7d99162..5e53703c1dd0 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -3,9 +3,12 @@ bin/compiz
 %%GTK%%bin/gtk-window-decorator
 %%KDE%%bin/kde-window-decorator
 include/compiz/compiz.h
-include/compiz/cube.h
+include/compiz/compiz-common.h
+include/compiz/compiz-core.h
+include/compiz/compiz-cube.h
+include/compiz/compiz-plugin.h
+include/compiz/compiz-scale.h
 include/compiz/decoration.h
-include/compiz/scale.h
 lib/compiz/libannotate.a
 lib/compiz/libannotate.la
 lib/compiz/libannotate.so
@@ -45,12 +48,12 @@ lib/compiz/libminimize.so
 lib/compiz/libmove.a
 lib/compiz/libmove.la
 lib/compiz/libmove.so
+lib/compiz/libobs.a
+lib/compiz/libobs.la
+lib/compiz/libobs.so
 lib/compiz/libplace.a
 lib/compiz/libplace.la
 lib/compiz/libplace.so
-lib/compiz/libplane.a
-lib/compiz/libplane.la
-lib/compiz/libplane.so
 lib/compiz/libpng.a
 lib/compiz/libpng.la
 lib/compiz/libpng.so
@@ -111,10 +114,11 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/icon.png
 %%DATADIR%%/ini.xml
 %%DATADIR%%/inotify.xml
+%%DATADIR%%/kconfig.xml
 %%DATADIR%%/minimize.xml
 %%DATADIR%%/move.xml
+%%DATADIR%%/obs.xml
 %%DATADIR%%/place.xml
-%%DATADIR%%/plane.xml
 %%DATADIR%%/png.xml
 %%DATADIR%%/regex.xml
 %%DATADIR%%/resize.xml
@@ -141,6 +145,7 @@ 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/bn_IN/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
@@ -152,6 +157,7 @@ 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/eu/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
@@ -172,6 +178,7 @@ 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/or/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