22 files changed, 235 insertions, 78 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 6877e3f65bbf..9f52beb4c30f 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -319,6 +319,10 @@
     SUBDIR += xcb
     SUBDIR += xcb-proto
     SUBDIR += xcb-util
+    SUBDIR += xcb-util-image
+    SUBDIR += xcb-util-keysyms
+    SUBDIR += xcb-util-renderutil
+    SUBDIR += xcb-util-wm
     SUBDIR += xclick
     SUBDIR += xclip
     SUBDIR += xclipboard
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
new file mode 100644
index 000000000000..3ee602b7179a
--- /dev/null
+++ b/x11/xcb-util-image/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-image
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-image
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga@FreeBSD.org
+COMMENT=	A port of Xlib's XImage and XShmImage functions
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11/xcb-util-image/distinfo b/x11/xcb-util-image/distinfo
new file mode 100644
index 000000000000..79a6a088d0c5
--- /dev/null
+++ b/x11/xcb-util-image/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-image-0.3.8.tar.bz2) = 40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9
+SIZE (xcb-util-image-0.3.8.tar.bz2) = 289004
diff --git a/x11/xcb-util-image/pkg-descr b/x11/xcb-util-image/pkg-descr
new file mode 100644
index 000000000000..926f54b3ef0f
--- /dev/null
+++ b/x11/xcb-util-image/pkg-descr
@@ -0,0 +1,10 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+Image module is a port o Xlib's XImage and XShmImage functions.
+
+WWW:	http://xcb.freedesktop.org/
diff --git a/x11/xcb-util-image/pkg-plist b/x11/xcb-util-image/pkg-plist
new file mode 100644
index 000000000000..f8dfb626ec66
--- /dev/null
+++ b/x11/xcb-util-image/pkg-plist
@@ -0,0 +1,8 @@
+@comment $FreeBSD$
+include/xcb/xcb_image.h
+include/xcb/xcb_pixel.h
+lib/libxcb-image.so.0
+lib/libxcb-image.so
+lib/libxcb-image.la
+lib/libxcb-image.a
+libdata/pkgconfig/xcb-image.pc
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
new file mode 100644
index 000000000000..570871dbc322
--- /dev/null
+++ b/x11/xcb-util-keysyms/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-keysyms
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-keysyms
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga@FreeBSD.org
+COMMENT=	Standard X key constants and conversion to/from keycodes
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11/xcb-util-keysyms/distinfo b/x11/xcb-util-keysyms/distinfo
new file mode 100644
index 000000000000..1c82d88491de
--- /dev/null
+++ b/x11/xcb-util-keysyms/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-keysyms-0.3.8.tar.bz2) = 913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121
+SIZE (xcb-util-keysyms-0.3.8.tar.bz2) = 252726
diff --git a/x11/xcb-util-keysyms/pkg-descr b/x11/xcb-util-keysyms/pkg-descr
new file mode 100644
index 000000000000..cd1882d987fe
--- /dev/null
+++ b/x11/xcb-util-keysyms/pkg-descr
@@ -0,0 +1,11 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+Keysyms module is the Starndard X key constants and conversions to/from
+keycodes.
+
+WWW:	http://xcb.freedesktop.org/
diff --git a/x11/xcb-util-keysyms/pkg-plist b/x11/xcb-util-keysyms/pkg-plist
new file mode 100644
index 000000000000..995a2e51e97e
--- /dev/null
+++ b/x11/xcb-util-keysyms/pkg-plist
@@ -0,0 +1,7 @@
+@comment $FreeBSD$
+include/xcb/xcb_keysyms.h
+lib/libxcb-keysyms.so.1
+lib/libxcb-keysyms.so
+lib/libxcb-keysyms.la
+lib/libxcb-keysyms.a
+libdata/pkgconfig/xcb-keysyms.pc
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
new file mode 100644
index 000000000000..8acdd8e97696
--- /dev/null
+++ b/x11/xcb-util-renderutil/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-renderutil
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-renderutil
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga@FreeBSD.org
+COMMENT=	Convenience functions for the Render extension
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11/xcb-util-renderutil/distinfo b/x11/xcb-util-renderutil/distinfo
new file mode 100644
index 000000000000..17e452dfc8e9
--- /dev/null
+++ b/x11/xcb-util-renderutil/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-renderutil-0.3.8.tar.bz2) = 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452
+SIZE (xcb-util-renderutil-0.3.8.tar.bz2) = 257492
diff --git a/x11/xcb-util-renderutil/pkg-descr b/x11/xcb-util-renderutil/pkg-descr
new file mode 100644
index 000000000000..e36d33bfc20f
--- /dev/null
+++ b/x11/xcb-util-renderutil/pkg-descr
@@ -0,0 +1,10 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+Renderutil module s Convenience functions for the Render extension.
+
+WWW:	http://xcb.freedesktop.org/
diff --git a/x11/xcb-util-renderutil/pkg-plist b/x11/xcb-util-renderutil/pkg-plist
new file mode 100644
index 000000000000..3c68e1416357
--- /dev/null
+++ b/x11/xcb-util-renderutil/pkg-plist
@@ -0,0 +1,7 @@
+@comment $FreeBSD$
+include/xcb/xcb_renderutil.h
+lib/libxcb-render-util.so.0
+lib/libxcb-render-util.so
+lib/libxcb-render-util.la
+lib/libxcb-render-util.a
+libdata/pkgconfig/xcb-renderutil.pc
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
new file mode 100644
index 000000000000..ba13757e8785
--- /dev/null
+++ b/x11/xcb-util-wm/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	xcb-util-wm
+# Date created:		2011-12-16
+# Whom:			garga
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xcb-util-wm
+PORTVERSION=	0.3.8
+CATEGORIES=	x11
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
+
+MAINTAINER=	garga@FreeBSD.org
+COMMENT=	Framework for window manager implementation
+
+LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
+		xcb-util.0:${PORTSDIR}/x11/xcb-util
+#BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+#USE_XORG=	xau xdmcp
+#USE_AUTOTOOLS=	libtool
+
+GNU_CONFIGURE=	yes
+#CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11/xcb-util-wm/distinfo b/x11/xcb-util-wm/distinfo
new file mode 100644
index 000000000000..b5d874ad1963
--- /dev/null
+++ b/x11/xcb-util-wm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-wm-0.3.8.tar.bz2) = c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007
+SIZE (xcb-util-wm-0.3.8.tar.bz2) = 305284
diff --git a/x11/xcb-util-wm/pkg-descr b/x11/xcb-util-wm/pkg-descr
new file mode 100644
index 000000000000..58e493079188
--- /dev/null
+++ b/x11/xcb-util-wm/pkg-descr
@@ -0,0 +1,11 @@
+The xcb-util module provides a number of libraries which sit on top of
+libxcb, the core X protocol library, and some of the extension
+libraries. These experimental libraries provide convenience functions
+and interfaces which make the raw X protocol more usable. Some of the
+libraries also provide client-side code which is not strictly part of
+the X protocol but which have traditionally been provided by Xlib.
+
+WM module is a Framework for window manager implementation. It brings
+both client and window-manager helpers for ICCCM and EWMH.
+
+WWW:	http://xcb.freedesktop.org/
diff --git a/x11/xcb-util-wm/pkg-plist b/x11/xcb-util-wm/pkg-plist
new file mode 100644
index 000000000000..871ac3148edb
--- /dev/null
+++ b/x11/xcb-util-wm/pkg-plist
@@ -0,0 +1,13 @@
+@comment $FreeBSD$
+include/xcb/xcb_icccm.h
+include/xcb/xcb_ewmh.h
+lib/libxcb-icccm.so.4
+lib/libxcb-icccm.so
+lib/libxcb-icccm.la
+lib/libxcb-icccm.a
+lib/libxcb-ewmh.so.1
+lib/libxcb-ewmh.so
+lib/libxcb-ewmh.la
+lib/libxcb-ewmh.a
+libdata/pkgconfig/xcb-icccm.pc
+libdata/pkgconfig/xcb-ewmh.pc
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index a3c58b8e0885..1f2f60e5cbc6 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	xcb-util
-PORTVERSION=	0.3.6
+PORTVERSION=	0.3.8
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
-MAINTAINER=	ntarmos@cs.uoi.gr
+MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A module with libxcb/libX11 extension/replacement libraries
 
 LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb
