Wed Jun 6 03:09:12 2018 UTC ()
belatedly bump the shlib version for freetype-2.9.1, using the scheme
outlined in src/external/mit/xorg/lib/freetype/shlib_version.


(snj)
diff -r1.81 -r1.82 src/distrib/sets/lists/xbase/shl.mi
diff -r1.43 -r1.44 src/distrib/sets/lists/xdebug/shl.mi
diff -r1.11 -r1.12 src/external/mit/xorg/lib/freetype/shlib_version
cvs diff -r1.81 -r1.82 src/distrib/sets/lists/xbase/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xbase/shl.mi 2018/03/11 09:43:39 1.81
+++ src/distrib/sets/lists/xbase/shl.mi 2018/06/06 03:09:12 1.82
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.81 2018/03/11 09:43:39 mrg Exp $ 1# $NetBSD: shl.mi,v 1.82 2018/06/06 03:09:12 snj 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/X11R7/lib/X11/locale/lib/common/ximcp.so -unknown- xorg 5./usr/X11R7/lib/X11/locale/lib/common/ximcp.so -unknown- xorg
6./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 -unknown- xorg 6./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 -unknown- xorg
7./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 -unknown- xorg 7./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 -unknown- xorg
8./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so -unknown- xorg 8./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so -unknown- xorg
9./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- xorg 9./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2 -unknown- xorg
10./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0 -unknown- xorg 10./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0 -unknown- xorg
11./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so -unknown- xorg 11./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so -unknown- xorg
12./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- xorg 12./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -unknown- xorg
13./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0 -unknown- xorg 13./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0 -unknown- xorg
14./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so -unknown- xorg 14./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so -unknown- xorg
@@ -171,27 +171,27 @@ @@ -171,27 +171,27 @@
171./usr/X11R7/lib/libepoxy.so.0 -unknown- xorg,compatx11file 171./usr/X11R7/lib/libepoxy.so.0 -unknown- xorg,compatx11file
172./usr/X11R7/lib/libepoxy.so.0.0 -unknown- xorg,compatx11file 172./usr/X11R7/lib/libepoxy.so.0.0 -unknown- xorg,compatx11file
173./usr/X11R7/lib/libexpat.so -obsolete- obsolete 173./usr/X11R7/lib/libexpat.so -obsolete- obsolete
174./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete 174./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete
175./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete 175./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
176./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatx11file 176./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatx11file
177./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file 177./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file
178./usr/X11R7/lib/libfontconfig.so.2.3 -unknown- xorg,compatx11file 178./usr/X11R7/lib/libfontconfig.so.2.3 -unknown- xorg,compatx11file
179./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file 179./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file
180./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file 180./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file
181./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file 181./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
182./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file 182./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file
183./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file 183./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file
184./usr/X11R7/lib/libfreetype.so.18.0.13 -unknown- xorg,compatx11file 184./usr/X11R7/lib/libfreetype.so.18.16.1 -unknown- xorg,compatx11file
185./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file 185./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file
186./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file 186./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file
187./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file 187./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file
188./usr/X11R7/lib/libglapi.so -unknown- xorg,compatx11file 188./usr/X11R7/lib/libglapi.so -unknown- xorg,compatx11file
189./usr/X11R7/lib/libglapi.so.1 -unknown- xorg,compatx11file 189./usr/X11R7/lib/libglapi.so.1 -unknown- xorg,compatx11file
190./usr/X11R7/lib/libglapi.so.1.0 -unknown- xorg,compatx11file 190./usr/X11R7/lib/libglapi.so.1.0 -unknown- xorg,compatx11file
191./usr/X11R7/lib/libglut.so -unknown- xorg,compatx11file 191./usr/X11R7/lib/libglut.so -unknown- xorg,compatx11file
192./usr/X11R7/lib/libglut.so.4 -unknown- xorg,compatx11file 192./usr/X11R7/lib/libglut.so.4 -unknown- xorg,compatx11file
193./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg,compatx11file 193./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg,compatx11file
194./usr/X11R7/lib/liblbxutil.so -unknown- obsolete 194./usr/X11R7/lib/liblbxutil.so -unknown- obsolete
195./usr/X11R7/lib/liblbxutil.so.2 -unknown- obsolete 195./usr/X11R7/lib/liblbxutil.so.2 -unknown- obsolete
196./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete 196./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete
197./usr/X11R7/lib/libpciaccess.so -unknown- xorg,compatx11file 197./usr/X11R7/lib/libpciaccess.so -unknown- xorg,compatx11file
cvs diff -r1.43 -r1.44 src/distrib/sets/lists/xdebug/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xdebug/shl.mi 2018/03/11 09:43:39 1.43
+++ src/distrib/sets/lists/xdebug/shl.mi 2018/06/06 03:09:12 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.43 2018/03/11 09:43:39 mrg Exp $ 1# $NetBSD: shl.mi,v 1.44 2018/06/06 03:09:12 snj Exp $
2./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir 2./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
3./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete 3./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
4./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete 4./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
5./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcUTF8Load.so.2.0.debug obsolete xorg,obsolete 5./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcUTF8Load.so.2.0.debug obsolete xorg,obsolete
6./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlibi18n.so.2.0.debug obsolete xorg,obsolete 6./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlibi18n.so.2.0.debug obsolete xorg,obsolete
7./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlocale.so.2.0.debug obsolete xorg,obsolete 7./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlocale.so.2.0.debug obsolete xorg,obsolete
8./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxomGeneric.so.2.0.debug obsolete xorg,obsolete 8./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxomGeneric.so.2.0.debug obsolete xorg,obsolete
9./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0.debug -unknown- xorg,debug 9./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0.debug -unknown- xorg,debug
10./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0.debug -unknown- xorg,debug 10./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0.debug -unknown- xorg,debug
11./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0.debug -unknown- xorg,debug 11./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0.debug -unknown- xorg,debug
12./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug -unknown- xorg,debug 12./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug -unknown- xorg,debug
13./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug,obsolete 13./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug,obsolete
14./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug -unknown- xorg,debug 14./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug -unknown- xorg,debug
@@ -51,27 +51,27 @@ @@ -51,27 +51,27 @@
51./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug,compatx11file 51./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug,compatx11file
52./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug,compatx11file 52./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug,compatx11file
53./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug,compatx11file 53./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug,compatx11file
54./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug,compatx11file 54./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug,compatx11file
55./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug,compatx11file 55./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug,compatx11file
56./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug,compatx11file 56./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug,compatx11file
57./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatx11file 57./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatx11file
58./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.4.debug -unknown- xorg,debug,compatx11file 58./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.4.debug -unknown- xorg,debug,compatx11file
59./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file 59./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file
60./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.0.debug -unknown- xorg,debug,compatx11file 60./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.0.debug -unknown- xorg,debug,compatx11file
61./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file 61./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
62./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug -unknown- xorg,debug,compatx11file 62./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug -unknown- xorg,debug,compatx11file
63./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file 63./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
64./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.13.debug -unknown- xorg,debug,compatx11file 64./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.16.1.debug -unknown- xorg,debug,compatx11file
65./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file 65./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
66./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug -unknown- xorg,debug,compatx11file 66./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug -unknown- xorg,debug,compatx11file
67./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file 67./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file
68./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug,compatx11file 68./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug,compatx11file
69./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug,compatx11file 69./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug,compatx11file
70./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug,compatx11file 70./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug,compatx11file
71./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug,compatx11file 71./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug,compatx11file
72./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug,compatx11file 72./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug,compatx11file
73./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug,compatx11file 73./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug,compatx11file
74./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug,compatx11file 74./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug,compatx11file
75./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug,compatx11file 75./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug,compatx11file
76./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug,compatx11file 76./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug,compatx11file
77./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug,compatx11file 77./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug,compatx11file
cvs diff -r1.11 -r1.12 src/external/mit/xorg/lib/freetype/shlib_version (expand / switch to unified diff)

--- src/external/mit/xorg/lib/freetype/shlib_version 2018/05/09 07:01:59 1.11
+++ src/external/mit/xorg/lib/freetype/shlib_version 2018/06/06 03:09:12 1.12
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: shlib_version,v 1.11 2018/05/09 07:01:59 snj Exp $ 1# $NetBSD: shlib_version,v 1.12 2018/06/06 03:09:12 snj Exp $
2# 2#
3# XXX our freetype shlib versioning is insane. the rest of the world 3# XXX our freetype shlib versioning is insane. the rest of the world
4# uses a major of 6. we used to, but it was bumped to 7 for 64 bit 4# uses a major of 6. we used to, but it was bumped to 7 for 64 bit
5# time_t changes. should've stayed there, but it didn't, because of 5# time_t changes. should've stayed there, but it didn't, because of
6# confusion between libtool versioning and shlib versioning. 6# confusion between libtool versioning and shlib versioning.
7# until upstream bumps their major, keep major at 18 and adjust 7# until upstream bumps their major, keep major at 18 and adjust
8# minor/teeny as indicated by xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT 8# minor/teeny as indicated by xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT
9 9
10major=18 10major=18
11minor=0 11minor=16
12teeny=13 12teeny=1