[pkgsrc/trunk]: pkgsrc/x11 Change to use new mainatined *proto headers instea...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/786e2351bcfa
branches:  trunk
changeset: 511654:786e2351bcfa
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Apr 18 19:23:46 2006 +0000

description:
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).

diffstat:

 x11/Xcomposite/Makefile            |  6 +++---
 x11/Xcomposite/buildlink3.mk       |  6 +++---
 x11/Xfixes/Makefile                |  4 ++--
 x11/Xfixes/buildlink3.mk           |  4 ++--
 x11/Xrandr-mixedcase/Makefile      |  7 +++----
 x11/Xrandr-mixedcase/buildlink3.mk |  4 ++--
 x11/Xrender/Makefile               |  4 ++--
 x11/Xrender/buildlink3.mk          |  4 ++--
 x11/xcompmgr/Makefile              |  4 ++--
 9 files changed, 21 insertions(+), 22 deletions(-)

diffs (161 lines):

diff -r 5da201894ced -r 786e2351bcfa x11/Xcomposite/Makefile
--- a/x11/Xcomposite/Makefile   Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xcomposite/Makefile   Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 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 -r 5da201894ced -r 786e2351bcfa x11/Xcomposite/buildlink3.mk
--- a/x11/Xcomposite/buildlink3.mk      Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xcomposite/buildlink3.mk      Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 .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 -r 5da201894ced -r 786e2351bcfa x11/Xfixes/Makefile
--- a/x11/Xfixes/Makefile       Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xfixes/Makefile       Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 
 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 -r 5da201894ced -r 786e2351bcfa x11/Xfixes/buildlink3.mk
--- a/x11/Xfixes/buildlink3.mk  Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xfixes/buildlink3.mk  Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 .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 -r 5da201894ced -r 786e2351bcfa x11/Xrandr-mixedcase/Makefile
--- a/x11/Xrandr-mixedcase/Makefile     Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xrandr-mixedcase/Makefile     Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 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 -r 5da201894ced -r 786e2351bcfa x11/Xrandr-mixedcase/buildlink3.mk
--- a/x11/Xrandr-mixedcase/buildlink3.mk        Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xrandr-mixedcase/buildlink3.mk        Tue Apr 18 19:23:46 2006 +0000
@@ -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_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 -r 5da201894ced -r 786e2351bcfa x11/Xrender/Makefile
--- a/x11/Xrender/Makefile      Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xrender/Makefile      Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 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 -r 5da201894ced -r 786e2351bcfa x11/Xrender/buildlink3.mk
--- a/x11/Xrender/buildlink3.mk Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/Xrender/buildlink3.mk Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 .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 -r 5da201894ced -r 786e2351bcfa x11/xcompmgr/Makefile
--- a/x11/xcompmgr/Makefile     Tue Apr 18 19:06:25 2006 +0000
+++ b/x11/xcompmgr/Makefile     Tue Apr 18 19:23:46 2006 +0000
@@ -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 @@
 
 .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"