toolchain/53415: netbsd-7* builds fail on xfree using ports

[martin%NetBSD.org@localhost]

>Number:         53415
>Category:       toolchain
>Synopsis:       netbsd-7* builds fail on xfree using ports
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    toolchain-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 30 07:30:00 +0000 2018
>Originator:     Martin Husemann
>Release:        NetBSD 8.99.21
>Organization:
The NetBSD Foundation, Inc.
>Environment:
System: NetBSD night-owl.duskware.de 8.99.21 NetBSD 8.99.21 (NIGHT-OWL) #602: Tue Jun 26 11:33:55 CEST 2018 martin%night-owl.duskware.de@localhost:/usr/src/sys/arch/amd64/compile/NIGHT-OWL amd64
Architecture: x86_64
Machine: amd64
>Description:

Trying to "build.sh -m alpha release" (or similar for any xfree using port)
of any netbsd-7* branch on 8.0 or -current fails:

dependall ===> x11/tools/mkfontscale
In file included from /home/source/ab/netbsd-7-1/xsrc/xfree/xc/programs/mkfontsc
ale/ident.c:31:0:
/home/source/ab/netbsd-7-1/xsrc/xfree/xc/programs/mkfontscale/ident.c: In functi
on 'getKeyword':
/home/source/ab/netbsd-7-1/xsrc/xfree/xc/programs/mkfontscale/ident.c:222:13: error: request for member 'have' in something not a structure or union
         c = gzgetc(f);
             ^
/home/source/ab/netbsd-7-1/xsrc/xfree/xc/programs/mkfontscale/ident.c:222:13: error: request for member 'have' in something not a structure or union
         c = gzgetc(f);
             ^
/home/source/ab/netbsd-7-1/xsrc/xfree/xc/programs/mkfontscale/ident.c:222:13: error: request for member 'pos' in something not a structure or union
         c = gzgetc(f);
             ^
/home/source/ab/netbsd-7-1/xsrc/xfree/xc/programs/mkfontscale/ident.c:222:13: error: request for member 'next' in something not a structure or union
         c = gzgetc(f);
             ^


There are two problems:

 - the tool build uses base zlib, which is newer than the one included
   in mkfontscale

 - the build cluster has been updated to run NetBSD 8.0 (RC2 for now),
   so this builds are now failing on our releng auto builds

>How-To-Repeat:
s/a

>Fix:
Rearrange includes/build to use the bundled zlib?
Or bring in fixes from Xorg ident.c?