diff --git a/x11/xcb-util/distinfo b/x11/xcb-util/distinfo
index 1484bc550936..2466e838bfb1 100644
--- a/x11/xcb-util/distinfo
+++ b/x11/xcb-util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-0.3.6.tar.bz2) = ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57
-SIZE (xcb-util-0.3.6.tar.bz2) = 293408
+SHA256 (xcb-util-0.3.8.tar.bz2) = c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9
+SIZE (xcb-util-0.3.8.tar.bz2) = 266339
diff --git a/x11/xcb-util/files/patch-icccm-icccm.c b/x11/xcb-util/files/patch-icccm-icccm.c
deleted file mode 100644
index 508c26a1f030..000000000000
--- a/x11/xcb-util/files/patch-icccm-icccm.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- icccm/icccm.c.orig	2009-08-24 11:47:36.000000000 +0300
-+++ icccm/icccm.c	2009-10-21 21:01:52.000000000 +0300
-@@ -627,15 +627,13 @@
- xcb_get_wm_hints_from_reply(xcb_wm_hints_t *hints,
-                             xcb_get_property_reply_t *reply)
- {
--  if(!reply)
-+  if(!reply || reply->type != WM_HINTS || reply->format != 32)
-     return 0;
- 
-   int length = xcb_get_property_value_length(reply);
-   int num_elem = length / (reply->format / 8);
- 
--  if (reply->type != WM_HINTS
--      || reply->format != 32
--      || num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
-+  if(num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
-     return 0;
- 
-   memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), length);
diff --git a/x11/xcb-util/pkg-descr b/x11/xcb-util/pkg-descr
index 827709950eda..ea2ad1dca7eb 100644
--- a/x11/xcb-util/pkg-descr
+++ b/x11/xcb-util/pkg-descr
@@ -7,14 +7,9 @@ the X protocol but which have traditionally been provided by Xlib.
 
 These libraries are currently included, roughly ordered by maturity:
 
-render-util: Convenience functions for the Render extension.
 aux: Convenient access to connection setup and some core requests.
 atom: Standard core X atom constants and atom caching.
 property: Callback X property-change handling.
-icccm: Both client and window-manager helpers for ICCCM.
-keysyms: Standard X key constants and conversion to/from keycodes.
 event: Callback X event handling.
-image: Port of Xlib's XImage and XShmImage functions.
-wm: Framework for window manager implementation.
 
 WWW: http://xcb.freedesktop.org/
diff --git a/x11/xcb-util/pkg-plist b/x11/xcb-util/pkg-plist
index 3c6ca9034d19..26356b74c736 100644
--- a/x11/xcb-util/pkg-plist
+++ b/x11/xcb-util/pkg-plist
@@ -1,56 +1,13 @@
-lib/libxcb-atom.so.1
-lib/libxcb-atom.so
-lib/libxcb-atom.la
-lib/libxcb-atom.a
+lib/libxcb-util.so.0
+lib/libxcb-util.so
+lib/libxcb-util.la
+lib/libxcb-util.a
 libdata/pkgconfig/xcb-atom.pc
 libdata/pkgconfig/xcb-aux.pc
 libdata/pkgconfig/xcb-event.pc
-libdata/pkgconfig/xcb-property.pc
-libdata/pkgconfig/xcb-icccm.pc
-libdata/pkgconfig/xcb-image.pc
-libdata/pkgconfig/xcb-keysyms.pc
-libdata/pkgconfig/xcb-reply.pc
-libdata/pkgconfig/xcb-renderutil.pc
-lib/libxcb-aux.so.0
-lib/libxcb-aux.so
-lib/libxcb-aux.la
-lib/libxcb-aux.a
-lib/libxcb-event.so.1
-lib/libxcb-event.so
-lib/libxcb-event.la
-lib/libxcb-event.a
-lib/libxcb-property.so.1
-lib/libxcb-property.so
-lib/libxcb-property.la
-lib/libxcb-property.a
-lib/libxcb-icccm.so.1
-lib/libxcb-icccm.so
-lib/libxcb-icccm.la
-lib/libxcb-icccm.a
-lib/libxcb-image.so.0
-lib/libxcb-image.so
-lib/libxcb-image.la
-lib/libxcb-image.a
-lib/libxcb-keysyms.so.1
-lib/libxcb-keysyms.so
-lib/libxcb-keysyms.la
-lib/libxcb-keysyms.a
-lib/libxcb-reply.so.1
-lib/libxcb-reply.so
-lib/libxcb-reply.la
-lib/libxcb-reply.a
-lib/libxcb-render-util.so.0
-lib/libxcb-render-util.so
-lib/libxcb-render-util.la
-lib/libxcb-render-util.a
+libdata/pkgconfig/xcb-util.pc
 include/xcb/xcb_atom.h
 include/xcb/xcb_aux.h
 include/xcb/xcb_bitops.h
 include/xcb/xcb_event.h
-include/xcb/xcb_property.h
-include/xcb/xcb_icccm.h
-include/xcb/xcb_image.h
-include/xcb/xcb_keysyms.h
-include/xcb/xcb_pixel.h
-include/xcb/xcb_reply.h
-include/xcb/xcb_renderutil.h
+include/xcb/xcb_util.h