[libpng16] Imported from libpng-1.6.9beta04.tarv1.6.9beta04

53 files changed, 139 insertions, 62 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index b3a2a88bd..8535c19a7 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.9beta04 - January 14, 2014
+Libpng 1.6.9beta04 - January 20, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -63,7 +63,7 @@ Version 1.6.9beta02 [January 1, 2014]
 Version 1.6.9beta03 [January 10, 2014]
   Removed potentially misleading warning from png_check_IHDR().
 
-Version 1.6.9beta04 [January 14, 2014]
+Version 1.6.9beta04 [January 20, 2014]
   Updated scripts/makefile.* to use CPPFLAGS (Cosmin).
   Added clang attribute support (Cosmin).
 
diff --git a/CHANGES b/CHANGES
index 8c3a8151c..50fae3606 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4788,7 +4788,7 @@ Version 1.6.9beta02 [January 1, 2014]
 Version 1.6.9beta03 [January 10, 2014]
   Removed potentially misleading warning from png_check_IHDR().
 
-Version 1.6.9beta04 [January 14, 2014]
+Version 1.6.9beta04 [January 20, 2014]
   Updated scripts/makefile.* to use CPPFLAGS (Cosmin).
   Added clang attribute support (Cosmin).
 
diff --git a/LICENSE b/LICENSE
index 3459f1cec..0494103e7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.6.9beta04, January 12, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.9beta04, January 20, 2014, are
 Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-January 12, 2014
+January 20, 2014
diff --git a/README b/README
index 7100b754d..ab0997365 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.9beta04 - January 12, 2014 (shared library 16.0)
+README for libpng version 1.6.9beta04 - January 20, 2014 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
diff --git a/contrib/gregbook/Makefile.mingw32.diff b/contrib/gregbook/Makefile.mingw32.diff
new file mode 100644
index 000000000..795d18d66
--- /dev/null
+++ b/contrib/gregbook/Makefile.mingw32.diff
@@ -0,0 +1,13 @@
+50c50,51
+< CFLAGS = -O -Wall $(INCS) $(MINGW_CCFLAGS)
+---
+> CPPFLAGS = $(INCS)
+> CFLAGS = -O -Wall $(MINGW_CCFLAGS)
+88c89
+< 	$(CC) -c $(CFLAGS) $<
+---
+> 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+91c92
+< 	$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
+---
+> 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
diff --git a/contrib/gregbook/Makefile.sgi.diff b/contrib/gregbook/Makefile.sgi.diff
new file mode 100644
index 000000000..9cab204fb
--- /dev/null
+++ b/contrib/gregbook/Makefile.sgi.diff
@@ -0,0 +1,9 @@
+56c56,57
+< ABI=
+---
+> ABI =
+> CPPFLAGS =
+76c77
+< 	$(CC) -c $(CFLAGS) $<
+---
+> 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/contrib/gregbook/Makefile.unx.diff b/contrib/gregbook/Makefile.unx.diff
new file mode 100644
index 000000000..9b0aa8221
--- /dev/null
+++ b/contrib/gregbook/Makefile.unx.diff
@@ -0,0 +1,9 @@
+67c67,68
+< CFLAGS = -O -Wall $(INCS) -DFEATURE_LOOP
+---
+> CPPFLAGS = $(INCS) -DFEATURE_LOOP
+> CFLAGS = -O -Wall
+95c96
+< 	$(CC) -c $(CFLAGS) $<
+---
+> 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/contrib/gregbook/Makefile.w32.diff b/contrib/gregbook/Makefile.w32.diff
new file mode 100644
index 000000000..c2d65d0ec
--- /dev/null
+++ b/contrib/gregbook/Makefile.w32.diff
@@ -0,0 +1,9 @@
+56c56,57
+< CFLAGS = -nologo -O -W3 $(INCS) $(cvars)
+---
+> CPPFLAGS = $(INCS)
+> CFLAGS = -nologo -O -W3 $(cvars)
+79c80
+< 	$(CC) -c $(CFLAGS) $<
+---
+> 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 2c14257d7..f9c6cbc4c 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.9beta04 - January 12, 2014
+ libpng version 1.6.9beta04 - January 20, 2014
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.9beta04 - January 12, 2014
+ libpng versions 0.97, January 1998, through 1.6.9beta04 - January 20, 2014
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
 
