Sun Sep 21 17:04:13 2008 UTC ()
Rework libXdamage support in native X11:
  - provide a builtin.mk files instead of using x11.buildlink3.mk
  - split files into a package-specific file
  - update list of files for native X.Org.


(cube)
diff -r1.9.8.18 -r1.9.8.19 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r1.7 -r1.7.2.1 pkgsrc/pkgtools/x11-links/files/xorg
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.libXdamage
diff -r1.2 -r1.2.18.1 pkgsrc/x11/libXdamage/buildlink3.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/libXdamage/builtin.mk
cvs diff -r1.9.8.18 -r1.9.8.19 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/18 19:30:37 1.9.8.18
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/21 17:04:13 1.9.8.19
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1# $NetBSD: xorg.mk,v 1.9.8.18 2008/09/18 19:30:37 cube Exp $ 1# $NetBSD: xorg.mk,v 1.9.8.19 2008/09/21 17:04:13 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 
8# XXX: what about xaw? 7# XXX: what about xaw?
9 8
10.include "../../fonts/fontconfig/buildlink3.mk" 9.include "../../fonts/fontconfig/buildlink3.mk"
11.include "../../fonts/libfontenc/buildlink3.mk" 10.include "../../fonts/libfontenc/buildlink3.mk"
12.include "../../graphics/MesaLib/buildlink3.mk" 11.include "../../graphics/MesaLib/buildlink3.mk"
13.include "../../graphics/freetype2/buildlink3.mk" 12.include "../../graphics/freetype2/buildlink3.mk"
14.include "../../graphics/glu/buildlink3.mk" 13.include "../../graphics/glu/buildlink3.mk"
15.include "../../textproc/expat/buildlink3.mk" 14.include "../../textproc/expat/buildlink3.mk"
16.include "../../x11/bigreqsproto/buildlink3.mk" 15.include "../../x11/bigreqsproto/buildlink3.mk"
17.include "../../x11/compositeproto/buildlink3.mk" 16.include "../../x11/compositeproto/buildlink3.mk"
18.include "../../x11/damageproto/buildlink3.mk" 17.include "../../x11/damageproto/buildlink3.mk"
19.include "../../x11/evieext/buildlink3.mk" 18.include "../../x11/evieext/buildlink3.mk"
20.include "../../x11/fixesproto/buildlink3.mk" 19.include "../../x11/fixesproto/buildlink3.mk"
21.include "../../x11/fontcacheproto/buildlink3.mk" 20.include "../../x11/fontcacheproto/buildlink3.mk"
22.include "../../x11/fontsproto/buildlink3.mk" 21.include "../../x11/fontsproto/buildlink3.mk"
23.include "../../x11/glproto/buildlink3.mk" 22.include "../../x11/glproto/buildlink3.mk"
24.include "../../x11/inputproto/buildlink3.mk" 23.include "../../x11/inputproto/buildlink3.mk"
25.include "../../x11/libFS/buildlink3.mk" 24.include "../../x11/libFS/buildlink3.mk"
26.include "../../x11/libICE/buildlink3.mk" 25.include "../../x11/libICE/buildlink3.mk"
27.include "../../x11/libSM/buildlink3.mk" 26.include "../../x11/libSM/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 27.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXScrnSaver/buildlink3.mk" 28.include "../../x11/libXScrnSaver/buildlink3.mk"
30.include "../../x11/libXTrap/buildlink3.mk" 29.include "../../x11/libXTrap/buildlink3.mk"
31.include "../../x11/libXau/buildlink3.mk" 30.include "../../x11/libXau/buildlink3.mk"
32.include "../../x11/libXcomposite/buildlink3.mk" 31.include "../../x11/libXcomposite/buildlink3.mk"
33.include "../../x11/libXcursor/buildlink3.mk" 32.include "../../x11/libXcursor/buildlink3.mk"
 33.include "../../x11/libXdamage/buildlink3.mk"
