Change to use new mainatined *proto headers instead of

unmaintained *ext packages.
In some cases, the headers are identical.

I tested on DragonFly using X11_TYPE=xorg and on NetBSD
using native XFree86 (and more).

9 files changed, 21 insertions, 22 deletions

diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile
index 22e9d880538..591400bd29a 100644
--- a/x11/Xcomposite/Makefile
+++ b/x11/Xcomposite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:07 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/18 19:23:46 reed Exp $
 #
 
 DISTNAME=		libXcomposite-1.0.1
@@ -19,6 +19,6 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=	xcomposite.pc.in
 
 .include "../../x11/Xfixes/buildlink3.mk"
-.include "../../x11/compositeext/buildlink3.mk"
-.include "../../x11/fixesext/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index ea3a2e0627e..e5a99874f8d 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/18 19:23:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XCOMPOSITE_BUILDLINK3_MK:=	${XCOMPOSITE_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
 .endif	# XCOMPOSITE_BUILDLINK3_MK
 
 .include "../../x11/Xfixes/buildlink3.mk"
-.include "../../x11/compositeext/buildlink3.mk"
-.include "../../x11/fixesext/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile
index 30400f11983..6d67dc47eec 100644
--- a/x11/Xfixes/Makefile
+++ b/x11/Xfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:31:07 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/18 19:23:46 reed Exp $
 #
 
 DISTNAME=		libXfixes-2.0.1
@@ -20,6 +20,6 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    xfixes.pc.in
 
-.include "../../x11/fixesext/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 7d49082c97e..c3e1ec93ad6 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/18 19:23:47 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
@@ -17,6 +17,6 @@ BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
 .endif	# XFIXES_BUILDLINK3_MK
 
 .include "../../mk/x11.buildlink3.mk"
-.include "../../x11/fixesext/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 85dc627405a..d629fdfc254 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:56 reed Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/18 19:23:47 reed Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
@@ -21,10 +21,9 @@ GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE+=    xrandr.pc.in
 
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
-BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
 
 .include "../../x11/Xrender/buildlink3.mk"
-.include "../../x11/randrext/buildlink3.mk"
-.include "../../x11/xextensions/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 3f674cf1b16..ffdd8683c1f 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:56 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/04/18 19:23:47 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
 .endif	# XRANDR_BUILDLINK3_MK
 
-.include "../../x11/randrext/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index b3d998cffb0..f096096168c 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:31:07 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/18 19:23:47 reed Exp $
 
 DISTNAME=	libXrender-0.9.0
 PKGNAME=	${DISTNAME:S/lib//}
@@ -18,6 +18,6 @@ USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	xrender.pc.in
 
-.include "../../x11/renderext/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 73c1c514816..9a6911990fb 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2006/04/12 10:27:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2006/04/18 19:23:47 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -17,6 +17,6 @@ BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
 .endif	# XRENDER_BUILDLINK3_MK
 
 .include "../../mk/x11.buildlink3.mk"
-.include "../../x11/renderext/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile
index 8fc9b4283fa..5d294c09fdb 100644
--- a/x11/xcompmgr/Makefile
+++ b/x11/xcompmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/12 15:29:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/18 19:23:47 reed Exp $
 #
 
 DISTNAME=	xcompmgr-1.1.1
@@ -22,5 +22,5 @@ PKG_SKIP_REASON+=	"This package is exclusively for X.org."
 
 .include "../../x11/Xcomposite/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
-.include "../../x11/compositeext/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"