Mon Jul 20 04:10:41 2015 UTC ()
updates for freetype 2.6.


(mrg)
diff -r1.66 -r1.67 src/distrib/sets/lists/xbase/shl.mi
diff -r1.171 -r1.172 src/distrib/sets/lists/xcomp/mi
diff -r1.28 -r1.29 src/distrib/sets/lists/xdebug/shl.mi
diff -r1.2 -r1.3 src/external/mit/xorg/xorg-pkg-ver.mk
diff -r1.15 -r1.16 src/external/mit/xorg/lib/freetype/Makefile
diff -r1.8 -r1.9 src/external/mit/xorg/lib/freetype/shlib_version
diff -r1.19 -r1.20 src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -r1.9 -r1.10 src/external/mit/xorg/tools/fc-cache/Makefile
diff -r1.5 -r1.6 src/external/mit/xorg/tools/mkfontscale/Makefile
cvs diff -r1.66 -r1.67 src/distrib/sets/lists/xbase/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xbase/shl.mi 2015/07/20 03:14:12 1.66
+++ src/distrib/sets/lists/xbase/shl.mi 2015/07/20 04:10:40 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.66 2015/07/20 03:14:12 mrg Exp $ 1# $NetBSD: shl.mi,v 1.67 2015/07/20 04:10:40 mrg Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -unknown- x11 5./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 -unknown- x11
6./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- x11 6./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- x11
7./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- x11 7./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- x11
8./usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 -unknown- x11 8./usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 -unknown- x11
9./usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2 -unknown- x11 9./usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2 -unknown- x11
10./usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- x11 10./usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- x11
11./usr/X11R6/lib/libFS.so -unknown- x11 11./usr/X11R6/lib/libFS.so -unknown- x11
12./usr/X11R6/lib/libFS.so.6 -unknown- x11 12./usr/X11R6/lib/libFS.so.6 -unknown- x11
13./usr/X11R6/lib/libFS.so.6.0 -unknown- x11 13./usr/X11R6/lib/libFS.so.6.0 -unknown- x11
14./usr/X11R6/lib/libGL.so -unknown- x11 14./usr/X11R6/lib/libGL.so -unknown- x11
@@ -312,28 +312,28 @@ @@ -312,28 +312,28 @@
312./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg,compatx11file 312./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg,compatx11file
313./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg,compatx11file 313./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg,compatx11file
314./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg,compatx11file 314./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg,compatx11file
315./usr/X11R7/lib/libexpat.so -obsolete- obsolete 315./usr/X11R7/lib/libexpat.so -obsolete- obsolete
316./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete 316./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete
317./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete 317./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
318./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatx11file 318./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatx11file
319./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file 319./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file
320./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg,compatx11file 320./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg,compatx11file
321./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file 321./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file
322./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file 322./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file
323./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file 323./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
324./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file 324./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file
325./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg,compatx11file 325./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file
326./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg,compatx11file 326./usr/X11R7/lib/libfreetype.so.18.0.12 -unknown- xorg,compatx11file
327./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file 327./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file
328./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file 328./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file
329./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file 329./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file
330./usr/X11R7/lib/libglut.so -unknown- xorg,compatx11file 330./usr/X11R7/lib/libglut.so -unknown- xorg,compatx11file
331./usr/X11R7/lib/libglut.so.4 -unknown- xorg,compatx11file 331./usr/X11R7/lib/libglut.so.4 -unknown- xorg,compatx11file
332./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg,compatx11file 332./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg,compatx11file
333./usr/X11R7/lib/liblbxutil.so -obsolete obsolete 333./usr/X11R7/lib/liblbxutil.so -obsolete obsolete
334./usr/X11R7/lib/liblbxutil.so.2 -obsolete obsolete 334./usr/X11R7/lib/liblbxutil.so.2 -obsolete obsolete
335./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete 335./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete
336./usr/X11R7/lib/libpciaccess.so -unknown- xorg,compatx11file 336./usr/X11R7/lib/libpciaccess.so -unknown- xorg,compatx11file
337./usr/X11R7/lib/libpciaccess.so.0 -unknown- xorg,compatx11file 337./usr/X11R7/lib/libpciaccess.so.0 -unknown- xorg,compatx11file
338./usr/X11R7/lib/libpciaccess.so.0.3 -unknown- xorg,compatx11file 338./usr/X11R7/lib/libpciaccess.so.0.3 -unknown- xorg,compatx11file
339./usr/X11R7/lib/libpixman-1.so -unknown- xorg,compatx11file 339./usr/X11R7/lib/libpixman-1.so -unknown- xorg,compatx11file
cvs diff -r1.171 -r1.172 src/distrib/sets/lists/xcomp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xcomp/mi 2015/07/11 22:20:20 1.171
+++ src/distrib/sets/lists/xcomp/mi 2015/07/20 04:10:41 1.172
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.171 2015/07/11 22:20:20 christos Exp $ 1# $NetBSD: mi,v 1.172 2015/07/20 04:10:41 mrg Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.xcomp xcomp-sys-root 5./etc/mtree/set.xcomp xcomp-sys-root
6./usr/X11R6/bin/bdftruncate.pl xcomp-obsolete obsolete 6./usr/X11R6/bin/bdftruncate.pl xcomp-obsolete obsolete
7./usr/X11R6/bin/ccmakedep -unknown- x11 7./usr/X11R6/bin/ccmakedep -unknown- x11
8./usr/X11R6/bin/cleanlinks -unknown- x11 8./usr/X11R6/bin/cleanlinks -unknown- x11
9./usr/X11R6/bin/freetype-config -unknown- x11 9./usr/X11R6/bin/freetype-config -unknown- x11
10./usr/X11R6/bin/gccmakedep -unknown- x11 10./usr/X11R6/bin/gccmakedep -unknown- x11
11./usr/X11R6/bin/imake -unknown- x11 11./usr/X11R6/bin/imake -unknown- x11
12./usr/X11R6/bin/lndir -unknown- x11 12./usr/X11R6/bin/lndir -unknown- x11
13./usr/X11R6/bin/makedepend -unknown- x11 13./usr/X11R6/bin/makedepend -unknown- x11
14./usr/X11R6/bin/makeg -unknown- x11 14./usr/X11R6/bin/makeg -unknown- x11
@@ -5770,30 +5770,31 @@ @@ -5770,30 +5770,31 @@
5770./usr/X11R7/include/freetype2/ftmac.h -unknown- xorg 5770./usr/X11R7/include/freetype2/ftmac.h -unknown- xorg
5771./usr/X11R7/include/freetype2/ftmm.h -unknown- xorg 5771./usr/X11R7/include/freetype2/ftmm.h -unknown- xorg
5772./usr/X11R7/include/freetype2/ftmodapi.h -unknown- xorg 5772./usr/X11R7/include/freetype2/ftmodapi.h -unknown- xorg
5773./usr/X11R7/include/freetype2/ftmoderr.h -unknown- xorg 5773./usr/X11R7/include/freetype2/ftmoderr.h -unknown- xorg
5774./usr/X11R7/include/freetype2/ftotval.h -unknown- xorg 5774./usr/X11R7/include/freetype2/ftotval.h -unknown- xorg
5775./usr/X11R7/include/freetype2/ftoutln.h -unknown- xorg 5775./usr/X11R7/include/freetype2/ftoutln.h -unknown- xorg
5776./usr/X11R7/include/freetype2/ftpfr.h -unknown- xorg 5776./usr/X11R7/include/freetype2/ftpfr.h -unknown- xorg
5777./usr/X11R7/include/freetype2/ftrender.h -unknown- xorg 5777./usr/X11R7/include/freetype2/ftrender.h -unknown- xorg
5778./usr/X11R7/include/freetype2/ftsizes.h -unknown- xorg 5778./usr/X11R7/include/freetype2/ftsizes.h -unknown- xorg
5779./usr/X11R7/include/freetype2/ftsnames.h -unknown- xorg 5779./usr/X11R7/include/freetype2/ftsnames.h -unknown- xorg
5780./usr/X11R7/include/freetype2/ftstroke.h -unknown- xorg 5780./usr/X11R7/include/freetype2/ftstroke.h -unknown- xorg
5781./usr/X11R7/include/freetype2/ftsynth.h -unknown- xorg 5781./usr/X11R7/include/freetype2/ftsynth.h -unknown- xorg
5782./usr/X11R7/include/freetype2/ftsystem.h -unknown- xorg 5782./usr/X11R7/include/freetype2/ftsystem.h -unknown- xorg
 5783./usr/X11R7/include/freetype2/ftfntfmt.h -unknown- xorg
