prepare for zlib-1.2.4

git-svn-id: svn://tug.org/texlive/trunk@17815 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 256 insertions, 82 deletions

diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index b85aa8f1c73..7d62df2843d 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -667,7 +667,6 @@ enable_ipc
 enable_omfonts
 enable_tex
 enable_etex
-enable_ptex
 enable_aleph
 enable_pdftex
 enable_luatex
@@ -1436,7 +1435,6 @@ Optional Features:
                             versions)
   --disable-tex             do not compile and install TeX
   --enable-etex             compile and install e-TeX
-  --disable-ptex            do not compile and install pTeX
   --disable-aleph           do not compile and install Aleph
   --disable-pdftex          do not compile and install pdfTeX
   --disable-luatex          do not compile and install luaTeX
@@ -2567,20 +2565,6 @@ case $enable_etex in #(
   *) :
     enable_etex=no ;;
 esac
-# Check whether --enable-ptex was given.
-if test "${enable_ptex+set}" = set; then :
-  enableval=$enable_ptex;
-fi
-case $enable_ptex in #(
-  yes|no) :
-     ;; #(
-  *) :
-    enable_ptex=yes ;;
-esac
-
-test "x$enable_web2c:$enable_ptex" = xyes:yes && {
-  need_ptexenc=yes
-}
 # Check whether --enable-aleph was given.
 if test "${enable_aleph+set}" = set; then :
   enableval=$enable_aleph;
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
index f21b732be73..5a0fad74551 100644
--- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
@@ -1,6 +1,6 @@
 2010-04-06  Hartmut Henkel  <hartmut_henkel@gmx.de>
 
-	* patch-45-getmetadatanf needed by pdftoepdf.cc
+	* patch-45-getmetadatanf(new): needed by luaTeX's pdftoepdf.cc.
 
 2009-09-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf
index b40b0915795..620984a718d 100644
--- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-45-getmetadatanf
@@ -1,5 +1,6 @@
---- xpdf-orig/xpdf/Page.cc	2007-02-27 23:05:52.000000000 +0100
-+++ xpdf-3.02/xpdf/Page.cc	2010-04-06 21:22:17.000000000 +0200
+diff -ur -N xpdf-3.02.orig/xpdf/Page.cc xpdf-3.02/xpdf/Page.cc
+--- xpdf-3.02.orig/xpdf/Page.cc	2009-05-07 00:22:58.000000000 +0200
++++ xpdf-3.02/xpdf/Page.cc	2010-04-06 23:04:12.000000000 +0200
 @@ -5,6 +5,9 @@
  // Copyright 1996-2007 Glyph & Cog, LLC
  //
