Thu Sep 18 17:33:27 2008 UTC ()
Make sure libfontenc, libdrm, libXfont, libXprintUtil and liblbxutil are
handled in native X.Org.


(cube)
diff -r0 -r1.1.2.1 pkgsrc/fonts/libfontenc/builtin.mk
diff -r1.9.8.16 -r1.9.8.17 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.libXfont
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.libXprintUtil
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.libdrm
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.libfontenc
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.liblbxutil
diff -r0 -r1.1.2.1 pkgsrc/x11/libXfont/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/libXprintUtil/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/libdrm/builtin.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/liblbxutil/builtin.mk
File Added: pkgsrc/fonts/libfontenc/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $

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

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
cvs diff -r1.9.8.16 -r1.9.8.17 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/18 03:09:51 1.9.8.16
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/18 17:33:27 1.9.8.17
@@ -1,56 +1,61 @@ @@ -1,56 +1,61 @@
1# $NetBSD: xorg.mk,v 1.9.8.16 2008/09/18 03:09:51 cube Exp $ 1# $NetBSD: xorg.mk,v 1.9.8.17 2008/09/18 17:33:27 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 "../../fonts/libfontenc/buildlink3.mk"
11.include "../../graphics/MesaLib/buildlink3.mk" 12.include "../../graphics/MesaLib/buildlink3.mk"
12.include "../../graphics/freetype2/buildlink3.mk" 13.include "../../graphics/freetype2/buildlink3.mk"
13.include "../../graphics/glu/buildlink3.mk" 14.include "../../graphics/glu/buildlink3.mk"
14.include "../../textproc/expat/buildlink3.mk" 15.include "../../textproc/expat/buildlink3.mk"
15.include "../../x11/bigreqsproto/buildlink3.mk" 16.include "../../x11/bigreqsproto/buildlink3.mk"
16.include "../../x11/compositeproto/buildlink3.mk" 17.include "../../x11/compositeproto/buildlink3.mk"
17.include "../../x11/damageproto/buildlink3.mk" 18.include "../../x11/damageproto/buildlink3.mk"
18.include "../../x11/evieext/buildlink3.mk" 19.include "../../x11/evieext/buildlink3.mk"
19.include "../../x11/fixesproto/buildlink3.mk" 20.include "../../x11/fixesproto/buildlink3.mk"
20.include "../../x11/fontcacheproto/buildlink3.mk" 21.include "../../x11/fontcacheproto/buildlink3.mk"
21.include "../../x11/fontsproto/buildlink3.mk" 22.include "../../x11/fontsproto/buildlink3.mk"
22.include "../../x11/glproto/buildlink3.mk" 23.include "../../x11/glproto/buildlink3.mk"
23.include "../../x11/inputproto/buildlink3.mk" 24.include "../../x11/inputproto/buildlink3.mk"
24.include "../../x11/libFS/buildlink3.mk" 25.include "../../x11/libFS/buildlink3.mk"
25.include "../../x11/libICE/buildlink3.mk" 26.include "../../x11/libICE/buildlink3.mk"
26.include "../../x11/libSM/buildlink3.mk" 27.include "../../x11/libSM/buildlink3.mk"
27.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
28.include "../../x11/libXScrnSaver/buildlink3.mk" 29.include "../../x11/libXScrnSaver/buildlink3.mk"
29.include "../../x11/libXTrap/buildlink3.mk" 30.include "../../x11/libXTrap/buildlink3.mk"
30.include "../../x11/libXau/buildlink3.mk" 31.include "../../x11/libXau/buildlink3.mk"
31.include "../../x11/libXcomposite/buildlink3.mk" 32.include "../../x11/libXcomposite/buildlink3.mk"
32.include "../../x11/libXcursor/buildlink3.mk" 33.include "../../x11/libXcursor/buildlink3.mk"
33.include "../../x11/libXdmcp/buildlink3.mk" 34.include "../../x11/libXdmcp/buildlink3.mk"
34.include "../../x11/libXevie/buildlink3.mk" 35.include "../../x11/libXevie/buildlink3.mk"
35.include "../../x11/libXext/buildlink3.mk" 36.include "../../x11/libXext/buildlink3.mk"
36.include "../../x11/libXfixes/buildlink3.mk" 37.include "../../x11/libXfixes/buildlink3.mk"
 38.include "../../x11/libXfont/buildlink3.mk"
