Wed Sep 17 18:31:02 2008 UTC ()
Link in to native X.Org all the remaining "proto" packages:
 trapproto, vidmodeproto, xf86bigfontproto, xf86dgaproto, xf86driproto,
 xf86miscproto, xf86vidmodeproto, xproxymanagementprotocol


(cube)
diff -r1.9.8.11 -r1.9.8.12 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.trapproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.videoproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
diff -r0 -r1.1.2.1 pkgsrc/x11/trapproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/videoproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/xf86bigfontproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/xf86dgaproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/xf86driproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/xf86miscproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/xf86vidmodeproto/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/xproxymanagementprotocol/builtin.mk
cvs diff -r1.9.8.11 -r1.9.8.12 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/17 17:35:11 1.9.8.11
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/17 18:31:02 1.9.8.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.9.8.11 2008/09/17 17:35:11 cube Exp $ 1# $NetBSD: xorg.mk,v 1.9.8.12 2008/09/17 18:31:02 cube Exp $
2# 2#
3# This is for X.org, but use "xfree" files also. 3# This is for X.org, but use "xfree" files also.
4 4
5FILES_LIST= ${FILESDIR}/xorg 5FILES_LIST= ${FILESDIR}/xorg
6 6
7# libXdamage and damageext only in pkgsrc-wip so not used here 7# libXdamage and damageext only in pkgsrc-wip so not used here
8# XXX: what about xaw? 8# XXX: what about xaw?
9 9
10.include "../../fonts/fontconfig/buildlink3.mk" 10.include "../../fonts/fontconfig/buildlink3.mk"
11.include "../../graphics/MesaLib/buildlink3.mk" 11.include "../../graphics/MesaLib/buildlink3.mk"
12.include "../../graphics/freetype2/buildlink3.mk" 12.include "../../graphics/freetype2/buildlink3.mk"
13.include "../../graphics/glu/buildlink3.mk" 13.include "../../graphics/glu/buildlink3.mk"
14.include "../../textproc/expat/buildlink3.mk" 14.include "../../textproc/expat/buildlink3.mk"
@@ -32,28 +32,37 @@ FILES_LIST= ${FILESDIR}/xorg @@ -32,28 +32,37 @@ FILES_LIST= ${FILESDIR}/xorg
32.include "../../x11/libXinerama/buildlink3.mk" 32.include "../../x11/libXinerama/buildlink3.mk"
33.include "../../x11/libXmu/buildlink3.mk" 33.include "../../x11/libXmu/buildlink3.mk"
34.include "../../x11/libXpm/buildlink3.mk" 34.include "../../x11/libXpm/buildlink3.mk"
35.include "../../x11/libXrandr/buildlink3.mk" 35.include "../../x11/libXrandr/buildlink3.mk"
36.include "../../x11/libXrender/buildlink3.mk" 36.include "../../x11/libXrender/buildlink3.mk"
37.include "../../x11/libXt/buildlink3.mk" 37.include "../../x11/libXt/buildlink3.mk"
38.include "../../x11/pixman/buildlink3.mk" 38.include "../../x11/pixman/buildlink3.mk"
39.include "../../x11/printproto/buildlink3.mk" 39.include "../../x11/printproto/buildlink3.mk"
40.include "../../x11/randrproto/buildlink3.mk" 40.include "../../x11/randrproto/buildlink3.mk"
41.include "../../x11/recordproto/buildlink3.mk" 41.include "../../x11/recordproto/buildlink3.mk"
42.include "../../x11/renderproto/buildlink3.mk" 42.include "../../x11/renderproto/buildlink3.mk"
43.include "../../x11/resourceproto/buildlink3.mk" 43.include "../../x11/resourceproto/buildlink3.mk"
44.include "../../x11/scrnsaverproto/buildlink3.mk" 44.include "../../x11/scrnsaverproto/buildlink3.mk"
 45.include "../../x11/trapproto/buildlink3.mk"
 46.include "../../x11/videoproto/buildlink3.mk"
 47.include "../../x11/xcmiscproto/buildlink3.mk"
