Mon Mar 21 05:23:39 2016 UTC ()
Install ftttdrv.h, which was apparently overlooked at some point
(probably because it contains little of substance...) PR 50902.


(dholland)
diff -r1.175 -r1.176 src/distrib/sets/lists/xcomp/mi
diff -r1.20 -r1.21 src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs diff -r1.175 -r1.176 src/distrib/sets/lists/xcomp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xcomp/mi 2015/10/13 03:32:28 1.175
+++ src/distrib/sets/lists/xcomp/mi 2016/03/21 05:23:39 1.176
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.175 2015/10/13 03:32:28 mrg Exp $ 1# $NetBSD: mi,v 1.176 2016/03/21 05:23:39 dholland 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
@@ -5773,26 +5773,27 @@ @@ -5773,26 +5773,27 @@
5773./usr/X11R7/include/freetype2/ftmodapi.h -unknown- xorg 5773./usr/X11R7/include/freetype2/ftmodapi.h -unknown- xorg
5774./usr/X11R7/include/freetype2/ftmoderr.h -unknown- xorg 5774./usr/X11R7/include/freetype2/ftmoderr.h -unknown- xorg
5775./usr/X11R7/include/freetype2/ftotval.h -unknown- xorg 5775./usr/X11R7/include/freetype2/ftotval.h -unknown- xorg
5776./usr/X11R7/include/freetype2/ftoutln.h -unknown- xorg 5776./usr/X11R7/include/freetype2/ftoutln.h -unknown- xorg
5777./usr/X11R7/include/freetype2/ftpfr.h -unknown- xorg 5777./usr/X11R7/include/freetype2/ftpfr.h -unknown- xorg
5778./usr/X11R7/include/freetype2/ftrender.h -unknown- xorg 5778./usr/X11R7/include/freetype2/ftrender.h -unknown- xorg
5779./usr/X11R7/include/freetype2/ftsizes.h -unknown- xorg 5779./usr/X11R7/include/freetype2/ftsizes.h -unknown- xorg
5780./usr/X11R7/include/freetype2/ftsnames.h -unknown- xorg 5780./usr/X11R7/include/freetype2/ftsnames.h -unknown- xorg
5781./usr/X11R7/include/freetype2/ftstroke.h -unknown- xorg 5781./usr/X11R7/include/freetype2/ftstroke.h -unknown- xorg
5782./usr/X11R7/include/freetype2/ftsynth.h -unknown- xorg 5782./usr/X11R7/include/freetype2/ftsynth.h -unknown- xorg
5783./usr/X11R7/include/freetype2/ftsystem.h -unknown- xorg 5783./usr/X11R7/include/freetype2/ftsystem.h -unknown- xorg
5784./usr/X11R7/include/freetype2/ftfntfmt.h -unknown- xorg 5784./usr/X11R7/include/freetype2/ftfntfmt.h -unknown- xorg
5785./usr/X11R7/include/freetype2/fttrigon.h -unknown- xorg 5785./usr/X11R7/include/freetype2/fttrigon.h -unknown- xorg
 5786./usr/X11R7/include/freetype2/ftttdrv.h -unknown- xorg
5786./usr/X11R7/include/freetype2/fttypes.h -unknown- xorg 5787./usr/X11R7/include/freetype2/fttypes.h -unknown- xorg
5787./usr/X11R7/include/freetype2/ftwinfnt.h -unknown- xorg 5788./usr/X11R7/include/freetype2/ftwinfnt.h -unknown- xorg
5788./usr/X11R7/include/freetype2/ftxf86.h -unknown- obsolete 5789./usr/X11R7/include/freetype2/ftxf86.h -unknown- obsolete
5789./usr/X11R7/include/freetype2/t1tables.h -unknown- xorg 5790./usr/X11R7/include/freetype2/t1tables.h -unknown- xorg
5790./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg 5791./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg
5791./usr/X11R7/include/freetype2/tttables.h -unknown- xorg 5792./usr/X11R7/include/freetype2/tttables.h -unknown- xorg
5792./usr/X11R7/include/freetype2/tttags.h -unknown- xorg 5793./usr/X11R7/include/freetype2/tttags.h -unknown- xorg
5793./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg 5794./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg
5794./usr/X11R7/include/ft2build.h xcomp-obsolete obsolete 5795./usr/X11R7/include/ft2build.h xcomp-obsolete obsolete
5795./usr/X11R7/include/gbm.h -unknown- xorg 5796./usr/X11R7/include/gbm.h -unknown- xorg
5796./usr/X11R7/include/libdrm/drm.h -unknown- xorg 5797./usr/X11R7/include/libdrm/drm.h -unknown- xorg
5797./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg 5798./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
5798./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg 5799./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
cvs diff -r1.20 -r1.21 src/external/mit/xorg/lib/freetype/freetype/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/freetype/freetype/Makefile 2015/07/20 04:10:40 1.20
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile 2016/03/21 05:23:39 1.21
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.20 2015/07/20 04:10:40 mrg Exp $ 1# $NetBSD: Makefile,v 1.21 2016/03/21 05:23:39 dholland 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 ftfntfmt.h ftgasp.h \ 12 ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
13 ftglyph.h 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 \ 16 ftsystem.h fttrigon.h ftttdrv.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},' \