Downgrading to netbsd zlib version

Change-Id: I83cf73d8357ea34ab5e49fe15bd4c45ce54cac01

sys/arch/i386/stand/boot/Makefile.boot

@@ -36,9 +36,6 @@ BINMODE=444
 LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start
 CPPFLAGS+= -I ${.CURDIR}/..  -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
 CPPFLAGS+= -I ${.OBJDIR}
-.if defined(__MINIX)
-CPPFLAGS+=-isystem ${DESTDIR}/usr/include
-.endif # defined(__MINIX)
 # Make sure we override any optimization options specified by the user
 COPTS=  -Os
 
@@ -172,8 +169,4 @@ ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/../Makefile.boot
 		-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} $$bb ${LIBLIST}
 	${OBJCOPY} -O binary ${PROG}.syms ${PROG}
 
-.ifndef	__MINIX
 .include <bsd.prog.mk>
-.else
-.include <minix.service.mk>
-.endif

sys/arch/i386/stand/bootxx/Makefile.bootxx

@@ -115,7 +115,6 @@ SA_AS= library
 SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 .if defined(__MINIX)
 SAMISCMAKEFLAGS+="SA_INCLUDE_NET=no"
-CPPFLAGS+= -isystem ${DESTDIR}/usr/include
 AFLAGS+=       -Wa,--divide
 .endif
 .include "${S}/lib/libsa/Makefile.inc"
@@ -159,8 +158,4 @@ ${PROG}: ${OBJS} ${LIBLIST}
 		echo "${PROG} size $$sz, $$((${BOOTXX_MAXSIZE} - $$sz)) free"; \
 	fi
 
-.ifndef __MINIX
 .include <bsd.prog.mk>
-.else
-.include <minix.service.mk>
-.endif

sys/arch/i386/stand/mbr/Makefile.mbr

@@ -29,6 +29,12 @@ CPPFLAGS+=	-I. -I${.CURDIR}/../../lib -I${S}
 .if defined(__MINIX)
 CPPFLAGS+= -DLOADADDR=${LOADADDR}
 AFLAGS+=       -Wa,--divide
+
+BUILDSYMLINKS+= \
+	${NETBSDSRCDIR}/include/arch/i386/include/stackframe.h machine/stackframe.h \
+	${NETBSDSRCDIR}/include/arch/i386/include/fpu.h machine/fpu.h
+
+DPSRCS+= machine/stackframe.h  machine/fpu.h
 .endif
 
 .if ${MACHINE_ARCH} == "x86_64"