2 files changed, 6 insertions, 41 deletions

diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index bf2e4f03da1d..99167ba34968 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	compiz
 PORTVERSION=	0.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -59,12 +59,13 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-wobbly.schemas \
 		compiz-zoom.schemas
 
-CONFIGURE_ARGS=	--disable-kde4 --disable-kde
+CONFIGURE_ARGS=	--disable-kde4 --disable-kde \
+		--disable-gnome --disable-gnome-keybindings
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE
-OPTIONS_DEFAULT=	SVG GTK2 METACITY GNOME DBUS
+OPTIONS_DEFINE=	SVG GTK2 METACITY DBUS FUSE
+OPTIONS_DEFAULT=	SVG GTK2 METACITY DBUS
 
 METACITY_DESC=	Enable Metacity support
 
@@ -95,23 +96,6 @@ USE_GNOME+=	metacity
 CONFIGURE_ARGS+=	--disable-metacity
 .endif
 
-.if ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2}
-CONFIGURE_ARGS+=	--enable-gnome \
-			--enable-gnome-keybindings
-USE_GNOME+=	 gnomecontrolcenter2
-WINDOWSETTINGSDATADIR=	\
-		`pkg-config --variable=prefix gnome-window-settings-2.0`
-WINDOWSETTINGSLIBDIR=	\
-		`pkg-config --variable=libdir gnome-window-settings-2.0`
-PLIST_SUB+=	GNOME="" \
-		WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \
-		WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}"
-.else
-CONFIGURE_ARGS+=	--disable-gnome \
-			--disable-gnome-keybindings
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MDBUS}
 CONFIGURE_ARGS+=	--enable-dbus
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
@@ -126,13 +110,10 @@ CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libpng|libpng15|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
+	@${REINPLACE_CMD} -e 's|libpng|libpng15|' \
 		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${STAGEDIR}${PREFIX}/bin/compiz-manager
-.if ${PORT_OPTIONS:MGNOME}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/window-manager-settings/libcompiz.so
-.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index 720f476e398c..a4f90c804adb 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -110,15 +110,6 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/water.xml
 %%DATADIR%%/wobbly.xml
 %%DATADIR%%/zoom.xml
-%%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
-%%GNOME%%share/gnome/wm-properties/compiz-wm.desktop
-%%GNOME%%share/gnome-control-center/keybindings/50-compiz-desktop-key.xml
-%%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml
-%%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
-%%GNOME%%window-manager-settings/libcompiz.a
-%%GNOME%%window-manager-settings/libcompiz.so
-%%GNOME%%@cwd %%RESETPREFIX%%
-%%GNOME%%share/applications/compiz.desktop
 share/locale/af/LC_MESSAGES/compiz.mo
 share/locale/ar/LC_MESSAGES/compiz.mo
 share/locale/bg/LC_MESSAGES/compiz.mo
@@ -175,10 +166,3 @@ share/locale/xh/LC_MESSAGES/compiz.mo
 share/locale/zh_CN/LC_MESSAGES/compiz.mo
 share/locale/zh_TW/LC_MESSAGES/compiz.mo
 share/locale/zu/LC_MESSAGES/compiz.mo
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
-@dirrmtry share/locale/lo/LC_MESSAGES
-@dirrmtry share/locale/lo
-@dirrm %%DATADIR%%
-@dirrm lib/compiz
-@dirrm include/compiz