Increase the minium required version of the "x11/libxcb" package to 1.6.

There are at least two packages ("graphics/cairo" and "x11/xlsclients")
which require this. And we definitely want to avoid the situation where
both the based and "pkgsrc" version get used at the same time.

Bump all the packages which use the "x11/libxcb" package except the two
which already require version 1.6. For those package remove the manually
set minimum required version.

Change discussed with Thomas Klausner in private e-mail.

12 files changed, 24 insertions, 16 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 1da7ec35a55..fa1d948dd18 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2012/07/10 03:03:01 mef Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/02 12:09:41 tron Exp $
 #
 
 DISTNAME=		libX11-1.5.0
+PKGREVISION=		1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libxcb/buildlink3.mk b/x11/libxcb/buildlink3.mk
index bf61568a989..84ff4ef9017 100644
--- a/x11/libxcb/buildlink3.mk
+++ b/x11/libxcb/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/05/07 02:45:47 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/10/02 12:09:41 tron Exp $
 
 BUILDLINK_TREE+=	libxcb
 
 .if !defined(LIBXCB_BUILDLINK3_MK)
 LIBXCB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.1.93
+BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.6
+BUILDLINK_ABI_DEPENDS.libxcb+=	libxcb>=1.6
 BUILDLINK_PKGSRCDIR.libxcb?=	../../x11/libxcb
 
 .include "../../x11/xcb-proto/buildlink3.mk"
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 53209987753..708ace50bf6 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2012/07/15 08:23:00 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2012/10/02 12:09:41 tron Exp $
 
 DISTNAME=		startup-notification-0.12
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		http://www.freedesktop.org/software/startup-notification/releases/
 
diff --git a/x11/startup-notification010/Makefile b/x11/startup-notification010/Makefile
index 16c7d3d39b7..2906ec80dc7 100644
--- a/x11/startup-notification010/Makefile
+++ b/x11/startup-notification010/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/07/13 14:22:59 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/02 12:09:41 tron Exp $
 
 DISTNAME=		startup-notification-0.10
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		http://www.freedesktop.org/software/startup-notification/releases/
 
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index b12fa51fa34..0cb7d845a56 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/08/12 21:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/02 12:09:41 tron Exp $
 #
 
 DISTNAME=	xcb-util-image-0.3.9
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index fcca6238a95..f19a380382b 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/07/24 18:02:07 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/02 12:09:41 tron Exp $
 #
 
 DISTNAME=	xcb-util-keysyms-0.3.9
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index d47cc4cdccb..afcbde0f0b9 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/08/12 21:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/02 12:09:42 tron Exp $
 #
 
 DISTNAME=	xcb-util-renderutil-0.3.8
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index d6bf3828a60..11fac495cc0 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/08/12 21:29:36 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/02 12:09:42 tron Exp $
 #
 
 DISTNAME=	xcb-util-wm-0.3.9
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 84048b9c44f..96c011d3975 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2012/07/13 14:21:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/02 12:09:41 tron Exp $
 #
 
 DISTNAME=	xcb-util-0.3.9
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xcb-util036/Makefile b/x11/xcb-util036/Makefile
index b2352f9ce72..86150f58c50 100644
--- a/x11/xcb-util036/Makefile
+++ b/x11/xcb-util036/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2012/07/13 14:19:47 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/02 12:09:42 tron Exp $
 #
 
 DISTNAME=	xcb-util-0.3.6
 PKGNAME=	xcb-util036-0.3.6
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index d3f52aebccd..c12cb61e543 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/07/13 14:22:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/02 12:09:42 tron Exp $
 #
 
 DISTNAME=		xlsclients-1.1.2
@@ -19,7 +19,6 @@ USE_TOOLS+=		pkg-config
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
-BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.6
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xcb-util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 04ff43750f8..f9d8639b0a5 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/06/03 18:32:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/02 12:09:42 tron Exp $
 #
 
 DISTNAME=		xwininfo-1.1.2
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=		.tar.bz2