@@ -5232,7 +5232,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 XVI. Y2K Compliance in libpng
 
-January 12, 2014
+January 20, 2014
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
diff --git a/libpng.3 b/libpng.3
index abc4e82de..64c37d0a6 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "January 12, 2014"
+.TH LIBPNG 3 "January 20, 2014"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.9beta04
 .SH SYNOPSIS
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.9beta04 - January 12, 2014
+ libpng version 1.6.9beta04 - January 20, 2014
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.9beta04 - January 12, 2014
+ libpng versions 0.97, January 1998, through 1.6.9beta04 - January 20, 2014
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2013 Glenn Randers-Pehrson
 
@@ -5737,7 +5737,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XVI. Y2K Compliance in libpng
 
-January 12, 2014
+January 20, 2014
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
@@ -6028,7 +6028,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.9beta04 - January 12, 2014:
+Libpng version 1.6.9beta04 - January 20, 2014:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6051,7 +6051,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.6.9beta04, January 12, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.9beta04, January 20, 2014, are
 Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -6150,7 +6150,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-January 12, 2014
+January 20, 2014
 
 .\" end of man page
 
diff --git a/libpngpf.3 b/libpngpf.3
index a5ec93330..0fff17ed9 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "January 12, 2014"
+.TH LIBPNGPF 3 "January 20, 2014"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.9beta04
 (private functions)
diff --git a/png.5 b/png.5
index 53590d2bc..dc9938537 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 12, 2014"
+.TH PNG 5 "January 20, 2014"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index 893305079..c24de6cf5 100644
--- a/png.c
+++ b/png.c
@@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.6.9beta04 - January 12, 2014" PNG_STRING_NEWLINE \
+     "libpng version 1.6.9beta04 - January 20, 2014" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.6.9beta04 - January 12, 2014\
+      return "libpng version 1.6.9beta04 - January 20, 2014\
       Copyright (c) 1998-2014 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
diff --git a/png.h b/png.h
index 8dbbbe311..f6d06692f 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.9beta04 - January 12, 2014
+ * libpng version 1.6.9beta04 - January 20, 2014
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.9beta04 - January 12, 2014: Glenn
+ *   libpng versions 0.97, January 1998, through 1.6.9beta04 - January 20, 2014: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -221,7 +221,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.6.9beta04, January 12, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.9beta04, January 20, 2014, are
  * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -333,7 +333,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    January 12, 2014
+ *    January 20, 2014
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -401,7 +401,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.6.9beta04"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.6.9beta04 - January 12, 2014\n"
+     " libpng version 1.6.9beta04 - January 20, 2014\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
diff --git a/pngconf.h b/pngconf.h
index 927826271..72be972a8 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.9beta04 - January 14, 2014
+ * libpng version 1.6.9beta04 - January 20, 2014
  *
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index f0ac39e86..876255e26 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.9beta04 - January 12, 2014
+libpng version 1.6.9beta04 - January 20, 2014
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 11da5599d..bae8b0319 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.9beta04 - January 12, 2014
+ * libpng version 1.6.9beta04 - January 20, 2014
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
diff --git a/scripts/README.txt b/scripts/README.txt
index 1b5ee720e..889b587c8 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
 