37.include "../../x11/libXft/buildlink3.mk" 39.include "../../x11/libXft/buildlink3.mk"
38.include "../../x11/libXinerama/buildlink3.mk" 40.include "../../x11/libXinerama/buildlink3.mk"
39.include "../../x11/libXmu/buildlink3.mk" 41.include "../../x11/libXmu/buildlink3.mk"
40.include "../../x11/libXpm/buildlink3.mk" 42.include "../../x11/libXpm/buildlink3.mk"
 43.include "../../x11/libXprintUtil/buildlink3.mk"
41.include "../../x11/libXrandr/buildlink3.mk" 44.include "../../x11/libXrandr/buildlink3.mk"
42.include "../../x11/libXrender/buildlink3.mk" 45.include "../../x11/libXrender/buildlink3.mk"
43.include "../../x11/libXt/buildlink3.mk" 46.include "../../x11/libXt/buildlink3.mk"
 47.include "../../x11/libdrm/buildlink3.mk"
 48.include "../../x11/liblbxutil/buildlink3.mk"
44.include "../../x11/pixman/buildlink3.mk" 49.include "../../x11/pixman/buildlink3.mk"
45.include "../../x11/printproto/buildlink3.mk" 50.include "../../x11/printproto/buildlink3.mk"
46.include "../../x11/randrproto/buildlink3.mk" 51.include "../../x11/randrproto/buildlink3.mk"
47.include "../../x11/recordproto/buildlink3.mk" 52.include "../../x11/recordproto/buildlink3.mk"
48.include "../../x11/renderproto/buildlink3.mk" 53.include "../../x11/renderproto/buildlink3.mk"
49.include "../../x11/resourceproto/buildlink3.mk" 54.include "../../x11/resourceproto/buildlink3.mk"
50.include "../../x11/scrnsaverproto/buildlink3.mk" 55.include "../../x11/scrnsaverproto/buildlink3.mk"
51.include "../../x11/trapproto/buildlink3.mk" 56.include "../../x11/trapproto/buildlink3.mk"
52.include "../../x11/videoproto/buildlink3.mk" 57.include "../../x11/videoproto/buildlink3.mk"
53.include "../../x11/xcmiscproto/buildlink3.mk" 58.include "../../x11/xcmiscproto/buildlink3.mk"
54.include "../../x11/xextproto/buildlink3.mk" 59.include "../../x11/xextproto/buildlink3.mk"
55.include "../../x11/xf86bigfontproto/buildlink3.mk" 60.include "../../x11/xf86bigfontproto/buildlink3.mk"
56.include "../../x11/xf86dgaproto/buildlink3.mk" 61.include "../../x11/xf86dgaproto/buildlink3.mk"
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libXfont
# $NetBSD: xorg.libXfont,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
#
include/X11/fonts/bdfint.h
include/X11/fonts/bitmap.h
include/X11/fonts/bufio.h
include/X11/fonts/fntfil.h
include/X11/fonts/fntfilio.h
include/X11/fonts/fntfilst.h
include/X11/fonts/fontconf.h
include/X11/fonts/fontencc.h
include/X11/fonts/fontmisc.h
include/X11/fonts/fontmod.h
include/X11/fonts/fontshow.h
include/X11/fonts/fontutil.h
include/X11/fonts/fontxlfd.h
include/X11/fonts/ft.h
include/X11/fonts/ftfuncs.h
include/X11/fonts/pcf.h
lib/libXfont.so.1.4.1
lib/pkgconfig/xfont.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libXprintUtil
# $NetBSD: xorg.libXprintUtil,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
#
lib/libXprintUtil.so
lib/libXprintUtil.so.1
lib/libXprintUtil.so.1.0.0
lib/pkgconfig/xprintutil.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libdrm
# $NetBSD: xorg.libdrm,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
#
include/X11/xf86drm.h
include/X11/xf86mm.h
lib/libdrm.a
lib/libdrm.so
lib/libdrm.so.2
lib/libdrm.so.2.3
lib/pkgconfig/libdrm.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libfontenc
# $NetBSD: xorg.libfontenc,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
#
lib/pkgconfig/fontenc.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.liblbxutil
# $NetBSD: xorg.liblbxutil,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $
#
lib/liblbxutil.so
lib/liblbxutil.so.1
lib/liblbxutil.so.1.0
lib/pkgconfig/lbxutil.pc
File Added: pkgsrc/x11/libXfont/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $

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

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

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

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
File Added: pkgsrc/x11/libdrm/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $

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

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

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

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