Wed Sep 17 16:38:58 2008 UTC ()
Link in printproto to native X.Org.


(cube)
diff -r1.9.8.6 -r1.9.8.7 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.printproto
diff -r0 -r1.1.2.1 pkgsrc/x11/printproto/builtin.mk
cvs diff -r1.9.8.6 -r1.9.8.7 pkgsrc/pkgtools/x11-links/xorg.mk (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/17 16:29:52 1.9.8.6
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/17 16:38:58 1.9.8.7
@@ -1,66 +1,67 @@ @@ -1,66 +1,67 @@
1# $NetBSD: xorg.mk,v 1.9.8.6 2008/09/17 16:29:52 cube Exp $ 1# $NetBSD: xorg.mk,v 1.9.8.7 2008/09/17 16:38:58 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"
15.include "../../x11/bigreqsproto/buildlink3.mk" 15.include "../../x11/bigreqsproto/buildlink3.mk"
16.include "../../x11/compositeproto/buildlink3.mk" 16.include "../../x11/compositeproto/buildlink3.mk"
17.include "../../x11/damageproto/buildlink3.mk" 17.include "../../x11/damageproto/buildlink3.mk"
18.include "../../x11/evieext/buildlink3.mk" 18.include "../../x11/evieext/buildlink3.mk"
19.include "../../x11/fixesproto/buildlink3.mk" 19.include "../../x11/fixesproto/buildlink3.mk"
20.include "../../x11/fontcacheproto/buildlink3.mk" 20.include "../../x11/fontcacheproto/buildlink3.mk"
21.include "../../x11/fontsproto/buildlink3.mk" 21.include "../../x11/fontsproto/buildlink3.mk"
22.include "../../x11/glproto/buildlink3.mk" 22.include "../../x11/glproto/buildlink3.mk"
23.include "../../x11/inputproto/buildlink3.mk" 23.include "../../x11/inputproto/buildlink3.mk"
24.include "../../x11/libICE/buildlink3.mk" 24.include "../../x11/libICE/buildlink3.mk"
25.include "../../x11/libSM/buildlink3.mk" 25.include "../../x11/libSM/buildlink3.mk"
26.include "../../x11/libX11/buildlink3.mk" 26.include "../../x11/libX11/buildlink3.mk"
27.include "../../x11/libXcomposite/buildlink3.mk" 27.include "../../x11/libXcomposite/buildlink3.mk"
28.include "../../x11/libXcursor/buildlink3.mk" 28.include "../../x11/libXcursor/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXfixes/buildlink3.mk" 30.include "../../x11/libXfixes/buildlink3.mk"
31.include "../../x11/libXft/buildlink3.mk" 31.include "../../x11/libXft/buildlink3.mk"
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/renderproto/buildlink3.mk" 40.include "../../x11/renderproto/buildlink3.mk"
40.include "../../x11/randrproto/buildlink3.mk" 41.include "../../x11/randrproto/buildlink3.mk"
41.include "../../x11/xextproto/buildlink3.mk" 42.include "../../x11/xextproto/buildlink3.mk"
42.include "../../x11/xproto/buildlink3.mk" 43.include "../../x11/xproto/buildlink3.mk"
43 44
44# XXX what is ${X11_MODULES} ? 45# XXX what is ${X11_MODULES} ?
45 46
46# Check if any headers and libraries for ${X11_MODULES} found in 47# Check if any headers and libraries for ${X11_MODULES} found in
47# ${X11BASE} actually belong to the base Xorg or not. 48# ${X11BASE} actually belong to the base Xorg or not.
48# 49#
49# XXX: maybe skip iconv and zlib too? 50# XXX: maybe skip iconv and zlib too?
50.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} 51.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
51CHECK_BUILTIN.${_pkg_}:= yes 52CHECK_BUILTIN.${_pkg_}:= yes
52USE_BUILTIN.${_pkg_}= yes 53USE_BUILTIN.${_pkg_}= yes
53. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" 54. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
54CHECK_BUILTIN.${_pkg_}:= no 55CHECK_BUILTIN.${_pkg_}:= no
55.endfor 56.endfor
56 57
57.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} 58.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
58IGNORE_PKG.${_pkg_}= yes 59IGNORE_PKG.${_pkg_}= yes
59. if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) 60. if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS])
60. if exists(${FILESDIR}/xorg.${_pkg_}) 61. if exists(${FILESDIR}/xorg.${_pkg_})
61FILES_LIST+= ${FILESDIR}/xorg.${_pkg_} 62FILES_LIST+= ${FILESDIR}/xorg.${_pkg_}
62. elif exists(${FILESDIR}/xfree.${_pkg_}) 63. elif exists(${FILESDIR}/xfree.${_pkg_})
63FILES_LIST+= ${FILESDIR}/xfree.${_pkg_} 64FILES_LIST+= ${FILESDIR}/xfree.${_pkg_}
64. endif 65. endif
65. endif 66. endif
66.endfor 67.endfor
File Added: pkgsrc/pkgtools/x11-links/files/xorg.printproto
# $NetBSD: xorg.printproto,v 1.1.2.1 2008/09/17 16:38:58 cube Exp $
#
lib/pkgconfig/printproto.pc
File Added: pkgsrc/x11/printproto/Attic/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 16:38:58 cube Exp $

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

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