-Makefiles for  libpng version 1.6.9beta04 - January 12, 2014
+Makefiles for  libpng version 1.6.9beta04 - January 20, 2014
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
diff --git a/scripts/make-list b/scripts/make-list
new file mode 100644
index 000000000..0dff589f3
--- /dev/null
+++ b/scripts/make-list
@@ -0,0 +1,36 @@
+makefile.solaris-x86
+makefile.solaris
+makefile.so9
+makefile.sgi
+makefile.sggcc
+makefile.sco
+makefile.linux
+makefile.hpux
+makefile.hpgcc
+makefile.hp64
+makefile.elf
+makefile.dec
+makefile.beos
+makefile.64sunu
+makefile.32sunu
+makefile.darwin
+makefile.msys
+makefile.gcc
+makefile.vcwin32
+makefile.aix
+makefile.tc3
+makefile.sunos
+makefile.std
+makefile.openbsd
+makefile.netbsd
+makefile.ne12bsd
+makefile.msc
+makefile.mips
+makefile.knr
+makefile.intel
+makefile.ibmc
+makefile.freebsd
+makefile.dj2
+makefile.bor
+makefile.bc32
+makefile.atari
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 04e005bb6..c6e7fed0a 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -1,6 +1,6 @@
 # makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index e5e65cd9e..618629009 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -1,6 +1,6 @@
 # makefile for libpng on Solaris 2.x with cc
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 5cc0f8750..5f62d50af 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -1,5 +1,5 @@
 # makefile for libpng using gcc (generic, static library)
-# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006-2009, 2014 Glenn Randers-Pehrson
 # Copyright (C) 2000 Cosmin Truta
 # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index 8de5e0c2e..051d3036e 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -1,5 +1,5 @@
 # makefile for libpng
-# Copyright (C) 2002 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 3f06e44d0..f897d1144 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -1,6 +1,6 @@
 # makefile for libpng on BeOS x86 ELF with gcc
 # modified from makefile.linux by Sander Stoks
-# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2008, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 2c773d03e..7c38c2652 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -1,5 +1,5 @@
 # makefile for libpng on Darwin / Mac OS X
-# Copyright (C) 2002, 2004, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2004, 2006, 2008, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index bc2966a0f..1ba9efbad 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -1,5 +1,5 @@
 # makefile for libpng on DEC Alpha Unix
-# Copyright (C) 2000-2002, 2006, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2000-2002, 2006, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index d9071b6d9..a43f34a14 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -1,5 +1,5 @@
 # DJGPP (DOS gcc) makefile for libpng
-# Copyright (C) 2002, 2006, 2009-2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2009-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index b1283a3cf..6da6d4ae3 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng16.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2014 Greg Roelofs
 # and Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 9aa405466..03a15df6c 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -1,4 +1,5 @@
 # makefile for libpng under FreeBSD
+# Copyright (C) 2014 Glenn Randers-Pehrson and Andrey A. Chernov
 # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index 1772371c6..a592294fc 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -1,5 +1,5 @@
 # makefile for libpng using gcc (generic, static library)
-# Copyright (C) 2008 Glenn Randers-Pehrson
+# Copyright (C) 2008, 2014 Glenn Randers-Pehrson
 # Copyright (C) 2000 Cosmin Truta
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 4ee37505f..6c15a0bde 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -1,5 +1,5 @@
 # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
-# Copyright (C) 1999-2002, 2006, 2009, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 1999-2002, 2006, 2009, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index bc833ce39..67d8f42a6 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -1,5 +1,5 @@
 # makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
-# Copyright (C) 2002, 2006-2008, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006-2008, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 2001, Laurent faillie
 # Copyright (C) 1998, 1999 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index ce10bfc08..bef2e2397 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -1,5 +1,5 @@
 # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
-# Copyright (C) 1999-2002, 2006, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 1999-2002, 2006, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42
 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
 #
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index a56fa3599..861a55157 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -1,6 +1,6 @@
 # Makefile for libpng (static)
 # IBM C version 3.x for Win32 and OS/2
-# Copyright (C) 2006 Glenn Randers-Pehrson
+# Copyright (C) 2006, 2014 Glenn Randers-Pehrson
 # Copyright (C) 2000 Cosmin Truta
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 941eec566..1abfc6ed6 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -1,7 +1,7 @@
 # Makefile for libpng
 # Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later
 
-# Copyright (C) 2006 Glenn Randers-Pehrson
+# Copyright (C) 2006, 2014 Glenn Randers-Pehrson
 # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
 # copyright 1995 Guy Eric Schalnat, Group 42, Inc.
 #
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index a7407781e..720921517 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -1,5 +1,5 @@
 # makefile for libpng
-# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2009, 2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 92fb1d4b5..57272498f 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng16.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2014 Greg Roelofs and
 # Glenn Randers-Pehrson
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index 5d1b7718a..a0df0018a 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -1,5 +1,5 @@
 # makefile for libpng
-# Copyright (C) Glenn Randers-Pehrson
+# Copyright (C) 1998-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 50b36c73a..905ed72c5 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -1,6 +1,6 @@
 # makefile for libpng
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# Copyright (C) 2006, 2009 Glenn Randers-Pehrson
+# Copyright (C) 2006, 2009, 2014 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
diff --git a/scripts/makefile.msys b/scripts/makefile.msys
index b2bb245f8..0a5727f14 100644
--- a/scripts/makefile.msys
+++ b/scripts/makefile.msys
@@ -2,7 +2,7 @@
 # Copyright (C) 2012 Glenn Randers-Pehrson and Christopher M. Wheeler
 #
 # Portions taken from makefile.linux:
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs and
+# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2014 Greg Roelofs and
 # Glenn Randers-Pehrson
 # Copyright (C) 2000 Cosmin Truta
 # Copyright (C) 1996, 1997 Andreas Dilger
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 95921dbb2..cd2d1a1b5 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -2,7 +2,7 @@
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
-# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
+# Copyright (C) 2007, 2009, 2014 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 4a5f8ec72..257118eaf 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -2,7 +2,7 @@
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
-# Copyright (C) 2007-2009 Glenn Randers-Pehrson
+# Copyright (C) 2007-2009, 2014 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index ca7c7ae7e..1ceb4ad28 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -1,6 +1,6 @@
 # makefile for libpng
+# Copyright (C) 2007-2009, 2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# Copyright (C) 2007-2009 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 4d487bc0a..a8de13f09 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -1,7 +1,7 @@
 # makefile for SCO OSr5  ELF and Unixware 7 with Native cc
 # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
 #   force ELF build dynamic linking, SONAME setting in lib and RPATH in app
-# Copyright (C) 2002, 2006, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 9efdd4ae0..a2c203e3e 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng16.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002, 2006, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2001-2002, 2006, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 915befa15..96c61b089 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -1,5 +1,5 @@
 # makefile for libpng.a and libpng16.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002, 2006, 2007, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2001-2002, 2006, 2007, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index be1a38bc0..67821f8a9 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -1,7 +1,7 @@
 # makefile for libpng on Solaris 9 (beta) with Forte cc
 # Updated by Chad Schrock for Solaris 9
 # Contributed by William L. Sebok, based on makefile.linux
-# Copyright (C) 2002, 2006, 2008, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2008, 2010-2014 Glenn Randers-Pehrson
 # Copyright (C) 1998-2001 Greg Roelofs
 # Copyright (C) 1996-1997 Andreas Dilger
 #
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 1451da4e2..813219966 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -1,5 +1,5 @@
 # makefile for libpng on Solaris 2.x with gcc
-# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2004, 2006-2008, 2010-2014 Glenn Randers-Pehrson
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index fe6849f51..8d2414852 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -1,5 +1,5 @@
 # makefile for libpng on Solaris 2.x with gcc
-# Copyright (C) 2004, 2006-2008, 2010-2011 Glenn Randers-Pehrson
+# Copyright (C) 2004, 2006-2008, 2010-2014 Glenn Randers-Pehrson
 # Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
diff --git a/scripts/makefile.std b/scripts/makefile.std
index f680ea6bc..30a21e23f 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -1,5 +1,5 @@
 # makefile for libpng
-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index 2ef794389..bc5f9267b 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -1,5 +1,5 @@
 # makefile for libpng
-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006, 2014 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 #
 # This code is released under the libpng license.
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 4732c0df0..b26c4acc7 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -1,6 +1,6 @@
 # makefile for libpng
 # Copyright (C) 1998 Tim Wegner
-# Copyright (C) 2006,2009,2011 Glenn Randers-Pehrson
+# Copyright (C) 2006,2009,2011,2014 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 3a9804ec9..7d21102c5 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.9beta04 - January 12, 2014 */
+/* Libpng version 1.6.9beta04 - January 20, 2014 */
 
 /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */