Module Name: src
Committed By: mrg
Date: Wed Mar 14 09:09:46 UTC 2018
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include: Makefile
Log Message:
obsolete fontcacheproto.
prepare for xorgproto - split the non replaced list out.
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.196 src/distrib/sets/lists/xcomp/mi:1.197
--- src/distrib/sets/lists/xcomp/mi:1.196 Sun Mar 11 23:49:39 2018
+++ src/distrib/sets/lists/xcomp/mi Wed Mar 14 09:09:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.196 2018/03/11 23:49:39 christos Exp $
+# $NetBSD: mi,v 1.197 2018/03/14 09:09:46 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -407,9 +407,9 @@
./usr/X11R7/include/X11/extensions/dri3proto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/evieproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/extutil.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/fontcache.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/fontcacheP.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/fontcachstr.h -unknown- xorg
+./usr/X11R7/include/X11/extensions/fontcache.h -unknown- obsolete
+./usr/X11R7/include/X11/extensions/fontcacheP.h -unknown- obsolete
+./usr/X11R7/include/X11/extensions/fontcachstr.h -unknown- obsolete
./usr/X11R7/include/X11/extensions/ge.h -unknown- xorg
./usr/X11R7/include/X11/extensions/geproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/lbx.h -unknown- xorg
@@ -1304,7 +1304,7 @@
./usr/X11R7/lib/pkgconfig/epoxy.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/evieproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fixesproto.pc -unknown- xorg
-./usr/X11R7/lib/pkgconfig/fontcacheproto.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/fontcacheproto.pc -unknown- obsolete
./usr/X11R7/lib/pkgconfig/fontconfig.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fontenc.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fontsproto.pc -unknown- xorg
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.5 src/external/mit/xorg/include/Makefile:1.6
--- src/external/mit/xorg/include/Makefile:1.5 Sun Mar 16 23:25:15 2014
+++ src/external/mit/xorg/include/Makefile Wed Mar 14 09:09:46 2018
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2014/03/16 23:25:15 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/14 09:09:46 mrg Exp $
# *proto packages for xorg
+.if 0
+SUBDIR= xorgproto
+.else
SUBDIR= xproto fontsproto bigreqsproto kbproto xcmiscproto xf86bigfontproto \
fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
- compositeproto damageproto trapproto glproto randrproto fontcacheproto \
+ compositeproto damageproto trapproto glproto randrproto \
xf86driproto xf86vidmodeproto renderproto dri2proto dri3proto \
- presentproto xproxymanagementprotocol xbitmaps xcb-proto .WAIT \
- xtrans
+ presentproto xproxymanagementprotocol
+.endif
+SUBDIR+= xbitmaps xcb-proto .WAIT xtrans
.include <bsd.subdir.mk>
