Thu Dec 4 04:16:42 2008 UTC ()
Builtinify libXtst.


(cube)
diff -r1.13 -r1.14 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r1.10 -r1.11 pkgsrc/pkgtools/x11-links/files/xorg
diff -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.libXtst
diff -r1.2 -r1.3 pkgsrc/x11/libXtst/buildlink3.mk
diff -r0 -r1.1 pkgsrc/x11/libXtst/builtin.mk
cvs diff -r1.13 -r1.14 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/11/11 16:19:23 1.13
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/12/04 04:16:41 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.13 2008/11/11 16:19:23 cube Exp $ 1# $NetBSD: xorg.mk,v 1.14 2008/12/04 04:16:41 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# XXX: what about xaw? 7# XXX: what about xaw?
8 8
9.include "../../fonts/fontconfig/buildlink3.mk" 9.include "../../fonts/fontconfig/buildlink3.mk"
10.include "../../fonts/libfontenc/buildlink3.mk" 10.include "../../fonts/libfontenc/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 "../../graphics/glut/buildlink3.mk" 14.include "../../graphics/glut/buildlink3.mk"
@@ -36,26 +36,27 @@ FILES_LIST= ${FILESDIR}/xorg @@ -36,26 +36,27 @@ FILES_LIST= ${FILESDIR}/xorg
36.include "../../x11/libXevie/buildlink3.mk" 36.include "../../x11/libXevie/buildlink3.mk"
37.include "../../x11/libXext/buildlink3.mk" 37.include "../../x11/libXext/buildlink3.mk"
38.include "../../x11/libXfixes/buildlink3.mk" 38.include "../../x11/libXfixes/buildlink3.mk"
39.include "../../x11/libXfont/buildlink3.mk" 39.include "../../x11/libXfont/buildlink3.mk"
40.include "../../x11/libXft/buildlink3.mk" 40.include "../../x11/libXft/buildlink3.mk"
41.include "../../x11/libXinerama/buildlink3.mk" 41.include "../../x11/libXinerama/buildlink3.mk"
42.include "../../x11/libXmu/buildlink3.mk" 42.include "../../x11/libXmu/buildlink3.mk"
43.include "../../x11/libXpm/buildlink3.mk" 43.include "../../x11/libXpm/buildlink3.mk"
44.include "../../x11/libXprintUtil/buildlink3.mk" 44.include "../../x11/libXprintUtil/buildlink3.mk"
45.include "../../x11/libXrandr/buildlink3.mk" 45.include "../../x11/libXrandr/buildlink3.mk"
46.include "../../x11/libXrender/buildlink3.mk" 46.include "../../x11/libXrender/buildlink3.mk"
47.include "../../x11/libXres/buildlink3.mk" 47.include "../../x11/libXres/buildlink3.mk"
48.include "../../x11/libXt/buildlink3.mk" 48.include "../../x11/libXt/buildlink3.mk"
 49.include "../../x11/libXtst/buildlink3.mk"
