Index: head/x11-wm/compiz-plugins-extra/Makefile
===================================================================
--- head/x11-wm/compiz-plugins-extra/Makefile	(revision 492818)
+++ head/x11-wm/compiz-plugins-extra/Makefile	(revision 492819)
@@ -1,64 +1,77 @@
 # Created by: Robert Noland <rnoland@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	compiz-plugins-extra
 PORTVERSION=	0.8.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
-MAINTAINER=	freebsd-ports@dan.me.uk
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugins for Compiz Composite Window Manager
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
-		libnotify.so:devel/libnotify
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libnotify.so:devel/libnotify \
+		libstartup-notification-1.so:x11/startup-notification
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
 		${LOCALBASE}/libdata/pkgconfig/bcop.pc:devel/compiz-bcop \
 		${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:x11-wm/compiz-plugins-main
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-GNU_CONFIGURE=	yes
-USE_GL=		yes
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gmake gl gnome libtool:keepla pathfix pkgconfig tar:bzip2
+USE_GL=		gl
 USE_CSTD=	gnu89
-USE_GNOME=	gconf2 intltool
-USE_XORG=	xorgproto
+USE_GNOME=	gconf2 gdkpixbuf2 intltool libxslt
+USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr xrender
 USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	compiz-3d.schemas \
 		compiz-addhelper.schemas \
 		compiz-animationaddon.schemas \
 		compiz-bench.schemas \
 		compiz-bicubic.schemas \
 		compiz-crashhandler.schemas \
 		compiz-cubeaddon.schemas \
 		compiz-extrawm.schemas \
 		compiz-fadedesktop.schemas \
 		compiz-firepaint.schemas \
 		compiz-gears.schemas \
 		compiz-grid.schemas \
 		compiz-group.schemas \
 		compiz-loginout.schemas \
 		compiz-maximumize.schemas \
 		compiz-mblur.schemas \
 		compiz-notification.schemas \
 		compiz-reflex.schemas \
 		compiz-scalefilter.schemas \
 		compiz-shelf.schemas \
 		compiz-showdesktop.schemas \
 		compiz-showmouse.schemas \
 		compiz-splash.schemas \
 		compiz-trailfocus.schemas \
 		compiz-wallpaper.schemas \
 		compiz-widget.schemas
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-schemas
+
+OPTIONS_DEFINE=		NLS
+OPTIONS_DEFAULT=	NLS
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime gettext-tools
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'	\
 		${WRKSRC}/src/group/group-internal.h	\
 
 .include <bsd.port.mk>
Index: head/x11-wm/compiz-plugins-extra/files/patch-src_notification_notification.c
===================================================================
--- head/x11-wm/compiz-plugins-extra/files/patch-src_notification_notification.c	(revision 492818)
+++ head/x11-wm/compiz-plugins-extra/files/patch-src_notification_notification.c	(revision 492819)
@@ -1,10 +1,10 @@
---- src/notification/notification.c.orig	2014-06-02 19:46:42.417311366 +0100
-+++ src/notification/notification.c	2014-06-02 19:46:50.130301442 +0100
+--- src/notification/notification.c.orig	2011-04-21 11:51:08 UTC
++++ src/notification/notification.c
 @@ -25,6 +25,7 @@
  #include <stdarg.h>
  #include <string.h>
  #include <unistd.h>
 +#include "config.h"
  #include <compiz-core.h>
  
  #define NOTIFY_DISPLAY_OPTION_TIMEOUT   0