@@ -41,8 +42,9 @@
  }
  
  GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) {
---- xpdf-orig/xpdf/Page.h	2007-02-27 23:05:52.000000000 +0100
-+++ xpdf-3.02/xpdf/Page.h	2010-04-06 21:21:51.000000000 +0200
+diff -ur -N xpdf-3.02.orig/xpdf/Page.h xpdf-3.02/xpdf/Page.h
+--- xpdf-3.02.orig/xpdf/Page.h	2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/Page.h	2010-04-06 23:04:12.000000000 +0200
 @@ -5,6 +5,10 @@
  // Copyright 1996-2003 Glyph & Cog, LLC
  //
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 671c13c22aa..3dfb7317de2 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Prepare for zlib-1.2.4
+	* configure.ac, Makefile.am: Use AC_CONFIG_COMMANDS to create
+	zconf.h.
+
 2009-01-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 056249aa4f4..d5d598c1af5 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -23,6 +23,9 @@ EXTRA_DIST = $(ZLIB_TREE)
 ##
 EXTRA_DIST += $(ZLIB_TREE)-PATCHES
 
+## Prepare for switch zlib-1.2.3 -> zlib-1.2.4
+EXTRA_DIST += $(OTHER_TREE) $(OTHER_TREE)-PATCHES
+
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
@@ -42,7 +45,6 @@ nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/crc32.h \
 	$(ZLIB_TREE)/deflate.c \
 	$(ZLIB_TREE)/deflate.h \
-	$(ZLIB_TREE)/gzio.c \
 	$(ZLIB_TREE)/infback.c \
 	$(ZLIB_TREE)/inffast.c \
 	$(ZLIB_TREE)/inffast.h \
@@ -57,6 +59,20 @@ nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/zutil.h \
 	$(ZLIB_TREE)/zutil.c
 
+if ZLIB123
+nodist_libz_a_SOURCES += \
+	$(ZLIB_TREE)/gzio.c
+ZCONF_SRC = zconf.in.h
+else
+nodist_libz_a_SOURCES += \
+	$(ZLIB_TREE)/gzclose.c \
+	$(ZLIB_TREE)/gzguts.h \
+	$(ZLIB_TREE)/gzlib.c \
+	$(ZLIB_TREE)/gzread.c \
+	$(ZLIB_TREE)/gzwrite.c
+ZCONF_SRC = zconf.h.in
+endif
+
 $(libz_a_OBJECTS): zconf.h
 
 if build
@@ -70,8 +86,9 @@ LDADD = libz.a
 nodist_example_SOURCES = $(ZLIB_TREE)/example.c
 nodist_minigzip_SOURCES = $(ZLIB_TREE)/minigzip.c
 
-zconf.h: $(ZLIB_TREE)/zconf.in.h Makefile
-	sed < $< '/HAVE_UNISTD_H/s%^#if [01]%#if $(WITH_UNISTD)%' >$@
+zconf.h: $(ZLIB_TREE)/$(ZCONF_SRC) config.status
+	echo '$(SHELL) ./config.status $@'
+	$(SHELL) ./config.status $@
 
 DISTCLEANFILES = zconf.h
 
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 462b389990f..cf49b9a97e6 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -32,6 +32,16 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+@ZLIB123_TRUE@am__append_1 = \
+@ZLIB123_TRUE@	$(ZLIB_TREE)/gzio.c
+
+@ZLIB123_FALSE@am__append_2 = \
+@ZLIB123_FALSE@	$(ZLIB_TREE)/gzclose.c \
+@ZLIB123_FALSE@	$(ZLIB_TREE)/gzguts.h \
+@ZLIB123_FALSE@	$(ZLIB_TREE)/gzlib.c \
+@ZLIB123_FALSE@	$(ZLIB_TREE)/gzread.c \
+@ZLIB123_FALSE@	$(ZLIB_TREE)/gzwrite.c
+
 @build_TRUE@check_PROGRAMS = example$(EXEEXT) minigzip$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) \
@@ -60,11 +70,14 @@ AR = ar
 ARFLAGS = cru
 libz_a_AR = $(AR) $(ARFLAGS)
 libz_a_LIBADD =
+@ZLIB123_TRUE@am__objects_1 = gzio.$(OBJEXT)
+@ZLIB123_FALSE@am__objects_2 = gzclose.$(OBJEXT) gzlib.$(OBJEXT) \
+@ZLIB123_FALSE@	gzread.$(OBJEXT) gzwrite.$(OBJEXT)
 nodist_libz_a_OBJECTS = adler32.$(OBJEXT) compress.$(OBJEXT) \
-	crc32.$(OBJEXT) deflate.$(OBJEXT) gzio.$(OBJEXT) \
-	infback.$(OBJEXT) inffast.$(OBJEXT) inflate.$(OBJEXT) \
-	inftrees.$(OBJEXT) trees.$(OBJEXT) uncompr.$(OBJEXT) \
-	zutil.$(OBJEXT)
+	crc32.$(OBJEXT) deflate.$(OBJEXT) infback.$(OBJEXT) \
+	inffast.$(OBJEXT) inflate.$(OBJEXT) inftrees.$(OBJEXT) \
+	trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \
+	$(am__objects_1) $(am__objects_2)
 libz_a_OBJECTS = $(nodist_libz_a_OBJECTS)
 nodist_example_OBJECTS = example.$(OBJEXT)
 example_OBJECTS = $(nodist_example_OBJECTS)
