Move contrib/zlib to sys/contrib/zlib so that we can use it in kernel.

This is a prerequisite of unifying kernel zlib instances.

Submitted by:	Yoshihiro Ota <ota at j.email.ne.jp>
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D20191

49 files changed, 5 insertions, 5 deletions

diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade
index e5bb54d1fbfc..203ae5c220c2 100644
--- a/lib/libz/FREEBSD-upgrade
+++ b/lib/libz/FREEBSD-upgrade
@@ -8,7 +8,7 @@ benefit other consumers.
 To Update:
   1) Unpack vendor sources into a clean directory.
   2) Import onto the vendor area.
-  3) Merge the vendor tree to contrib/zlib, which contains a stripped down
+  3) Merge the vendor tree to sys/contrib/zlib, which contains a stripped down
      version of upstream source, resolve any conflicts.
   4) Double check zconf.h, zlib.pc, and Symbol.map to make sure that we
      have the required changes.  Test universe and commit them.
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 96c46c67265b..9d415a8b976c 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -9,7 +9,7 @@ SHLIB_MAJOR=	6
 MAN=		zlib.3 zopen.3
 MLINKS+=	zopen.3 zdopen.3
 
-ZLIBSRC=	${SRCTOP}/contrib/zlib
+ZLIBSRC=	${SRCTOP}/sys/contrib/zlib
 
 .PATH:		${ZLIBSRC}
 
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index 0038075c4710..b09b23c79d93 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -99,8 +99,8 @@ CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS
 SRCS+=bzlib.c crctable.c decompress.c huffman.c randtable.c
 
 # decompression functionality from zlib
-.PATH: ${SRCTOP}/contrib/zlib
-CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/contrib/zlib
+.PATH: ${SRCTOP}/sys/contrib/zlib
+CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
 SRCS+=	adler32.c crc32.c
 SRCS+=	infback.c inffast.c inflate.c inftrees.c zutil.c
 
