5 files changed, 10 insertions, 78 deletions
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