9 files changed, 26 insertions, 20 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 2ff88241712a..5909d40eb2f9 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -27,7 +27,6 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		freetype:${PORTSDIR}/print/freetype2 \
 		startup-notification-1:${PORTSDIR}/x11/startup-notification \
 		xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \
-		xcb:${PORTSDIR}/x11/libxcb \
 		xcb-util:${PORTSDIR}/x11/xcb-util \
 		xcb-image:${PORTSDIR}/x11/xcb-util-image \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
@@ -40,7 +39,8 @@ CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
 USE_EFL=	imlib2
 USE_GNOME=	glib20 pango
 USE_LUA=	5.1+
-USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
+USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
+		xproto
 
 MAN1=	awesome.1 \
 	awesome-client.1
diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index 8427a7b05ac3..543def1e992a 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -15,13 +15,12 @@ COMMENT=	Dynamic, small, fast and simple window manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		xcb:${PORTSDIR}/x11/libxcb
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
 
 OPTIONS_DEFINE=	XINERAMA XFT DOCS
 OPTIONS_DEFAULT=XINERAMA
 
-USE_XORG=	x11 xau xdmcp xext
+USE_XORG=	x11 xau xcb xdmcp xext
 
 MAN1=		dwm.1
 PLIST_FILES=	bin/dwm
diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile
index 150d96c20e1c..7bc6e7bbaedf 100644
--- a/x11-wm/echinus/Makefile
+++ b/x11-wm/echinus/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Dynamic window manager for X11 based on dwm
 LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		xcb:${PORTSDIR}/x11/libxcb \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
 USES=		pkgconfig
-USE_XORG=	x11 xau xdmcp xext xft xrender xrandr
+USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
 
 MAN1=		echinus.1
 MANCOMPRESSED=	no
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 9dca8a6fd0aa..33da6e55a371 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -14,8 +14,7 @@ COMMENT=	An improved dynamic tiling window manager
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	xcb:${PORTSDIR}/x11/libxcb \
-		startup-notification:${PORTSDIR}/x11/startup-notification \
+LIB_DEPENDS=	startup-notification:${PORTSDIR}/x11/startup-notification \
 		xcb-util:${PORTSDIR}/x11/xcb-util \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \
 		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
@@ -29,7 +28,7 @@ RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
 
 USE_PERL5_RUN=	yes
-USE_XORG=	x11 xcursor
+USE_XORG=	x11 xcb xcursor
 USES=		pkgconfig iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/icewm/files/patch-src_base.h b/x11-wm/icewm/files/patch-src_base.h
new file mode 100644
index 000000000000..1120fd5a19cf
--- /dev/null
+++ b/x11-wm/icewm/files/patch-src_base.h
@@ -0,0 +1,15 @@
+--- src/base.h.orig	2010-10-31 15:09:36.000000000 +0100
++++ src/base.h	2013-05-25 12:39:49.498390711 +0200
+@@ -1,12 +1,6 @@
+ #ifndef __BASE_H
+ #define __BASE_H
+ 
+-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+-#define deprecated __attribute__((deprecated))
+-#else
+-#define deprecated
+-#endif
+-
+ /*** Atomar Data Types ********************************************************/
+ 
+ #ifdef NEED_BOOL
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index c3ec0732e6ac..e393f93f9e26 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -12,13 +12,12 @@ COMMENT=	A small, dynamic tiling window manager for X11
 
 LICENSE=	ISCL
 
-LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb \
-		xcb-util:${PORTSDIR}/x11/xcb-util \
+LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util \
 		xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \
 		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
 RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 
-USE_XORG=	x11 xcursor xft xrandr xt
+USE_XORG=	x11 xcb xcursor xft xrandr xt
 
 MAN1=		spectrwm.1
 USE_LDCONFIG=	yes
diff --git a/x11-wm/transset/Makefile b/x11-wm/transset/Makefile
index 766c95fe8a89..46e9d1aa18ce 100644
--- a/x11-wm/transset/Makefile
+++ b/x11-wm/transset/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Make your windows transparent
 
 XORG_CAT=	app
-USE_XORG=	x11 xproto xorg-macros
+USE_XORG=	x11 xproto
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		transset.1
diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile
index 0ab76694b3c8..f4608f3c2b72 100644
--- a/x11-wm/twm/Makefile
+++ b/x11-wm/twm/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	twm
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	twm
 PORTVERSION=	1.0.7
diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile
index d9a74ebe97e5..f706623cd987 100644
--- a/x11-wm/xcompmgr/Makefile
+++ b/x11-wm/xcompmgr/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	A sample X compositing manager
 
 XORG_CAT=	app
-USE_XORG=	x11 xcomposite xfixes xdamage xorg-macros xrender
+USE_XORG=	x11 xcomposite xfixes xdamage xrender
 
 PLIST_FILES=	bin/${PORTNAME}