49.include "../../x11/libXv/buildlink3.mk" 50.include "../../x11/libXv/buildlink3.mk"
50.include "../../x11/libdrm/buildlink3.mk" 51.include "../../x11/libdrm/buildlink3.mk"
51.include "../../x11/liblbxutil/buildlink3.mk" 52.include "../../x11/liblbxutil/buildlink3.mk"
52.include "../../x11/pixman/buildlink3.mk" 53.include "../../x11/pixman/buildlink3.mk"
53.include "../../x11/printproto/buildlink3.mk" 54.include "../../x11/printproto/buildlink3.mk"
54.include "../../x11/randrproto/buildlink3.mk" 55.include "../../x11/randrproto/buildlink3.mk"
55.include "../../x11/recordproto/buildlink3.mk" 56.include "../../x11/recordproto/buildlink3.mk"
56.include "../../x11/renderproto/buildlink3.mk" 57.include "../../x11/renderproto/buildlink3.mk"
57.include "../../x11/resourceproto/buildlink3.mk" 58.include "../../x11/resourceproto/buildlink3.mk"
58.include "../../x11/scrnsaverproto/buildlink3.mk" 59.include "../../x11/scrnsaverproto/buildlink3.mk"
59.include "../../x11/trapproto/buildlink3.mk" 60.include "../../x11/trapproto/buildlink3.mk"
60.include "../../x11/videoproto/buildlink3.mk" 61.include "../../x11/videoproto/buildlink3.mk"
61.include "../../x11/xcmiscproto/buildlink3.mk" 62.include "../../x11/xcmiscproto/buildlink3.mk"
cvs diff -r1.10 -r1.11 pkgsrc/pkgtools/x11-links/files/xorg (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg 2008/10/29 21:14:01 1.10
+++ pkgsrc/pkgtools/x11-links/files/xorg 2008/12/04 04:16:41 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg,v 1.10 2008/10/29 21:14:01 cube Exp $ 1# $NetBSD: xorg,v 1.11 2008/12/04 04:16:41 cube Exp $
2# 2#
3# The files listed below are the union of the sets of files installed by 3# The files listed below are the union of the sets of files installed by
4# the supported Xorg (and some XFree) distributions, minus the set of files 4# the supported Xorg (and some XFree) distributions, minus the set of files
5# representing bits that may be added via pkgsrc, e.g. Xfixes, MesaLib, Xpm, 5# representing bits that may be added via pkgsrc, e.g. Xfixes, MesaLib, Xpm,
6# freetype2, etc. 6# freetype2, etc.
7# 7#
8include/DPS/ColorSB.h 8include/DPS/ColorSB.h
9include/DPS/ColorSBP.h 9include/DPS/ColorSBP.h
10include/DPS/DPSScrollW.h 10include/DPS/DPSScrollW.h
11include/DPS/DPSScrollWP.h 11include/DPS/DPSScrollWP.h
12include/DPS/FontCreatP.h 12include/DPS/FontCreatP.h
13include/DPS/FontCreato.h 13include/DPS/FontCreato.h
14include/DPS/FontSB.h 14include/DPS/FontSB.h
@@ -413,34 +413,26 @@ lib/libXprintAppUtil.1.dylib @@ -413,34 +413,26 @@ lib/libXprintAppUtil.1.dylib
413lib/libXprintAppUtil.dylib 413lib/libXprintAppUtil.dylib
414lib/libXprintAppUtil.a 414lib/libXprintAppUtil.a
415lib/libXprintUtil.1.0.0.dylib 415lib/libXprintUtil.1.0.0.dylib
416lib/libXprintUtil.1.dylib 416lib/libXprintUtil.1.dylib
417lib/libXprintUtil.dylib 417lib/libXprintUtil.dylib
418lib/libXprintUtil.a 418lib/libXprintUtil.a
419lib/libXss.1.0.0.dylib 419lib/libXss.1.0.0.dylib
420lib/libXss.1.dylib 420lib/libXss.1.dylib
421lib/libXss.dylib 421lib/libXss.dylib
422lib/libXss.a 422lib/libXss.a
423lib/libXss.so 423lib/libXss.so
424lib/libXss.so.1 424lib/libXss.so.1
425lib/libXss.so.1.0 425lib/libXss.so.1.0
426lib/libXtst.6.1.0.dylib 
427lib/libXtst.6.1.dylib 
428lib/libXtst.6.dylib 
429lib/libXtst.a 
430lib/libXtst.dylib 
431lib/libXtst.so 
432lib/libXtst.so.6 
433lib/libXtst.so.6.1 
434lib/libXvMC.1.0.0.dylib 426lib/libXvMC.1.0.0.dylib
435lib/libXvMC.1.dylib 427lib/libXvMC.1.dylib
436lib/libXvMC.dylib 428lib/libXvMC.dylib
437lib/libXvMC.a 429lib/libXvMC.a
438lib/libXvMC.so 430lib/libXvMC.so
439lib/libXvMC.so.1 431lib/libXvMC.so.1
440lib/libXvMC.so.1.0 432lib/libXvMC.so.1.0
441lib/libXvMCW.1.0.0.dylib 433lib/libXvMCW.1.0.0.dylib
442lib/libXvMCW.1.dylib 434lib/libXvMCW.1.dylib
443lib/libXvMCW.dylib 435lib/libXvMCW.dylib
444lib/libXxf86misc.1.1.0.dylib 436lib/libXxf86misc.1.1.0.dylib
445lib/libXxf86misc.1.dylib 437lib/libXxf86misc.1.dylib
446lib/libXxf86misc.dylib 438lib/libXxf86misc.dylib
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libXtst
# $NetBSD: xorg.libXtst,v 1.1 2008/12/04 04:16:41 cube Exp $
lib/libXtst.6.1.0.dylib
lib/libXtst.6.1.dylib
lib/libXtst.6.dylib
lib/libXtst.a
lib/libXtst.dylib
lib/libXtst.so
lib/libXtst.so.6
lib/libXtst.so.6.1
lib/pkgconfig/xtst.pc
cvs diff -r1.2 -r1.3 pkgsrc/x11/libXtst/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXtst/buildlink3.mk 2006/12/17 18:05:13 1.2
+++ pkgsrc/x11/libXtst/buildlink3.mk 2008/12/04 04:16:41 1.3
@@ -1,32 +1,25 @@ @@ -1,32 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 18:05:13 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2008/12/04 04:16:41 cube Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" 
6.include "../../mk/x11.buildlink3.mk" 
7.else 
8 
9 
10BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 5BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
11LIBXTST_BUILDLINK3_MK:= ${LIBXTST_BUILDLINK3_MK}+ 6LIBXTST_BUILDLINK3_MK:= ${LIBXTST_BUILDLINK3_MK}+
12 7
13.if ${BUILDLINK_DEPTH} == "+" 8.if ${BUILDLINK_DEPTH} == "+"
14BUILDLINK_DEPENDS+= libXtst 9BUILDLINK_DEPENDS+= libXtst
15.endif 10.endif
16 11
17BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXtst} 12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXtst}
18BUILDLINK_PACKAGES+= libXtst 13BUILDLINK_PACKAGES+= libXtst
19BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXtst 14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXtst
20 15
21.if ${LIBXTST_BUILDLINK3_MK} == "+" 16.if ${LIBXTST_BUILDLINK3_MK} == "+"
22BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.0.1 17BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.0.1
23BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst 18BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst
24.endif # LIBXTST_BUILDLINK3_MK 19.endif # LIBXTST_BUILDLINK3_MK
25 20
26.include "../../x11/recordproto/buildlink3.mk" 21.include "../../x11/recordproto/buildlink3.mk"
27.include "../../x11/libX11/buildlink3.mk" 22.include "../../x11/libX11/buildlink3.mk"
28.include "../../x11/libXext/buildlink3.mk" 23.include "../../x11/libXext/buildlink3.mk"
29 24
30BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 25BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
31 
32.endif 
File Added: pkgsrc/x11/libXtst/builtin.mk
# $NetBSD: builtin.mk,v 1.1 2008/12/04 04:16:41 cube Exp $

BUILTIN_PKG:=	libXtst
PKGCONFIG_FILE.libXtst=	${X11BASE}/lib/pkgconfig/xtst.pc \
				${X11BASE}/lib/libXtst.so

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