Downgrading to netbsd zlib version

Change-Id: I83cf73d8357ea34ab5e49fe15bd4c45ce54cac01

sys/lib/libsa/Makefile

@@ -22,9 +22,6 @@ CPPFLAGS=	-I${SADIR} ${SACPPFLAGS} ${SAMISCCPPFLAGS} \
 .include <bsd.own.mk>
 
 .PATH.c: ${SADIR} ${.PARSEDIR}/../../../common/lib/libc/string
-.ifdef __MINIX
-.PATH.c: ${SADIR} ${.PARSEDIR}/../../../common/lib/libc/md
-.endif
 
 # stand routines
 SRCS+=	alloc.c errno.c exit.c files.c \
@@ -96,6 +93,7 @@ SRCS+=	xlat_mbr_fstype.c
 
 # NetBSD has it in libkern, MINIX has it in libc but not libminc...
 SRCS+=	md5c.c
+.PATH.c: ${.PARSEDIR}/../../../common/lib/libc/md
 .endif
 
 # only needed during build

sys/lib/libz/Makefile

@@ -3,11 +3,7 @@
 LIB=	z
 LIBISPRIVATE=	yes
 
-.ifndef __MINIX
 ZDISTDIR:=${.PARSEDIR}/../../../common/dist/zlib
-.else
-ZDISTDIR:=${.PARSEDIR}/../../../lib/libz
-.endif
 
 CPPFLAGS+=	-I${ZDISTDIR} ${ZCPPFLAGS} ${ZMISCCPPFLAGS}
 

sys/lib/libz/Makefile.inc

@@ -19,17 +19,9 @@
 # Default values:
 ZDST?=		${.OBJDIR}/lib/z
 Z_AS?=		library
-
-.ifndef __MINIX
 ZDOTDIR?= ../../.
 
 ZDIR=		${S:S@^.@${ZDOTDIR}@:Q}/lib/libz
-.else
-ZDOTDIR?= ../../../../../.
-
-ZDIR=		${.CURDIR}/${ZDOTDIR}/lib/libz
-.endif
-
 .if (${Z_AS} == "obj")
 ZLIB=		${ZDST}/libz.o
 ZLIB_PROF=	${ZDST}/libz.po