diff --git a/contrib/zlib/ChangeLog b/sys/contrib/zlib/ChangeLog
index 30199a65a03d..30199a65a03d 100644
--- a/contrib/zlib/ChangeLog
+++ b/sys/contrib/zlib/ChangeLog
diff --git a/contrib/zlib/FAQ b/sys/contrib/zlib/FAQ
index 99b7cf92e454..99b7cf92e454 100644
--- a/contrib/zlib/FAQ
+++ b/sys/contrib/zlib/FAQ
diff --git a/contrib/zlib/README b/sys/contrib/zlib/README
index 51106de47532..51106de47532 100644
--- a/contrib/zlib/README
+++ b/sys/contrib/zlib/README
diff --git a/contrib/zlib/adler32.c b/sys/contrib/zlib/adler32.c
index d0be4380a39c..d0be4380a39c 100644
--- a/contrib/zlib/adler32.c
+++ b/sys/contrib/zlib/adler32.c
diff --git a/contrib/zlib/compress.c b/sys/contrib/zlib/compress.c
index e2db404abf88..e2db404abf88 100644
--- a/contrib/zlib/compress.c
+++ b/sys/contrib/zlib/compress.c
diff --git a/contrib/zlib/contrib/README.contrib b/sys/contrib/zlib/contrib/README.contrib
index a411d5c396bd..a411d5c396bd 100644
--- a/contrib/zlib/contrib/README.contrib
+++ b/sys/contrib/zlib/contrib/README.contrib
diff --git a/contrib/zlib/contrib/asm686/README.686 b/sys/contrib/zlib/contrib/asm686/README.686
index a0bf3bea4aff..a0bf3bea4aff 100644
--- a/contrib/zlib/contrib/asm686/README.686
+++ b/sys/contrib/zlib/contrib/asm686/README.686
diff --git a/contrib/zlib/contrib/asm686/match.S b/sys/contrib/zlib/contrib/asm686/match.S
index fa421092785d..fa421092785d 100644
--- a/contrib/zlib/contrib/asm686/match.S
+++ b/sys/contrib/zlib/contrib/asm686/match.S
diff --git a/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S b/sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
index 23309fa286e5..23309fa286e5 100644
--- a/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
+++ b/sys/contrib/zlib/contrib/gcc_gvmat64/gvmat64.S
diff --git a/contrib/zlib/crc32.c b/sys/contrib/zlib/crc32.c
index 9580440c0e6b..9580440c0e6b 100644
--- a/contrib/zlib/crc32.c
+++ b/sys/contrib/zlib/crc32.c
diff --git a/contrib/zlib/crc32.h b/sys/contrib/zlib/crc32.h
index 9e0c77810251..9e0c77810251 100644
--- a/contrib/zlib/crc32.h
+++ b/sys/contrib/zlib/crc32.h
diff --git a/contrib/zlib/deflate.c b/sys/contrib/zlib/deflate.c
index 7f2c8a2a2a64..7f2c8a2a2a64 100644
--- a/contrib/zlib/deflate.c
+++ b/sys/contrib/zlib/deflate.c
diff --git a/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h
index 23ecdd312bc0..23ecdd312bc0 100644
--- a/contrib/zlib/deflate.h
+++ b/sys/contrib/zlib/deflate.h
diff --git a/contrib/zlib/doc/algorithm.txt b/sys/contrib/zlib/doc/algorithm.txt
index c97f495020b4..c97f495020b4 100644
--- a/contrib/zlib/doc/algorithm.txt
+++ b/sys/contrib/zlib/doc/algorithm.txt
diff --git a/contrib/zlib/doc/rfc1950.txt b/sys/contrib/zlib/doc/rfc1950.txt
index ce6428a0f2ee..ce6428a0f2ee 100644
--- a/contrib/zlib/doc/rfc1950.txt
+++ b/sys/contrib/zlib/doc/rfc1950.txt
diff --git a/contrib/zlib/doc/rfc1951.txt b/sys/contrib/zlib/doc/rfc1951.txt
index 403c8c722ff2..403c8c722ff2 100644
--- a/contrib/zlib/doc/rfc1951.txt
+++ b/sys/contrib/zlib/doc/rfc1951.txt
diff --git a/contrib/zlib/doc/rfc1952.txt b/sys/contrib/zlib/doc/rfc1952.txt
index a8e51b4567fd..a8e51b4567fd 100644
--- a/contrib/zlib/doc/rfc1952.txt
+++ b/sys/contrib/zlib/doc/rfc1952.txt
diff --git a/contrib/zlib/doc/txtvsbin.txt b/sys/contrib/zlib/doc/txtvsbin.txt
index 3d0f0634f72e..3d0f0634f72e 100644
--- a/contrib/zlib/doc/txtvsbin.txt
+++ b/sys/contrib/zlib/doc/txtvsbin.txt
diff --git a/contrib/zlib/gzclose.c b/sys/contrib/zlib/gzclose.c
index caeb99a3177f..caeb99a3177f 100644
--- a/contrib/zlib/gzclose.c
+++ b/sys/contrib/zlib/gzclose.c
diff --git a/contrib/zlib/gzguts.h b/sys/contrib/zlib/gzguts.h
index 990a4d251493..990a4d251493 100644
--- a/contrib/zlib/gzguts.h
+++ b/sys/contrib/zlib/gzguts.h
diff --git a/contrib/zlib/gzlib.c b/sys/contrib/zlib/gzlib.c
index b4cb5e4a48cf..b4cb5e4a48cf 100644
--- a/contrib/zlib/gzlib.c
+++ b/sys/contrib/zlib/gzlib.c
diff --git a/contrib/zlib/gzread.c b/sys/contrib/zlib/gzread.c
index 1ba184f11a0e..1ba184f11a0e 100644
--- a/contrib/zlib/gzread.c
+++ b/sys/contrib/zlib/gzread.c
diff --git a/contrib/zlib/gzwrite.c b/sys/contrib/zlib/gzwrite.c
index 8b38834d5170..8b38834d5170 100644
--- a/contrib/zlib/gzwrite.c
+++ b/sys/contrib/zlib/gzwrite.c
diff --git a/contrib/zlib/infback.c b/sys/contrib/zlib/infback.c
index 59679ecbfc5d..59679ecbfc5d 100644
--- a/contrib/zlib/infback.c
+++ b/sys/contrib/zlib/infback.c
diff --git a/contrib/zlib/inffast.c b/sys/contrib/zlib/inffast.c
index 0dbd1dbc09f2..0dbd1dbc09f2 100644
--- a/contrib/zlib/inffast.c
+++ b/sys/contrib/zlib/inffast.c
diff --git a/contrib/zlib/inffast.h b/sys/contrib/zlib/inffast.h
index e5c1aa4ca8cd..e5c1aa4ca8cd 100644
--- a/contrib/zlib/inffast.h
+++ b/sys/contrib/zlib/inffast.h
diff --git a/contrib/zlib/inffixed.h b/sys/contrib/zlib/inffixed.h
index d62832776948..d62832776948 100644
--- a/contrib/zlib/inffixed.h
+++ b/sys/contrib/zlib/inffixed.h
diff --git a/contrib/zlib/inflate.c b/sys/contrib/zlib/inflate.c
index ac333e8c2eda..ac333e8c2eda 100644
--- a/contrib/zlib/inflate.c
+++ b/sys/contrib/zlib/inflate.c
diff --git a/contrib/zlib/inflate.h b/sys/contrib/zlib/inflate.h
index a46cce6b6d05..a46cce6b6d05 100644
--- a/contrib/zlib/inflate.h
+++ b/sys/contrib/zlib/inflate.h
diff --git a/contrib/zlib/inftrees.c b/sys/contrib/zlib/inftrees.c
index 2ea08fc13ea8..2ea08fc13ea8 100644
--- a/contrib/zlib/inftrees.c
+++ b/sys/contrib/zlib/inftrees.c
diff --git a/contrib/zlib/inftrees.h b/sys/contrib/zlib/inftrees.h
index baa53a0b1a19..baa53a0b1a19 100644
--- a/contrib/zlib/inftrees.h
+++ b/sys/contrib/zlib/inftrees.h
diff --git a/contrib/zlib/test/example.c b/sys/contrib/zlib/test/example.c
index eee17ce7c159..eee17ce7c159 100644
--- a/contrib/zlib/test/example.c
+++ b/sys/contrib/zlib/test/example.c
diff --git a/contrib/zlib/test/infcover.c b/sys/contrib/zlib/test/infcover.c
index 2be01646cec3..2be01646cec3 100644
--- a/contrib/zlib/test/infcover.c
+++ b/sys/contrib/zlib/test/infcover.c
diff --git a/contrib/zlib/test/minigzip.c b/sys/contrib/zlib/test/minigzip.c
index e22fb08c0a29..e22fb08c0a29 100644
--- a/contrib/zlib/test/minigzip.c
+++ b/sys/contrib/zlib/test/minigzip.c
diff --git a/contrib/zlib/trees.c b/sys/contrib/zlib/trees.c
index 50cf4b4571cf..50cf4b4571cf 100644
--- a/contrib/zlib/trees.c
+++ b/sys/contrib/zlib/trees.c
diff --git a/contrib/zlib/trees.h b/sys/contrib/zlib/trees.h
index d35639d82a27..d35639d82a27 100644
--- a/contrib/zlib/trees.h
+++ b/sys/contrib/zlib/trees.h
diff --git a/contrib/zlib/uncompr.c b/sys/contrib/zlib/uncompr.c
index f03a1a865e34..f03a1a865e34 100644
--- a/contrib/zlib/uncompr.c
+++ b/sys/contrib/zlib/uncompr.c
diff --git a/contrib/zlib/zconf.h b/sys/contrib/zlib/zconf.h
index 0654395f3fca..0654395f3fca 100644
--- a/contrib/zlib/zconf.h
+++ b/sys/contrib/zlib/zconf.h
diff --git a/contrib/zlib/zconf.h.in b/sys/contrib/zlib/zconf.h.in
index 5e1d68a004e9..5e1d68a004e9 100644
--- a/contrib/zlib/zconf.h.in
+++ b/sys/contrib/zlib/zconf.h.in
diff --git a/contrib/zlib/zlib.3 b/sys/contrib/zlib/zlib.3
index bda4eb073709..bda4eb073709 100644
--- a/contrib/zlib/zlib.3
+++ b/sys/contrib/zlib/zlib.3
diff --git a/contrib/zlib/zlib.h b/sys/contrib/zlib/zlib.h
index 001624e5ed85..001624e5ed85 100644
--- a/contrib/zlib/zlib.h
+++ b/sys/contrib/zlib/zlib.h
diff --git a/contrib/zlib/zlib.map b/sys/contrib/zlib/zlib.map
index 40fa9db2bce3..40fa9db2bce3 100644
--- a/contrib/zlib/zlib.map
+++ b/sys/contrib/zlib/zlib.map
diff --git a/contrib/zlib/zlib.pc.in b/sys/contrib/zlib/zlib.pc.in
index 7e5acf9c77e7..7e5acf9c77e7 100644
--- a/contrib/zlib/zlib.pc.in
+++ b/sys/contrib/zlib/zlib.pc.in
diff --git a/contrib/zlib/zutil.c b/sys/contrib/zlib/zutil.c
index a76c6b0c7e55..a76c6b0c7e55 100644
--- a/contrib/zlib/zutil.c
+++ b/sys/contrib/zlib/zutil.c
diff --git a/contrib/zlib/zutil.h b/sys/contrib/zlib/zutil.h
index b079ea6a80f5..b079ea6a80f5 100644
--- a/contrib/zlib/zutil.h
+++ b/sys/contrib/zlib/zutil.h
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 2385f7655351..9a0098eed547 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=	${SRCTOP}/contrib/zlib/test
+SRCDIR=	${SRCTOP}/sys/contrib/zlib/test
 .PATH:	${SRCDIR}
 
 PROG=	minigzip