5783./usr/X11R7/include/freetype2/fttrigon.h -unknown- xorg 5784./usr/X11R7/include/freetype2/fttrigon.h -unknown- xorg
5784./usr/X11R7/include/freetype2/fttypes.h -unknown- xorg 5785./usr/X11R7/include/freetype2/fttypes.h -unknown- xorg
5785./usr/X11R7/include/freetype2/ftwinfnt.h -unknown- xorg 5786./usr/X11R7/include/freetype2/ftwinfnt.h -unknown- xorg
5786./usr/X11R7/include/freetype2/ftxf86.h -unknown- xorg 5787./usr/X11R7/include/freetype2/ftxf86.h -unknown- obsolete
5787./usr/X11R7/include/freetype2/t1tables.h -unknown- xorg 5788./usr/X11R7/include/freetype2/t1tables.h -unknown- xorg
5788./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg 5789./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg
5789./usr/X11R7/include/freetype2/tttables.h -unknown- xorg 5790./usr/X11R7/include/freetype2/tttables.h -unknown- xorg
5790./usr/X11R7/include/freetype2/tttags.h -unknown- xorg 5791./usr/X11R7/include/freetype2/tttags.h -unknown- xorg
5791./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg 5792./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg
5792./usr/X11R7/include/ft2build.h xcomp-obsolete obsolete 5793./usr/X11R7/include/ft2build.h xcomp-obsolete obsolete
5793./usr/X11R7/include/gbm.h -unknown- xorg 5794./usr/X11R7/include/gbm.h -unknown- xorg
5794./usr/X11R7/include/libdrm/drm.h -unknown- xorg 5795./usr/X11R7/include/libdrm/drm.h -unknown- xorg
5795./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg 5796./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
5796./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg 5797./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
5797./usr/X11R7/include/libdrm/drm_sarea.h -unknown- xorg 5798./usr/X11R7/include/libdrm/drm_sarea.h -unknown- xorg
5798./usr/X11R7/include/libdrm/i915_drm.h -unknown- xorg 5799./usr/X11R7/include/libdrm/i915_drm.h -unknown- xorg
5799./usr/X11R7/include/libdrm/intel_aub.h -unknown- xorg 5800./usr/X11R7/include/libdrm/intel_aub.h -unknown- xorg
cvs diff -r1.28 -r1.29 src/distrib/sets/lists/xdebug/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xdebug/shl.mi 2015/07/20 03:14:12 1.28
+++ src/distrib/sets/lists/xdebug/shl.mi 2015/07/20 04:10:41 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.28 2015/07/20 03:14:12 mrg Exp $ 1# $NetBSD: shl.mi,v 1.29 2015/07/20 04:10:41 mrg Exp $
2./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug 2./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
3./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug 3./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
4./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug 4./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
5./usr/libdata/debug/usr/X11R6/lib/libGLw.so.1.0.debug -unknown- x11,debug 5./usr/libdata/debug/usr/X11R6/lib/libGLw.so.1.0.debug -unknown- x11,debug
6./usr/libdata/debug/usr/X11R6/lib/libICE.so.6.3.debug -unknown- x11,debug 6./usr/libdata/debug/usr/X11R6/lib/libICE.so.6.3.debug -unknown- x11,debug
7./usr/libdata/debug/usr/X11R6/lib/libOSMesa.so.4.0.debug -unknown- x11,debug 7./usr/libdata/debug/usr/X11R6/lib/libOSMesa.so.4.0.debug -unknown- x11,debug
8./usr/libdata/debug/usr/X11R6/lib/libSM.so.6.0.debug -unknown- x11,debug 8./usr/libdata/debug/usr/X11R6/lib/libSM.so.6.0.debug -unknown- x11,debug
9./usr/libdata/debug/usr/X11R6/lib/libX11.so.6.2.debug -unknown- x11,debug 9./usr/libdata/debug/usr/X11R6/lib/libX11.so.6.2.debug -unknown- x11,debug
10./usr/libdata/debug/usr/X11R6/lib/libXRes.so.1.0.debug -unknown- x11,debug 10./usr/libdata/debug/usr/X11R6/lib/libXRes.so.1.0.debug -unknown- x11,debug
11./usr/libdata/debug/usr/X11R6/lib/libXTrap.so.6.4.debug -unknown- x11,debug 11./usr/libdata/debug/usr/X11R6/lib/libXTrap.so.6.4.debug -unknown- x11,debug
12./usr/libdata/debug/usr/X11R6/lib/libXau.so.6.0.debug -unknown- x11,debug 12./usr/libdata/debug/usr/X11R6/lib/libXau.so.6.0.debug -unknown- x11,debug
13./usr/libdata/debug/usr/X11R6/lib/libXaw.so.6.1.debug -unknown- x11,debug 13./usr/libdata/debug/usr/X11R6/lib/libXaw.so.6.1.debug -unknown- x11,debug
14./usr/libdata/debug/usr/X11R6/lib/libXaw.so.7.0.debug -unknown- x11,debug 14./usr/libdata/debug/usr/X11R6/lib/libXaw.so.7.0.debug -unknown- x11,debug
@@ -95,27 +95,27 @@ @@ -95,27 +95,27 @@
95./usr/libdata/debug/usr/X11R7/lib/libXt.so.7.0.debug -unknown- xorg,debug,compatx11file 95./usr/libdata/debug/usr/X11R7/lib/libXt.so.7.0.debug -unknown- xorg,debug,compatx11file
96./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug,compatx11file 96./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug,compatx11file
97./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug,compatx11file 97./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug,compatx11file
98./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug,compatx11file 98./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug,compatx11file
99./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug,compatx11file 99./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug,compatx11file
100./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug,compatx11file 100./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug,compatx11file
101./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug,compatx11file 101./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug,compatx11file
102./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatx11file 102./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatx11file
103./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.3.debug -unknown- xorg,debug,compatx11file 103./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.3.debug -unknown- xorg,debug,compatx11file
104./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file 104./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file
105./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file 105./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
106./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file 106./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file
107./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file 107./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
108./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug,compatx11file 108./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.12.debug -unknown- xorg,debug,compatx11file
109./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug,compatx11file 109./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug,compatx11file
110./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file 110./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
111./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file 111./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file
112./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug,compatx11file 112./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug,compatx11file
113./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug,compatx11file 113./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug,compatx11file
114./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug,compatx11file 114./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug,compatx11file
115./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug,compatx11file 115./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug,compatx11file
116./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug,compatx11file 116./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug,compatx11file
117./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug,compatx11file 117./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug,compatx11file
118./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug,compatx11file 118./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug,compatx11file
119./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug,compatx11file 119./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug,compatx11file
120./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug,compatx11file 120./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug,compatx11file
121./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug,compatx11file 121./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug,compatx11file
cvs diff -r1.2 -r1.3 src/external/mit/xorg/xorg-pkg-ver.mk (expand / switch to unified diff)

