Restructure libz, place vendor files in contrib/zlib like other third

party software, this provides more standarized import workflow and
makes future upgrades easier.

The following files are new with this commit:

	zconf.h.in
	zlib.map
	zlib.pc.in

They are not connected to build, but were kept in tree for reference
for future maintenance.

All our local trivial changes were applied to contrib/zlib, and the
contrib/zlib vendor source code is intended to 100% match lib/libz
before this commit.

MFC after:	2 weeks

1 files changed, 10 insertions, 38 deletions

diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade
index 4ee4eebedb63..e5bb54d1fbfc 100644
--- a/lib/libz/FREEBSD-upgrade
+++ b/lib/libz/FREEBSD-upgrade
@@ -1,44 +1,16 @@
 $FreeBSD$
 
-ZLib 1.2.2
-
-Original distribution from http://www.gzip.org/zlib/
-
-Vendor files removed from distribution before import:
-	 INDEX		 configure	 qnx/
-	 Makefile	 contrib/	 win32/
-	 Makefile.in	 msdos/		 zconf.in.h
-	 amiga/		 old/
-	 as400/		 projects/
-
-Vendor files imported:
-	 ChangeLog	 example.c	 minigzip.c
-	 FAQ		 gzio.c		 trees.c
-	 README		 infback.c	 trees.h
-	 adler32.c	 inffast.c	 uncompr.c
-	 algorithm.txt	 inffast.h	 zconf.h
-	 compress.c	 inffixed.h	 zlib.3
-	 crc32.c	 inflate.c	 zlib.h
-	 crc32.h	 inflate.h	 zutil.c
-	 deflate.c	 inftrees.c	 zutil.h
-	 deflate.h	 inftrees.h
-
-As of April, 2005, only the following three vendor files
-had non-trivial local changes:
-	 gzio.c   minigzip.c  zconf.h
-
-Added files (not from vendor):
-	 Makefile	 zopen.c	 FREEBSD-upgrade
+Original distribution from http://zlib.net/.  Currently, only trivial
+changes were made to support build of libstand and to suppress certain
+compiler warnings, we upstream our local changes whenever they would
+benefit other consumers.
 
 To Update:
   1) Unpack vendor sources into a clean directory.
-  2) Delete unnecessary files.
-  3) Import onto the vendor branch.  The 1.2.2 import was done like this:
-   cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
-  4) In a clean directory, check out a fresh copy of HEAD,
-	 merging in vendor changes since the last import.
-   cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
-  5) Resolve any conflicts and commit them.
-  6) Update this file with any changes to the file list or update procedure.
+  2) Import onto the vendor area.
+  3) Merge the vendor tree to 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.
 
-kientzle@FreeBSD.org
+delphij@FreeBSD.org