45.include "../../x11/xextproto/buildlink3.mk" 48.include "../../x11/xextproto/buildlink3.mk"
 49.include "../../x11/xf86bigfontproto/buildlink3.mk"
 50.include "../../x11/xf86dgaproto/buildlink3.mk"
 51.include "../../x11/xf86driproto/buildlink3.mk"
 52.include "../../x11/xf86miscproto/buildlink3.mk"
 53.include "../../x11/xf86vidmodeproto/buildlink3.mk"
46.include "../../x11/xproto/buildlink3.mk" 54.include "../../x11/xproto/buildlink3.mk"
 55.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
47 56
48# XXX what is ${X11_MODULES} ? 57# XXX what is ${X11_MODULES} ?
49 58
50# Check if any headers and libraries for ${X11_MODULES} found in 59# Check if any headers and libraries for ${X11_MODULES} found in
51# ${X11BASE} actually belong to the base Xorg or not. 60# ${X11BASE} actually belong to the base Xorg or not.
52# 61#
53# XXX: maybe skip iconv and zlib too? 62# XXX: maybe skip iconv and zlib too?
54.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} 63.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
55CHECK_BUILTIN.${_pkg_}:= yes 64CHECK_BUILTIN.${_pkg_}:= yes
56USE_BUILTIN.${_pkg_}= yes 65USE_BUILTIN.${_pkg_}= yes
57. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" 66. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
58CHECK_BUILTIN.${_pkg_}:= no 67CHECK_BUILTIN.${_pkg_}:= no
59.endfor 68.endfor
File Added: pkgsrc/pkgtools/x11-links/files/xorg.trapproto
# $NetBSD: xorg.trapproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/trapproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.videoproto
# $NetBSD: xorg.videoproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
include/X11/extensions/vldXvMC.h
lib/pkgconfig/videoproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto
# $NetBSD: xorg.xcmiscproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/xcmiscproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto
# $NetBSD: xorg.xf86bigfontproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/xf86bigfontproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto
# $NetBSD: xorg.xf86dgaproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/xf86dgaproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto
# $NetBSD: xorg.xf86driproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
include/X11/dri/xf86dri.h
include/X11/dri/xf86dristr.h
lib/pkgconfig/xf86driproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto
# $NetBSD: xorg.xf86miscproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/xf86miscproto.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto
# $NetBSD: xorg.xf86vidmodeproto,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/xf86vidmode.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
# $NetBSD: xorg.xproxymanagementprotocol,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $
#
lib/pkgconfig/xproxymngproto.pc
File Added: pkgsrc/x11/trapproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:01 cube Exp $

BUILTIN_PKG:=	trapproto
PKGCONFIG_FILE.trapproto=	${X11BASE}/lib/pkgconfig/trapproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/videoproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:01 cube Exp $

BUILTIN_PKG:=	videoproto
PKGCONFIG_FILE.videoproto=	${X11BASE}/lib/pkgconfig/videoproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/xf86bigfontproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $

BUILTIN_PKG:=	xf86bigfontproto
PKGCONFIG_FILE.xf86bigfontproto=	${X11BASE}/lib/pkgconfig/xf86bigfontproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/xf86dgaproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $

BUILTIN_PKG:=	xf86dgaproto
PKGCONFIG_FILE.xf86dgaproto=	${X11BASE}/lib/pkgconfig/xf86dgaproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/xf86driproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $

BUILTIN_PKG:=	xf86driproto
PKGCONFIG_FILE.xf86driproto=	${X11BASE}/lib/pkgconfig/xf86driproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/xf86miscproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $

BUILTIN_PKG:=	xf86miscproto
PKGCONFIG_FILE.xf86miscproto=	${X11BASE}/lib/pkgconfig/xf86miscproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/xf86vidmodeproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $

BUILTIN_PKG:=	xf86vidmodeproto
PKGCONFIG_FILE.xf86vidmodeproto=	${X11BASE}/lib/pkgconfig/xf86vidmodeproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/xproxymanagementprotocol/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $

BUILTIN_PKG:=	xproxymanagementprotocol
PKGCONFIG_FILE.xproxymanagementprotocol=	${X11BASE}/lib/pkgconfig/xproxymngproto.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"