@@ -173,6 +186,7 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
+OTHER_TREE = @OTHER_TREE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -186,7 +200,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WITH_UNISTD = @WITH_UNISTD@
 ZLIB_DEFINES = @ZLIB_DEFINES@
 ZLIB_TREE = @ZLIB_TREE@
 abs_builddir = @abs_builddir@
@@ -232,33 +245,24 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES
+EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES $(OTHER_TREE) \
+	$(OTHER_TREE)-PATCHES
 SUBDIRS = . include
 INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
 AM_CPPFLAGS = $(ZLIB_DEFINES)
 noinst_LIBRARIES = libz.a
-nodist_libz_a_SOURCES = \
-	$(ZLIB_TREE)/adler32.c \
-	$(ZLIB_TREE)/compress.c \
-	$(ZLIB_TREE)/crc32.c \
-	$(ZLIB_TREE)/crc32.h \
-	$(ZLIB_TREE)/deflate.c \
-	$(ZLIB_TREE)/deflate.h \
-	$(ZLIB_TREE)/gzio.c \
-	$(ZLIB_TREE)/infback.c \
-	$(ZLIB_TREE)/inffast.c \
-	$(ZLIB_TREE)/inffast.h \
-	$(ZLIB_TREE)/inffixed.h \
-	$(ZLIB_TREE)/inflate.c \
-	$(ZLIB_TREE)/inflate.h \
-	$(ZLIB_TREE)/inftrees.c \
-	$(ZLIB_TREE)/inftrees.h \
-	$(ZLIB_TREE)/trees.c \
-	$(ZLIB_TREE)/trees.h \
-	$(ZLIB_TREE)/uncompr.c \
-	$(ZLIB_TREE)/zutil.h \
-	$(ZLIB_TREE)/zutil.c
-
+nodist_libz_a_SOURCES = $(ZLIB_TREE)/adler32.c $(ZLIB_TREE)/compress.c \
+	$(ZLIB_TREE)/crc32.c $(ZLIB_TREE)/crc32.h \
+	$(ZLIB_TREE)/deflate.c $(ZLIB_TREE)/deflate.h \
+	$(ZLIB_TREE)/infback.c $(ZLIB_TREE)/inffast.c \
+	$(ZLIB_TREE)/inffast.h $(ZLIB_TREE)/inffixed.h \
+	$(ZLIB_TREE)/inflate.c $(ZLIB_TREE)/inflate.h \
+	$(ZLIB_TREE)/inftrees.c $(ZLIB_TREE)/inftrees.h \
+	$(ZLIB_TREE)/trees.c $(ZLIB_TREE)/trees.h \
+	$(ZLIB_TREE)/uncompr.c $(ZLIB_TREE)/zutil.h \
+	$(ZLIB_TREE)/zutil.c $(am__append_1) $(am__append_2)
+@ZLIB123_FALSE@ZCONF_SRC = zconf.h.in
+@ZLIB123_TRUE@ZCONF_SRC = zconf.in.h
 @build_TRUE@dist_check_SCRIPTS = zlib.test
 @build_TRUE@TESTS = zlib.test
 LDADD = libz.a
@@ -350,7 +354,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Po@am__quote@
@@ -430,20 +438,6 @@ deflate.obj: $(ZLIB_TREE)/deflate.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.obj `if test -f '$(ZLIB_TREE)/deflate.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/deflate.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/deflate.c'; fi`
 
