Wed Mar 14 09:09:46 2018 UTC ()
obsolete fontcacheproto.
prepare for xorgproto - split the non replaced list out.


(mrg)
diff -r1.196 -r1.197 src/distrib/sets/lists/xcomp/mi
diff -r1.5 -r1.6 src/external/mit/xorg/include/Makefile
cvs diff -r1.196 -r1.197 src/distrib/sets/lists/xcomp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xcomp/mi 2018/03/11 23:49:39 1.196
+++ src/distrib/sets/lists/xcomp/mi 2018/03/14 09:09:46 1.197
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.196 2018/03/11 23:49:39 christos Exp $ 1# $NetBSD: mi,v 1.197 2018/03/14 09:09:46 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/X11R7/bin/freetype-config -unknown- xorg 6./usr/X11R7/bin/freetype-config -unknown- xorg
7./usr/X11R7/bin/xft-config -unknown- obsolete 7./usr/X11R7/bin/xft-config -unknown- obsolete
8./usr/X11R7/include/GL/GLwDrawA.h -unknown- xorg 8./usr/X11R7/include/GL/GLwDrawA.h -unknown- xorg
9./usr/X11R7/include/GL/GLwDrawAP.h -unknown- xorg 9./usr/X11R7/include/GL/GLwDrawAP.h -unknown- xorg
10./usr/X11R7/include/GL/GLwMDrawA.h -unknown- xorg 10./usr/X11R7/include/GL/GLwMDrawA.h -unknown- xorg
11./usr/X11R7/include/GL/GLwMDrawAP.h -unknown- xorg 11./usr/X11R7/include/GL/GLwMDrawAP.h -unknown- xorg
12./usr/X11R7/include/GL/gl.h -unknown- xorg 12./usr/X11R7/include/GL/gl.h -unknown- xorg
13./usr/X11R7/include/GL/gl_mangle.h -unknown- xorg 13./usr/X11R7/include/GL/gl_mangle.h -unknown- xorg
14./usr/X11R7/include/GL/glcorearb.h -unknown- xorg 14./usr/X11R7/include/GL/glcorearb.h -unknown- xorg
@@ -397,29 +397,29 @@ @@ -397,29 +397,29 @@
397./usr/X11R7/include/X11/extensions/damageproto.h -unknown- xorg 397./usr/X11R7/include/X11/extensions/damageproto.h -unknown- xorg
398./usr/X11R7/include/X11/extensions/damagewire.h -unknown- xorg 398./usr/X11R7/include/X11/extensions/damagewire.h -unknown- xorg
399./usr/X11R7/include/X11/extensions/dbe.h -unknown- xorg 399./usr/X11R7/include/X11/extensions/dbe.h -unknown- xorg
400./usr/X11R7/include/X11/extensions/dbeproto.h -unknown- xorg 400./usr/X11R7/include/X11/extensions/dbeproto.h -unknown- xorg
401./usr/X11R7/include/X11/extensions/dpms.h -unknown- xorg 401./usr/X11R7/include/X11/extensions/dpms.h -unknown- xorg
402./usr/X11R7/include/X11/extensions/dpmsconst.h -unknown- xorg 402./usr/X11R7/include/X11/extensions/dpmsconst.h -unknown- xorg
403./usr/X11R7/include/X11/extensions/dpmsproto.h -unknown- xorg 403./usr/X11R7/include/X11/extensions/dpmsproto.h -unknown- xorg
404./usr/X11R7/include/X11/extensions/dpmsstr.h -unknown- obsolete 404./usr/X11R7/include/X11/extensions/dpmsstr.h -unknown- obsolete
405./usr/X11R7/include/X11/extensions/dri2proto.h -unknown- xorg 405./usr/X11R7/include/X11/extensions/dri2proto.h -unknown- xorg
406./usr/X11R7/include/X11/extensions/dri2tokens.h -unknown- xorg 406./usr/X11R7/include/X11/extensions/dri2tokens.h -unknown- xorg
407./usr/X11R7/include/X11/extensions/dri3proto.h -unknown- xorg 407./usr/X11R7/include/X11/extensions/dri3proto.h -unknown- xorg
408./usr/X11R7/include/X11/extensions/evieproto.h -unknown- xorg 408./usr/X11R7/include/X11/extensions/evieproto.h -unknown- xorg
409./usr/X11R7/include/X11/extensions/extutil.h -unknown- xorg 409./usr/X11R7/include/X11/extensions/extutil.h -unknown- xorg
410./usr/X11R7/include/X11/extensions/fontcache.h -unknown- xorg 410./usr/X11R7/include/X11/extensions/fontcache.h -unknown- obsolete
411./usr/X11R7/include/X11/extensions/fontcacheP.h -unknown- xorg 411./usr/X11R7/include/X11/extensions/fontcacheP.h -unknown- obsolete
412./usr/X11R7/include/X11/extensions/fontcachstr.h -unknown- xorg 412./usr/X11R7/include/X11/extensions/fontcachstr.h -unknown- obsolete
413./usr/X11R7/include/X11/extensions/ge.h -unknown- xorg 413./usr/X11R7/include/X11/extensions/ge.h -unknown- xorg
414./usr/X11R7/include/X11/extensions/geproto.h -unknown- xorg 414./usr/X11R7/include/X11/extensions/geproto.h -unknown- xorg
415./usr/X11R7/include/X11/extensions/lbx.h -unknown- xorg 415./usr/X11R7/include/X11/extensions/lbx.h -unknown- xorg
416./usr/X11R7/include/X11/extensions/lbxbuf.h -unknown- obsolete 416./usr/X11R7/include/X11/extensions/lbxbuf.h -unknown- obsolete
417./usr/X11R7/include/X11/extensions/lbxbufstr.h -unknown- obsolete 417./usr/X11R7/include/X11/extensions/lbxbufstr.h -unknown- obsolete
418./usr/X11R7/include/X11/extensions/lbxdeltastr.h -unknown- obsolete 418./usr/X11R7/include/X11/extensions/lbxdeltastr.h -unknown- obsolete
419./usr/X11R7/include/X11/extensions/lbximage.h -unknown- obsolete 419./usr/X11R7/include/X11/extensions/lbximage.h -unknown- obsolete
420./usr/X11R7/include/X11/extensions/lbxopts.h -unknown- obsolete 420./usr/X11R7/include/X11/extensions/lbxopts.h -unknown- obsolete
421./usr/X11R7/include/X11/extensions/lbxproto.h -unknown- xorg 421./usr/X11R7/include/X11/extensions/lbxproto.h -unknown- xorg
422./usr/X11R7/include/X11/extensions/lbxstr.h -unknown- obsolete 422./usr/X11R7/include/X11/extensions/lbxstr.h -unknown- obsolete
423./usr/X11R7/include/X11/extensions/lbxzlib.h -unknown- obsolete 423./usr/X11R7/include/X11/extensions/lbxzlib.h -unknown- obsolete
424./usr/X11R7/include/X11/extensions/mitmiscconst.h -unknown- xorg 424./usr/X11R7/include/X11/extensions/mitmiscconst.h -unknown- xorg
425./usr/X11R7/include/X11/extensions/mitmiscproto.h -unknown- xorg 425./usr/X11R7/include/X11/extensions/mitmiscproto.h -unknown- xorg
@@ -1294,27 +1294,27 @@ @@ -1294,27 +1294,27 @@
1294./usr/X11R7/lib/libxkbui.a -unknown- xorg,compatx11file 1294./usr/X11R7/lib/libxkbui.a -unknown- xorg,compatx11file
1295./usr/X11R7/lib/libxkbui_p.a -unknown- profile,xorg,compatx11file 1295./usr/X11R7/lib/libxkbui_p.a -unknown- profile,xorg,compatx11file
1296./usr/X11R7/lib/libxshmfence.a -unknown- xorg,compatx11file 1296./usr/X11R7/lib/libxshmfence.a -unknown- xorg,compatx11file
1297./usr/X11R7/lib/libxshmfence_p.a -unknown- profile,xorg,compatx11file 1297./usr/X11R7/lib/libxshmfence_p.a -unknown- profile,xorg,compatx11file
1298./usr/X11R7/lib/pkgconfig/bigreqsproto.pc -unknown- xorg 1298./usr/X11R7/lib/pkgconfig/bigreqsproto.pc -unknown- xorg
1299./usr/X11R7/lib/pkgconfig/compositeproto.pc -unknown- xorg 1299./usr/X11R7/lib/pkgconfig/compositeproto.pc -unknown- xorg
1300./usr/X11R7/lib/pkgconfig/damageproto.pc -unknown- xorg 1300./usr/X11R7/lib/pkgconfig/damageproto.pc -unknown- xorg
1301./usr/X11R7/lib/pkgconfig/dri.pc -unknown- xorg 1301./usr/X11R7/lib/pkgconfig/dri.pc -unknown- xorg
1302./usr/X11R7/lib/pkgconfig/dri2proto.pc -unknown- xorg 1302./usr/X11R7/lib/pkgconfig/dri2proto.pc -unknown- xorg
1303./usr/X11R7/lib/pkgconfig/dri3proto.pc -unknown- xorg 1303./usr/X11R7/lib/pkgconfig/dri3proto.pc -unknown- xorg
1304./usr/X11R7/lib/pkgconfig/epoxy.pc -unknown- xorg 1304./usr/X11R7/lib/pkgconfig/epoxy.pc -unknown- xorg
1305./usr/X11R7/lib/pkgconfig/evieproto.pc -unknown- xorg 1305./usr/X11R7/lib/pkgconfig/evieproto.pc -unknown- xorg
1306./usr/X11R7/lib/pkgconfig/fixesproto.pc -unknown- xorg 1306./usr/X11R7/lib/pkgconfig/fixesproto.pc -unknown- xorg
1307./usr/X11R7/lib/pkgconfig/fontcacheproto.pc -unknown- xorg 1307./usr/X11R7/lib/pkgconfig/fontcacheproto.pc -unknown- obsolete
1308./usr/X11R7/lib/pkgconfig/fontconfig.pc -unknown- xorg 1308./usr/X11R7/lib/pkgconfig/fontconfig.pc -unknown- xorg
1309./usr/X11R7/lib/pkgconfig/fontenc.pc -unknown- xorg 1309./usr/X11R7/lib/pkgconfig/fontenc.pc -unknown- xorg
1310./usr/X11R7/lib/pkgconfig/fontsproto.pc -unknown- xorg 1310./usr/X11R7/lib/pkgconfig/fontsproto.pc -unknown- xorg
1311./usr/X11R7/lib/pkgconfig/fontutil.pc -unknown- xorg,x11fonts 1311./usr/X11R7/lib/pkgconfig/fontutil.pc -unknown- xorg,x11fonts
1312./usr/X11R7/lib/pkgconfig/freetype2.pc -unknown- xorg 1312./usr/X11R7/lib/pkgconfig/freetype2.pc -unknown- xorg
1313./usr/X11R7/lib/pkgconfig/gbm.pc -unknown- xorg 1313./usr/X11R7/lib/pkgconfig/gbm.pc -unknown- xorg
1314./usr/X11R7/lib/pkgconfig/gl.pc -unknown- xorg 1314./usr/X11R7/lib/pkgconfig/gl.pc -unknown- xorg
1315./usr/X11R7/lib/pkgconfig/glproto.pc -unknown- xorg 1315./usr/X11R7/lib/pkgconfig/glproto.pc -unknown- xorg
1316./usr/X11R7/lib/pkgconfig/glu.pc -unknown- xorg 1316./usr/X11R7/lib/pkgconfig/glu.pc -unknown- xorg
1317./usr/X11R7/lib/pkgconfig/glut.pc -unknown- xorg 1317./usr/X11R7/lib/pkgconfig/glut.pc -unknown- xorg
1318./usr/X11R7/lib/pkgconfig/glw.pc -unknown- xorg 1318./usr/X11R7/lib/pkgconfig/glw.pc -unknown- xorg
1319./usr/X11R7/lib/pkgconfig/ice.pc -unknown- xorg 1319./usr/X11R7/lib/pkgconfig/ice.pc -unknown- xorg
1320./usr/X11R7/lib/pkgconfig/inputproto.pc -unknown- xorg 1320./usr/X11R7/lib/pkgconfig/inputproto.pc -unknown- xorg
cvs diff -r1.5 -r1.6 src/external/mit/xorg/include/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/include/Makefile 2014/03/16 23:25:15 1.5
+++ src/external/mit/xorg/include/Makefile 2018/03/14 09:09:46 1.6
@@ -1,13 +1,17 @@ @@ -1,13 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2014/03/16 23:25:15 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2018/03/14 09:09:46 mrg Exp $
2 2
3# *proto packages for xorg 3# *proto packages for xorg
4 4
 5.if 0
 6SUBDIR= xorgproto
 7.else
5SUBDIR= xproto fontsproto bigreqsproto kbproto xcmiscproto xf86bigfontproto \ 8SUBDIR= xproto fontsproto bigreqsproto kbproto xcmiscproto xf86bigfontproto \
6 fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \ 9 fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
7 resourceproto recordproto videoproto xf86dgaproto xf86miscproto \ 10 resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
8 compositeproto damageproto trapproto glproto randrproto fontcacheproto \ 11 compositeproto damageproto trapproto glproto randrproto \
9 xf86driproto xf86vidmodeproto renderproto dri2proto dri3proto \ 12 xf86driproto xf86vidmodeproto renderproto dri2proto dri3proto \
10 presentproto xproxymanagementprotocol xbitmaps xcb-proto .WAIT \ 13 presentproto xproxymanagementprotocol
11 xtrans 14.endif
 15SUBDIR+= xbitmaps xcb-proto .WAIT xtrans
12 16
13.include <bsd.subdir.mk> 17.include <bsd.subdir.mk>