34.include "../../x11/libXdmcp/buildlink3.mk" 34.include "../../x11/libXdmcp/buildlink3.mk"
35.include "../../x11/libXevie/buildlink3.mk" 35.include "../../x11/libXevie/buildlink3.mk"
36.include "../../x11/libXext/buildlink3.mk" 36.include "../../x11/libXext/buildlink3.mk"
37.include "../../x11/libXfixes/buildlink3.mk" 37.include "../../x11/libXfixes/buildlink3.mk"
38.include "../../x11/libXfont/buildlink3.mk" 38.include "../../x11/libXfont/buildlink3.mk"
39.include "../../x11/libXft/buildlink3.mk" 39.include "../../x11/libXft/buildlink3.mk"
40.include "../../x11/libXinerama/buildlink3.mk" 40.include "../../x11/libXinerama/buildlink3.mk"
41.include "../../x11/libXmu/buildlink3.mk" 41.include "../../x11/libXmu/buildlink3.mk"
42.include "../../x11/libXpm/buildlink3.mk" 42.include "../../x11/libXpm/buildlink3.mk"
43.include "../../x11/libXprintUtil/buildlink3.mk" 43.include "../../x11/libXprintUtil/buildlink3.mk"
44.include "../../x11/libXrandr/buildlink3.mk" 44.include "../../x11/libXrandr/buildlink3.mk"
45.include "../../x11/libXrender/buildlink3.mk" 45.include "../../x11/libXrender/buildlink3.mk"
46.include "../../x11/libXt/buildlink3.mk" 46.include "../../x11/libXt/buildlink3.mk"
cvs diff -r1.7 -r1.7.2.1 pkgsrc/pkgtools/x11-links/files/xorg (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg 2008/08/22 13:34:39 1.7
+++ pkgsrc/pkgtools/x11-links/files/xorg 2008/09/21 17:04:13 1.7.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg,v 1.7 2008/08/22 13:34:39 tron Exp $ 1# $NetBSD: xorg,v 1.7.2.1 2008/09/21 17:04:13 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
@@ -240,27 +240,26 @@ include/X11/extensions/Printstr.h @@ -240,27 +240,26 @@ include/X11/extensions/Printstr.h
240include/X11/extensions/XIE.h 240include/X11/extensions/XIE.h
241include/X11/extensions/XIElib.h 241include/X11/extensions/XIElib.h
242include/X11/extensions/XIEproto.h 242include/X11/extensions/XIEproto.h
243include/X11/extensions/XIEprotost.h 243include/X11/extensions/XIEprotost.h
244include/X11/extensions/XKBbells.h 244include/X11/extensions/XKBbells.h
245include/X11/extensions/XKBconfig.h 245include/X11/extensions/XKBconfig.h
246include/X11/extensions/XKBfile.h 246include/X11/extensions/XKBfile.h
247include/X11/extensions/XKBrules.h 247include/X11/extensions/XKBrules.h
248include/X11/extensions/XKBui.h 248include/X11/extensions/XKBui.h
249include/X11/extensions/XKM.h 249include/X11/extensions/XKM.h
250include/X11/extensions/XKMformat.h 250include/X11/extensions/XKMformat.h
251include/X11/extensions/XRes.h 251include/X11/extensions/XRes.h
252include/X11/extensions/XResproto.h 252include/X11/extensions/XResproto.h
253include/X11/extensions/Xdamage.h 
254include/X11/extensions/Xevie.h 253include/X11/extensions/Xevie.h
255include/X11/extensions/Xeviestr.h 254include/X11/extensions/Xeviestr.h
256include/X11/extensions/Xinerama.h 255include/X11/extensions/Xinerama.h
257include/X11/extensions/XvMClib.h 256include/X11/extensions/XvMClib.h
258include/X11/extensions/Xvlib.h 257include/X11/extensions/Xvlib.h
259include/X11/extensions/damageproto.h 258include/X11/extensions/damageproto.h
260include/X11/extensions/damagewire.h 259include/X11/extensions/damagewire.h
261include/X11/extensions/dmxext.h 260include/X11/extensions/dmxext.h
262include/X11/extensions/dmxproto.h 261include/X11/extensions/dmxproto.h
263include/X11/extensions/fontcache.h 262include/X11/extensions/fontcache.h
264include/X11/extensions/fontcacheP.h 263include/X11/extensions/fontcacheP.h
265include/X11/extensions/fontcachstr.h 264include/X11/extensions/fontcachstr.h
266include/X11/extensions/panoramiXext.h 265include/X11/extensions/panoramiXext.h
@@ -352,31 +351,26 @@ lib/libXTrap.so.6.4 @@ -352,31 +351,26 @@ lib/libXTrap.so.6.4
352lib/libXaw.6.1.dylib 351lib/libXaw.6.1.dylib
353lib/libXaw.6.dylib 352lib/libXaw.6.dylib
354lib/libXaw.7.0.dylib 353lib/libXaw.7.0.dylib
355lib/libXaw.7.dylib 354lib/libXaw.7.dylib
356lib/libXaw.8.dylib 355lib/libXaw.8.dylib
357lib/libXaw.a 356lib/libXaw.a
358lib/libXaw.dylib 357lib/libXaw.dylib
359lib/libXaw.so 358lib/libXaw.so
360lib/libXaw.so.6 359lib/libXaw.so.6
361lib/libXaw.so.6.1 360lib/libXaw.so.6.1
362lib/libXaw.so.7 361lib/libXaw.so.7
363lib/libXaw.so.7.0 362lib/libXaw.so.7.0
364lib/libXaw.so.8.0 363lib/libXaw.so.8.0
365lib/libXdamage.1.0.0.dylib 
366lib/libXdamage.1.dylib 
367lib/libXdamage.dylib 
368lib/libXdamage.a 
369lib/libXdamage.so.1.0 
370lib/libXevie.1.0.0.dylib 364lib/libXevie.1.0.0.dylib
371lib/libXevie.1.dylib 365lib/libXevie.1.dylib
372lib/libXevie.dylib 366lib/libXevie.dylib
373lib/libXevie.a 367lib/libXevie.a
374lib/libXevie.so.1.0 368lib/libXevie.so.1.0
375lib/libXfont.1.3.dylib 369lib/libXfont.1.3.dylib
376lib/libXfont.1.4.dylib 370lib/libXfont.1.4.dylib
377lib/libXfont.1.4.1.dylib 371lib/libXfont.1.4.1.dylib
378lib/libXfont.1.dylib 372lib/libXfont.1.dylib
379lib/libXfont.a 373lib/libXfont.a
380lib/libXfont.dylib 374lib/libXfont.dylib
381lib/libXfont.so 375lib/libXfont.so
382lib/libXfont.so.1 376lib/libXfont.so.1
@@ -520,15 +514,14 @@ lib/libpsres.a @@ -520,15 +514,14 @@ lib/libpsres.a
520lib/libpsres.dylib 514lib/libpsres.dylib
521lib/libpsres.so 515lib/libpsres.so
522lib/libpsres.so.1 516lib/libpsres.so.1
523lib/libpsres.so.1.0 517lib/libpsres.so.1.0
524lib/libxf86config.a 518lib/libxf86config.a
525lib/libxkbfile.a 519lib/libxkbfile.a
526lib/libxkbfile.so 520lib/libxkbfile.so
527lib/libxkbfile.so.1 521lib/libxkbfile.so.1
528lib/libxkbfile.so.1.0 522lib/libxkbfile.so.1.0
529lib/libxkbui.a 523lib/libxkbui.a
530lib/libxkbui.so 524lib/libxkbui.so
531lib/libxkbui.so.1 525lib/libxkbui.so.1
532lib/libxkbui.so.1.0 526lib/libxkbui.so.1.0
533lib/pkgconfig/xdamage.pc 
534lib/pkgconfig/xevie.pc 527lib/pkgconfig/xevie.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libXdamage
# $NetBSD: xorg.libXdamage,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $
#
include/X11/extensions/Xdamage.h
lib/libXdamage.1.0.0.dylib
lib/libXdamage.1.dylib
lib/libXdamage.a
lib/libXdamage.dylib
lib/libXdamage.so
lib/libXdamage.so.1
lib/libXdamage.so.1.0
lib/libXdamage.so.1.1
lib/pkgconfig/xdamage.pc
cvs diff -r1.2 -r1.2.18.1 pkgsrc/x11/libXdamage/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXdamage/buildlink3.mk 2006/12/17 23:02:25 1.2
+++ pkgsrc/x11/libXdamage/buildlink3.mk 2008/09/21 17:04:13 1.2.18.1
@@ -1,32 +1,26 @@ @@ -1,32 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 23:02:25 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.2.18.1 2008/09/21 17:04:13 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 
9BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 5BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
10LIBXDAMAGE_BUILDLINK3_MK:= ${LIBXDAMAGE_BUILDLINK3_MK}+ 6LIBXDAMAGE_BUILDLINK3_MK:= ${LIBXDAMAGE_BUILDLINK3_MK}+
11 7
12.if ${BUILDLINK_DEPTH} == "+" 8.if ${BUILDLINK_DEPTH} == "+"
13BUILDLINK_DEPENDS+= libXdamage 9BUILDLINK_DEPENDS+= libXdamage
14.endif 10.endif
15 11
16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXdamage} 12BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXdamage}
17BUILDLINK_PACKAGES+= libXdamage 13BUILDLINK_PACKAGES+= libXdamage
18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXdamage 14BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXdamage
19 15
20.if ${LIBXDAMAGE_BUILDLINK3_MK} == "+" 16.if ${LIBXDAMAGE_BUILDLINK3_MK} == "+"
21BUILDLINK_API_DEPENDS.libXdamage+= libXdamage>=1.0.3 17BUILDLINK_API_DEPENDS.libXdamage+= libXdamage>=1.0.3
22BUILDLINK_PKGSRCDIR.libXdamage?= ../../x11/libXdamage 18BUILDLINK_PKGSRCDIR.libXdamage?= ../../x11/libXdamage
23.endif # LIBXDAMAGE_BUILDLINK3_MK 19.endif # LIBXDAMAGE_BUILDLINK3_MK
24 20
25.include "../../x11/damageproto/buildlink3.mk" 21.include "../../x11/damageproto/buildlink3.mk"
26.include "../../x11/libX11/buildlink3.mk" 22.include "../../x11/libX11/buildlink3.mk"
27.include "../../x11/libXfixes/buildlink3.mk" 23.include "../../x11/libXfixes/buildlink3.mk"
28.include "../../x11/xproto/buildlink3.mk" 24.include "../../x11/xproto/buildlink3.mk"
29 25
30BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
31 
32.endif 
File Added: pkgsrc/x11/libXdamage/builtin.mk
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $

BUILTIN_PKG:=	libXdamage
PKGCONFIG_FILE.libXdamage=	${X11BASE}/lib/pkgconfig/xdamage.pc \
				${X11BASE}/lib/libXdamage.so

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