--- src/external/mit/xorg/xorg-pkg-ver.mk 2015/07/20 02:07:36 1.2
+++ src/external/mit/xorg/xorg-pkg-ver.mk 2015/07/20 04:10:40 1.3
@@ -1,20 +1,24 @@ @@ -1,20 +1,24 @@
1# $NetBSD: xorg-pkg-ver.mk,v 1.2 2015/07/20 02:07:36 mrg Exp $ 1# $NetBSD: xorg-pkg-ver.mk,v 1.3 2015/07/20 04:10:40 mrg Exp $
2 2
3# when including this make sure PROG is set so that $X11SRCDIR.$PROG 3# when including this make sure PROG is set so that $X11SRCDIR.$PROG
4# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong. 4# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong.
 5# set XORG_PKG_VER_CONFIG_PATH if "configure" at the top-level is wrong.
5 6
6XORG_PKG_VER_PROG?= ${PROG} 7XORG_PKG_VER_PROG?= ${PROG}
7 8
 9XORG_PKG_VER_CONFIG_PATH?= configure
 10_XORG_PKG_CONFIGURE_PATH= ${X11SRCDIR.${XORG_PKG_VER_PROG}}/${XORG_PKG_VER_CONFIG_PATH}
 11
8.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure) 12.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
9XORG_PKG_PACKAGE_VERSION!= \ 13XORG_PKG_PACKAGE_VERSION!= \
10 awk -F= '/^PACKAGE_VERSION=/ { \ 14 awk -F= '/^PACKAGE_VERSION=/ { \
11 match($$2, "([0-9]+\\.)+[0-9]+"); \ 15 match($$2, "([0-9]+\\.)+[0-9]+"); \
12 version = substr($$2, RSTART, RLENGTH); \ 16 version = substr($$2, RSTART, RLENGTH); \
13 print version; \ 17 print version; \
14 exit 0; \ 18 exit 0; \
15 }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure 19 }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
16.if !empty(XORG_PKG_PACKAGE_VERSION) 20.if !empty(XORG_PKG_PACKAGE_VERSION)
17CPPFLAGS+= -DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\" 21CPPFLAGS+= -DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
18.endif 22.endif
19 23
20XORG_PKG_PACKAGE_STRING!= \ 24XORG_PKG_PACKAGE_STRING!= \
cvs diff -r1.15 -r1.16 src/external/mit/xorg/lib/freetype/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/freetype/Makefile 2015/03/12 07:58:04 1.15
+++ src/external/mit/xorg/lib/freetype/Makefile 2015/07/20 04:10:40 1.16
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.15 2015/03/12 07:58:04 snj Exp $ 1# $NetBSD: Makefile,v 1.16 2015/07/20 04:10:40 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= freetype 5LIB= freetype
6 6
7FREETYPE= ${X11SRCDIR.${LIB}} 7FREETYPE= ${X11SRCDIR.${LIB}}
8 8
9SUBDIR= freetype 9SUBDIR= freetype
10 10
11.PATH: ${FREETYPE}/src/base 11.PATH: ${FREETYPE}/src/base
12SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c ftglyph.c \ 12SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c ftfstype.c \
13 ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \ 13 ftglyph.c ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
14 ftsystem.c fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c ftcid.c \ 14 ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c ftcid.c \
15 ftgasp.c ftgxval.c ftotval.c ftpatent.c ftpfr.c 15 ftgasp.c ftgxval.c ftotval.c ftpatent.c ftpfr.c
16 16
17.PATH: ${FREETYPE}/src/autofit 17.PATH: ${FREETYPE}/src/autofit
18SRCS+= autofit.c 18SRCS+= autofit.c
19 19
20#.PATH: ${FREETYPE}/src/autohint 20#.PATH: ${FREETYPE}/src/autohint
21#SRCS+= autohint.c 21#SRCS+= autohint.c
22 22
23.PATH: ${FREETYPE}/src/bdf 23.PATH: ${FREETYPE}/src/bdf
24SRCS+= bdf.c 24SRCS+= bdf.c
25 25
26.PATH: ${FREETYPE}/src/cache 26.PATH: ${FREETYPE}/src/cache
27SRCS+= ftcache.c 27SRCS+= ftcache.c
@@ -86,18 +86,18 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free @@ -86,18 +86,18 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
86 -I${DESTDIR}${X11INCDIR}/freetype2/config \ 86 -I${DESTDIR}${X11INCDIR}/freetype2/config \
87 -I${X11SRCDIR.${LIB}}/include 87 -I${X11SRCDIR.${LIB}}/include
88 88
89.if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != "no" 89.if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != "no"
90CPPFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING 90CPPFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
91.endif 91.endif
92 92
93LIBDPLIBS= \ 93LIBDPLIBS= \
94 z ${.CURDIR}/../../../../../lib/libz \ 94 z ${.CURDIR}/../../../../../lib/libz \
95 bz2 ${.CURDIR}/../../../../../lib/libbz2 95 bz2 ${.CURDIR}/../../../../../lib/libbz2
96 96
97PKGCONFIG= freetype2 97PKGCONFIG= freetype2
98PKGDIST.freetype2= ${.CURDIR} 98PKGDIST.freetype2= ${.CURDIR}
99PKGCONFIG_VERSION.freetype2= 17.4.11 99PKGCONFIG_VERSION.freetype2= ${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
100 100
101.include <bsd.x11.mk> 101.include <bsd.x11.mk>
102.include <bsd.lib.mk> 102.include <bsd.lib.mk>
103.include <bsd.subdir.mk> 103.include <bsd.subdir.mk>
cvs diff -r1.8 -r1.9 src/external/mit/xorg/lib/freetype/shlib_version (expand / switch to unified diff)

--- src/external/mit/xorg/lib/freetype/shlib_version 2015/03/12 07:58:04 1.8
+++ src/external/mit/xorg/lib/freetype/shlib_version 2015/07/20 04:10:40 1.9
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: shlib_version,v 1.8 2015/03/12 07:58:04 snj Exp $ 1# $NetBSD: shlib_version,v 1.9 2015/07/20 04:10:40 mrg Exp $
2# 2#
3major=17 3# try to keep this in sync with builds/unix/configure.ac:version_info=
4minor=4 4major=18
5teeny=11 5minor=0
 6teeny=12
cvs diff -r1.19 -r1.20 src/external/mit/xorg/lib/freetype/freetype/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/freetype/freetype/Makefile 2015/03/12 08:01:45 1.19
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile 2015/07/20 04:10:40 1.20
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.19 2015/03/12 08:01:45 snj Exp $ 1# $NetBSD: Makefile,v 1.20 2015/07/20 04:10:40 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5SUBDIR= config 5SUBDIR= config
6 6
7.PATH: ${X11SRCDIR.freetype}/include 7.PATH: ${X11SRCDIR.freetype}/include
8 8
9INCSDIR=${X11INCDIR}/freetype2 9INCSDIR=${X11INCDIR}/freetype2
10 10
11INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \ 11INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
12 ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h \ 12 ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
13 ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \ 13 ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
14 ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \ 14 ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
15 ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \ 15 ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
16 ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \ 16 ftsystem.h fttrigon.h fttypes.h ftwinfnt.h \
17 t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \ 17 t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
18 ftautoh.h ftcffdrv.h ft2build.h 18 ftautoh.h ftcffdrv.h ft2build.h
19 19
20SCRIPTS= freetype-config 20SCRIPTS= freetype-config
21 21
22CLEANFILES+= ${SCRIPTS} 22CLEANFILES+= ${SCRIPTS}
23 23
24FT_VERSION!= sed -n '/^version_info=/{s/version_info=.\([0-9]*\):\([0-9]*\):\([0-9]*\)./\1.\2.\3/;p;q;}' < ${X11SRCDIR.freetype}/builds/unix/configure.ac 24FT_VERSION!= sed -n '/^version_info=/{s/version_info=.\([0-9]*\):\([0-9]*\):\([0-9]*\)./\1.\2.\3/;p;q;}' < ${X11SRCDIR.freetype}/builds/unix/configure.ac
25 25
26# XXX hijack config-subst from Xft 26# XXX hijack config-subst from Xft
27CONFIG_SUBST= ${TOOL_SED} \ 27CONFIG_SUBST= ${TOOL_SED} \
28 -e 's,%prefix%,${X11ROOTDIR},' \ 28 -e 's,%prefix%,${X11ROOTDIR},' \
29 -e 's,%exec_prefix%,${X11BINDIR},' \ 29 -e 's,%exec_prefix%,${X11BINDIR},' \
cvs diff -r1.9 -r1.10 src/external/mit/xorg/tools/fc-cache/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/tools/fc-cache/Makefile 2014/03/20 08:05:30 1.9
+++ src/external/mit/xorg/tools/fc-cache/Makefile 2015/07/20 04:10:40 1.10
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.9 2014/03/20 08:05:30 mrg Exp $ 1# $NetBSD: Makefile,v 1.10 2015/07/20 04:10:40 mrg Exp $
2 2
3NOMAN= 1 3NOMAN= 1
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7HOSTPROG= fc-cache 7HOSTPROG= fc-cache
8 8
9FONTCONFIG= ${X11SRCDIR.fontconfig} 9FONTCONFIG= ${X11SRCDIR.fontconfig}
10FREETYPE= ${X11SRCDIR.freetype} 10FREETYPE= ${X11SRCDIR.freetype}
11EXPAT= ${NETBSDSRCDIR}/external/mit/expat/dist 11EXPAT= ${NETBSDSRCDIR}/external/mit/expat/dist
12 12
13.PATH: ${FONTCONFIG}/fc-cache 13.PATH: ${FONTCONFIG}/fc-cache
14SRCS.fc-cache= fc-cache.c 14SRCS.fc-cache= fc-cache.c
15 15
16.PATH: ${FONTCONFIG}/src 16.PATH: ${FONTCONFIG}/src
17SRCS.fontconfig= fcatomic.c fcblanks.c fccache.c fccfg.c \ 17SRCS.fontconfig= fcatomic.c fcblanks.c fccache.c fccfg.c \
18 fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \ 18 fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \
19 fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \ 19 fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \
20 fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \ 20 fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \
21 fcpat.c fcserialize.c fcstat.c fcstr.c fcxml.c \ 21 fcpat.c fcserialize.c fcstat.c fcstr.c fcxml.c \
22 ftglue.c 22 ftglue.c
23 23
24.PATH: ${FREETYPE}/src/base 24.PATH: ${FREETYPE}/src/base
25SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \ 25SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c \
26 ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c ftsystem.c \ 26 ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
27 fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c 27 ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
28 28
29.PATH: ${FREETYPE}/src/autofit 29.PATH: ${FREETYPE}/src/autofit
30SRCS.freetype+= autofit.c 30SRCS.freetype+= autofit.c
31 31
32.PATH: ${FREETYPE}/src/bdf 32.PATH: ${FREETYPE}/src/bdf
33SRCS.freetype+= bdf.c 33SRCS.freetype+= bdf.c
34 34
35.PATH: ${FREETYPE}/src/cff 35.PATH: ${FREETYPE}/src/cff
36SRCS.freetype+= cff.c 36SRCS.freetype+= cff.c
37 37
38.PATH: ${FREETYPE}/src/cid 38.PATH: ${FREETYPE}/src/cid
39SRCS.freetype+= type1cid.c 39SRCS.freetype+= type1cid.c
40 40
cvs diff -r1.5 -r1.6 src/external/mit/xorg/tools/mkfontscale/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/tools/mkfontscale/Makefile 2015/07/17 06:40:49 1.5
+++ src/external/mit/xorg/tools/mkfontscale/Makefile 2015/07/20 04:10:40 1.6
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.5 2015/07/17 06:40:49 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2015/07/20 04:10:40 mrg Exp $
2 2
3NOMAN= 1 3NOMAN= 1
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7HOSTPROG= mkfontscale 7HOSTPROG= mkfontscale
8 8
9FREETYPE= ${X11SRCDIR.freetype} 9FREETYPE= ${X11SRCDIR.freetype}
10 10
11.PATH: ${X11SRCDIR.${HOSTPROG}} 11.PATH: ${X11SRCDIR.${HOSTPROG}}
12SRCS.mkfontscale= mkfontscale.c list.c hash.c ident.c 12SRCS.mkfontscale= mkfontscale.c list.c hash.c ident.c
13 13
14.PATH: ${FREETYPE}/src/base 14.PATH: ${FREETYPE}/src/base
15SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \ 15SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c \
16 ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c ftsystem.c \ 16 ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
17 fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c 17 ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
18 18
19.PATH: ${FREETYPE}/src/autofit 19.PATH: ${FREETYPE}/src/autofit
20SRCS.freetype+= autofit.c 20SRCS.freetype+= autofit.c
21 21
22.PATH: ${FREETYPE}/src/bdf 22.PATH: ${FREETYPE}/src/bdf
23SRCS.freetype+= bdf.c 23SRCS.freetype+= bdf.c
24 24
25.PATH: ${FREETYPE}/src/cff 25.PATH: ${FREETYPE}/src/cff
26SRCS.freetype+= cff.c 26SRCS.freetype+= cff.c
27 27
28.PATH: ${FREETYPE}/src/cid 28.PATH: ${FREETYPE}/src/cid
29SRCS.freetype+= type1cid.c 29SRCS.freetype+= type1cid.c
30 30