-gzio.o: $(ZLIB_TREE)/gzio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzio.o -MD -MP -MF $(DEPDIR)/gzio.Tpo -c -o gzio.o `test -f '$(ZLIB_TREE)/gzio.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzio.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzio.Tpo $(DEPDIR)/gzio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzio.c' object='gzio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzio.o `test -f '$(ZLIB_TREE)/gzio.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzio.c
-
-gzio.obj: $(ZLIB_TREE)/gzio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzio.obj -MD -MP -MF $(DEPDIR)/gzio.Tpo -c -o gzio.obj `if test -f '$(ZLIB_TREE)/gzio.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzio.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzio.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzio.Tpo $(DEPDIR)/gzio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzio.c' object='gzio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzio.obj `if test -f '$(ZLIB_TREE)/gzio.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzio.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzio.c'; fi`
-
 infback.o: $(ZLIB_TREE)/infback.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT infback.o -MD -MP -MF $(DEPDIR)/infback.Tpo -c -o infback.o `test -f '$(ZLIB_TREE)/infback.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/infback.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/infback.Tpo $(DEPDIR)/infback.Po
@@ -542,6 +536,76 @@ zutil.obj: $(ZLIB_TREE)/zutil.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.obj `if test -f '$(ZLIB_TREE)/zutil.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/zutil.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/zutil.c'; fi`
 
+gzio.o: $(ZLIB_TREE)/gzio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzio.o -MD -MP -MF $(DEPDIR)/gzio.Tpo -c -o gzio.o `test -f '$(ZLIB_TREE)/gzio.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzio.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzio.Tpo $(DEPDIR)/gzio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzio.c' object='gzio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzio.o `test -f '$(ZLIB_TREE)/gzio.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzio.c
+
+gzio.obj: $(ZLIB_TREE)/gzio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzio.obj -MD -MP -MF $(DEPDIR)/gzio.Tpo -c -o gzio.obj `if test -f '$(ZLIB_TREE)/gzio.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzio.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzio.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzio.Tpo $(DEPDIR)/gzio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzio.c' object='gzio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzio.obj `if test -f '$(ZLIB_TREE)/gzio.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzio.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzio.c'; fi`
+
+gzclose.o: $(ZLIB_TREE)/gzclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzclose.o -MD -MP -MF $(DEPDIR)/gzclose.Tpo -c -o gzclose.o `test -f '$(ZLIB_TREE)/gzclose.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzclose.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzclose.Tpo $(DEPDIR)/gzclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzclose.c' object='gzclose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzclose.o `test -f '$(ZLIB_TREE)/gzclose.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzclose.c
+
+gzclose.obj: $(ZLIB_TREE)/gzclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzclose.obj -MD -MP -MF $(DEPDIR)/gzclose.Tpo -c -o gzclose.obj `if test -f '$(ZLIB_TREE)/gzclose.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzclose.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzclose.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzclose.Tpo $(DEPDIR)/gzclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzclose.c' object='gzclose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzclose.obj `if test -f '$(ZLIB_TREE)/gzclose.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzclose.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzclose.c'; fi`
+
+gzlib.o: $(ZLIB_TREE)/gzlib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzlib.o -MD -MP -MF $(DEPDIR)/gzlib.Tpo -c -o gzlib.o `test -f '$(ZLIB_TREE)/gzlib.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzlib.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzlib.Tpo $(DEPDIR)/gzlib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzlib.c' object='gzlib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzlib.o `test -f '$(ZLIB_TREE)/gzlib.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzlib.c
+
+gzlib.obj: $(ZLIB_TREE)/gzlib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzlib.obj -MD -MP -MF $(DEPDIR)/gzlib.Tpo -c -o gzlib.obj `if test -f '$(ZLIB_TREE)/gzlib.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzlib.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzlib.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzlib.Tpo $(DEPDIR)/gzlib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzlib.c' object='gzlib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzlib.obj `if test -f '$(ZLIB_TREE)/gzlib.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzlib.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzlib.c'; fi`
+
+gzread.o: $(ZLIB_TREE)/gzread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzread.o -MD -MP -MF $(DEPDIR)/gzread.Tpo -c -o gzread.o `test -f '$(ZLIB_TREE)/gzread.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzread.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzread.Tpo $(DEPDIR)/gzread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzread.c' object='gzread.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzread.o `test -f '$(ZLIB_TREE)/gzread.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzread.c
+
+gzread.obj: $(ZLIB_TREE)/gzread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzread.obj -MD -MP -MF $(DEPDIR)/gzread.Tpo -c -o gzread.obj `if test -f '$(ZLIB_TREE)/gzread.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzread.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzread.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzread.Tpo $(DEPDIR)/gzread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzread.c' object='gzread.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzread.obj `if test -f '$(ZLIB_TREE)/gzread.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzread.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzread.c'; fi`
+
+gzwrite.o: $(ZLIB_TREE)/gzwrite.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzwrite.o -MD -MP -MF $(DEPDIR)/gzwrite.Tpo -c -o gzwrite.o `test -f '$(ZLIB_TREE)/gzwrite.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzwrite.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzwrite.Tpo $(DEPDIR)/gzwrite.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzwrite.c' object='gzwrite.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzwrite.o `test -f '$(ZLIB_TREE)/gzwrite.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/gzwrite.c
+
+gzwrite.obj: $(ZLIB_TREE)/gzwrite.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gzwrite.obj -MD -MP -MF $(DEPDIR)/gzwrite.Tpo -c -o gzwrite.obj `if test -f '$(ZLIB_TREE)/gzwrite.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzwrite.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzwrite.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gzwrite.Tpo $(DEPDIR)/gzwrite.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(ZLIB_TREE)/gzwrite.c' object='gzwrite.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzwrite.obj `if test -f '$(ZLIB_TREE)/gzwrite.c'; then $(CYGPATH_W) '$(ZLIB_TREE)/gzwrite.c'; else $(CYGPATH_W) '$(srcdir)/$(ZLIB_TREE)/gzwrite.c'; fi`
+
 example.o: $(ZLIB_TREE)/example.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT example.o -MD -MP -MF $(DEPDIR)/example.Tpo -c -o example.o `test -f '$(ZLIB_TREE)/example.c' || echo '$(srcdir)/'`$(ZLIB_TREE)/example.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/example.Tpo $(DEPDIR)/example.Po
@@ -1115,8 +1179,9 @@ dist-hook:
 
 $(libz_a_OBJECTS): zconf.h
 
-zconf.h: $(ZLIB_TREE)/zconf.in.h Makefile
-	sed < $< '/HAVE_UNISTD_H/s%^#if [01]%#if $(WITH_UNISTD)%' >$@
+zconf.h: $(ZLIB_TREE)/$(ZCONF_SRC) config.status
+	echo '$(SHELL) ./config.status $@'
+	$(SHELL) ./config.status $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure
index a85aa1580a7..60beba07598 100755
--- a/Build/source/libs/zlib/configure
+++ b/Build/source/libs/zlib/configure
@@ -557,7 +557,7 @@ PACKAGE_STRING='zlib for TeX Live 1.2.3'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="zlib-1.2.3/zconf.in.h"
+ac_unique_file="zlib-1.2.3/zlib.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -600,7 +600,9 @@ LTLIBOBJS
 LIBOBJS
 ZLIB_TREE
 ZLIB_DEFINES
-WITH_UNISTD
+ZLIB123_FALSE
+ZLIB123_TRUE
+OTHER_TREE
 EGREP
 GREP
 CPP
@@ -4036,14 +4038,36 @@ fi
 done
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+for ac_header in unistd.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
 if test "x$ac_cv_header_unistd_h" = x""yes; then :
-  WITH_UNISTD=1
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_UNISTD_H 1
+_ACEOF
+
+fi
+
+done
+
+
+ZCONF_SRC=zlib-1.2.3/zconf.in.h
+if test x"$ac_cv_header_unistd_h" = xyes; then
+  zconf_sh='sed <$srcdir/'"$ZCONF_SRC"' "/HAVE_UNISTD_H/s%0%1%" >'
 else
-  WITH_UNISTD=0
+  zconf_sh='cp $srcdir/'"$ZCONF_SRC"
 fi
+OTHER_TREE=zlib-1.2.4
 
+ if test "x1.2.3" = x1.2.3; then
+  ZLIB123_TRUE=
+  ZLIB123_FALSE='#'
+else
+  ZLIB123_TRUE='#'
+  ZLIB123_FALSE=
+fi
 
+ac_config_commands="$ac_config_commands zconf.h"
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
@@ -4215,6 +4239,10 @@ if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
   as_fn_error "conditional \"build\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ZLIB123_TRUE}" && test -z "${ZLIB123_FALSE}"; then
+  as_fn_error "conditional \"ZLIB123\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -4803,6 +4831,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+zconf_sh='$zconf_sh'
 
 _ACEOF
 
@@ -4814,6 +4843,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "zconf.h") CONFIG_COMMANDS="$CONFIG_COMMANDS zconf.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
 
@@ -5495,6 +5525,7 @@ $as_echo X"$file" |
   done
 }
  ;;
+    "zconf.h":C) eval "$zconf_sh" zconf.h ;;
 
   esac
 done # for ac_tag
diff --git a/Build/source/libs/zlib/configure.ac b/Build/source/libs/zlib/configure.ac
index 5d2566f3c7e..6fbec8d7c39 100644
--- a/Build/source/libs/zlib/configure.ac
+++ b/Build/source/libs/zlib/configure.ac
@@ -1,18 +1,15 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([zlib_major], [1])[]dnl
-m4_define([zlib_minor], [2])[]dnl
-m4_define([zlib_micro], [3])[]dnl using unmodified zlib-1.2.3 source tree
-m4_define([zlib_version], zlib_major.zlib_minor.zlib_micro)[]dnl
+m4_define([zlib_version], [1.2.3])[]dnl using unmodified zlib source tree
 AC_INIT([zlib for TeX Live], zlib_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([zlib-]zlib_version[/zconf.in.h])
+AC_CONFIG_SRCDIR([zlib-]zlib_version[/zlib.h])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -36,8 +33,29 @@ if test "x$ac_cv_header_stdc" != xyes; then
   AC_MSG_ERROR([Sorry, can't do anything for you])
 fi
 
-AC_CHECK_HEADER([unistd.h], [WITH_UNISTD=1], [WITH_UNISTD=0])
-AC_SUBST([WITH_UNISTD])
+AC_CHECK_HEADERS([unistd.h])
+dnl zlib-1.2.3 has zconf.in.h, whereas zlib-1.2.4 has zconf.h.in
+m4_if(zlib_version, [1.2.3],
+      [
+ZCONF_SRC=zlib-[]zlib_version/zconf.in.h
+if test x"$ac_cv_header_unistd_h" = xyes; then
+  zconf_sh='sed <$srcdir/'"$ZCONF_SRC"' "/HAVE_UNISTD_H/s%0%1%" >'
+else
+  zconf_sh='cp $srcdir/'"$ZCONF_SRC"
+fi
+AC_SUBST([OTHER_TREE], [zlib-1.2.4])],
+      [
+ZCONF_SRC=zlib-[]zlib_version/zconf.h.in
+if test x"$ac_cv_header_unistd_h" = xyes; then
+  zconf_sh='sed <$srcdir/'"$ZCONF_SRC"' "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\\(.*\\) may be/ 1\\1 was/" >'
+else
+  zconf_sh='cp $srcdir/'"$ZCONF_SRC"
+fi
+AC_SUBST([OTHER_TREE], [zlib-1.2.3])])
+AM_CONDITIONAL([ZLIB123], [test "x]zlib_version[" = x1.2.3])
+AC_CONFIG_COMMANDS([zconf.h],
+                   [eval "$zconf_sh" zconf.h],
+                   [zconf_sh='$zconf_sh'])
 
 AC_CHECK_HEADER([errno.h],
                 [ZLIB_DEFINES=],
diff --git a/Build/source/libs/zlib/include/Makefile.in b/Build/source/libs/zlib/include/Makefile.in
index fef0d4eb59f..0e86106573c 100644
--- a/Build/source/libs/zlib/include/Makefile.in
+++ b/Build/source/libs/zlib/include/Makefile.in
@@ -78,6 +78,7 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
+OTHER_TREE = @OTHER_TREE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -91,7 +92,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WITH_UNISTD = @WITH_UNISTD@
 ZLIB_DEFINES = @ZLIB_DEFINES@
 ZLIB_TREE = @ZLIB_TREE@
 abs_builddir = @abs_builddir@
diff --git a/Build/source/libs/zlib/zlib-1.2.4-PATCHES/TL-Changes b/Build/source/libs/zlib/zlib-1.2.4-PATCHES/TL-Changes
new file mode 100644
index 00000000000..d3f7322b2b5
--- /dev/null
+++ b/Build/source/libs/zlib/zlib-1.2.4-PATCHES/TL-Changes
@@ -0,0 +1,51 @@
+Changes applied to the zlib-1.2.4/ tree as obtained from:
+	http://zlib.net/zlib-1.2.4.tar.bz2
+
+Removed:
+	zconf.h
+
+Converted Dos/Win line ends to native:
+	contrib/dotzlib/DotZLib/AssemblyInfo.cs
+	contrib/dotzlib/DotZLib/ChecksumImpl.cs
+	contrib/dotzlib/DotZLib/CircularBuffer.cs
+	contrib/dotzlib/DotZLib/CodecBase.cs
+	contrib/dotzlib/DotZLib/Deflater.cs
+	contrib/dotzlib/DotZLib/DotZLib.cs
+	contrib/dotzlib/DotZLib/DotZLib.csproj
+	contrib/dotzlib/DotZLib/GZipStream.cs
+	contrib/dotzlib/DotZLib/Inflater.cs
+	contrib/dotzlib/DotZLib/UnitTests.cs
+	contrib/dotzlib/DotZLib.sln
+	contrib/dotzlib/LICENSE_1_0.txt
+	contrib/dotzlib/readme.txt
+	contrib/gcc_gvmat64/gvmat64.S
+	contrib/masmx64/bld_ml64.bat
+	contrib/masmx64/gvmat64.asm
+	contrib/masmx64/inffas8664.c
+	contrib/masmx64/inffasx64.asm
+	contrib/masmx64/readme.txt
+	contrib/masmx86/bld_ml32.bat
+	contrib/masmx86/inffas32.asm
+	contrib/masmx86/match686.asm
+	contrib/masmx86/readme.txt
+	contrib/testzlib/testzlib.c
+	contrib/testzlib/testzlib.txt
+	contrib/vstudio/readme.txt
+	contrib/vstudio/vc10/zlib.rc
+	contrib/vstudio/vc10/zlibvc.def
+	contrib/vstudio/vc10/zlibvc.sln
+	contrib/vstudio/vc9/zlib.rc
+	contrib/vstudio/vc9/zlibvc.def
+	contrib/vstudio/vc9/zlibvc.sln
+	projects/visualc6/README.txt
+	projects/visualc6/example.dsp
+	projects/visualc6/minigzip.dsp
+	projects/visualc6/zlib.dsp
+	projects/visualc6/zlib.dsw
+
+Added newline at end of file:
+	contrib/dotzlib/DotZLib/ChecksumImpl.cs
+	contrib/dotzlib/DotZLib/UnitTests.cs
+	contrib/dotzlib/LICENSE_1_0.txt
+	contrib/testzlib/testzlib.txt
+