[devel] Revise references to zlib-libpng license
diff --git a/LICENSE b/LICENSE
index 35f276e..ba27064 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,6 +8,8 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
+This code is released under the zlib-libpng license.
+
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are
Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index 9641601..86c6887 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -3,7 +3,8 @@
* Copyright (c) 2007, 2009 Glenn Randers-Pehrson
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
*/
diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h
index 9f2020e..9c6310f 100644
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -3,7 +3,8 @@
* Copyright (c) 2007, 2009 Glenn Randers-Pehrson
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
*/
diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h
index cbbf81d..6ea9d2c 100644
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -3,7 +3,8 @@
* Copyright (c) 2007, 2009 Glenn Randers-Pehrson
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
*/
diff --git a/example.c b/example.c
index a647b06..2571b14 100644
--- a/example.c
+++ b/example.c
@@ -7,7 +7,6 @@
* Maintained 1998-2009 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
* Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
*/
/* This is an example of how to use libpng to read and write PNG files.
diff --git a/libpng-1.4.0beta65.txt b/libpng-1.4.0beta65.txt
index 2a97dd3..ef113b7 100644
--- a/libpng-1.4.0beta65.txt
+++ b/libpng-1.4.0beta65.txt
@@ -4,8 +4,10 @@
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
- For conditions of distribution and use, see copyright
- notice in png.h.
+
+ This document is released under the zlib-libpng license.
+ For conditions of distribution and use, see copyright notice, disclaimer,
+ and license in png.h
Based on:
diff --git a/libpng.3 b/libpng.3
index d07699a..7f83518 100644
--- a/libpng.3
+++ b/libpng.3
@@ -813,8 +813,10 @@
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
- For conditions of distribution and use, see copyright
- notice in png.h.
+
+ This document is released under the zlib-libpng license.
+ For conditions of distribution and use, see copyright notice, disclaimer,
+ and license in png.h
Based on:
@@ -4205,6 +4207,8 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
+This code is released under the zlib-libpng license.
+
libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are
Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
diff --git a/png.c b/png.c
index 659a216..aabb3b9 100644
--- a/png.c
+++ b/png.c
@@ -7,8 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
#define PNG_NO_EXTERN
diff --git a/pngconf.h b/pngconf.h
index db99dba..90f4ec3 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -8,7 +8,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
*/
diff --git a/pngerror.c b/pngerror.c
index 9a51d26..8fa0c32 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file provides a location for all error handling. Users who
* need special error handling are expected to write replacement functions
diff --git a/pngget.c b/pngget.c
index 632d325..7ebf754 100644
--- a/pngget.c
+++ b/pngget.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
*/
diff --git a/pngmem.c b/pngmem.c
index eca9a2c..14927f7 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file provides a location for all memory allocation. Users who
* need special memory handling are expected to supply replacement
diff --git a/pngpread.c b/pngpread.c
index ecef57c..69153ed 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -7,8 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
#include "png.h"
diff --git a/pngpriv.h b/pngpriv.h
index 33d1e97..4bce9c5 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -8,8 +8,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
/* The symbols declared in this file (including the functions declared
diff --git a/pngread.c b/pngread.c
index f225039..b550be6 100644
--- a/pngread.c
+++ b/pngread.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file contains routines that an application calls directly to
* read a PNG file or stream.
diff --git a/pngrio.c b/pngrio.c
index b44229c..f9fa69e 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file provides a location for all input. Users who need
* special handling are expected to write a function that has the same
diff --git a/pngrtran.c b/pngrtran.c
index f1a2b6a..52d8913 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file contains functions optionally called by an application
* in order to tell libpng how to handle data when reading a PNG.
diff --git a/pngrutil.c b/pngrutil.c
index 027a85a..a26592b 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file contains routines that are only called from within
* libpng itself during the course of reading an image.
diff --git a/pngset.c b/pngset.c
index 071b026..27e8368 100644
--- a/pngset.c
+++ b/pngset.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* The functions here are used during reads to store data from the file
* into the info struct, and during writes to store application data
diff --git a/pngtest.c b/pngtest.c
index 8f5c1b0..be1dfaa 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This program reads in a PNG image, writes it out again, and then
* compares the two files. If the files are identical, this shows that
diff --git a/pngtrans.c b/pngtrans.c
index cd9730a..094d5b5 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -7,8 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
#include "png.h"
diff --git a/pngwio.c b/pngwio.c
index 0e7e8d0..c3a0996 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -7,7 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*
* This file provides a location for all output. Users who need
* special handling are expected to write functions that have the same
diff --git a/pngwrite.c b/pngwrite.c
index 6d09f75..87b0f06 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -7,8 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
/* get internal access to png.h */
diff --git a/pngwtran.c b/pngwtran.c
index 5fd0962..a69ad50 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -7,8 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
#include "png.h"
diff --git a/pngwutil.c b/pngwutil.c
index fa99320..9e90933 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -7,8 +7,8 @@
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* This code is released under the zlib-libpng license.
- * For conditions of distribution and use, see copyright notice in png.h
- *
+ * For conditions of distribution and use, see copyright notice, disclaimer,
+ * and license in png.h
*/
#include "png.h"
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index a2c3a66..41adf35 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -4,7 +4,8 @@
# Copyright (C) 2007 Glenn Randers-Pehrson
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 4)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 865ca76..dc60211 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -6,7 +6,8 @@
# Copyright (C) 2002 Glenn Randers-Pehrson
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Modeled after libxml-config.
diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in
index ed017e5..557b9c8 100755
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -6,7 +6,8 @@
# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Modeled after libxml-config.
diff --git a/scripts/libpng.icc b/scripts/libpng.icc
index c2a8862..a9e932f 100644
--- a/scripts/libpng.icc
+++ b/scripts/libpng.icc
@@ -3,7 +3,8 @@
// Copyright (C) 2000 Cosmin Truta
//
// This code is released under the zlib-libpng license.
-// For conditions of distribution and use, see copyright notice in png.h
+// For conditions of distribution and use, see copyright notice, disclaimer,
+// and license in png.h
//
// Notes:
// All modules are compiled in C mode
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 6bbebf7..8626f7b 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -5,7 +5,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME=libpng14
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index 22e2ab0..09a9c3e 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -5,7 +5,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME=libpng14
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 00f8ae4..8bb2696 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -5,7 +5,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Location of the zlib library and include files
ZLIBINC = ../zlib
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga
index f39c5b3..e181b3d 100644
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -3,7 +3,8 @@
# Copyright (C) 1995-2000 Wolf Faust
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h
#
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index 6a8ea63..1a6f6cb 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# modified for LC56/ATARI assumes libz.lib is in same dir and uses default
# rules for library management
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index ab41654..3408f6c 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -5,7 +5,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME=libpng14
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index f65efc1..9b3fbfa 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -9,7 +9,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# This makefile intends to support building outside the src directory
# if desired. When invoking it, specify an argument to SRCDIR on the
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 1bc3527..338d581 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -6,7 +6,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h
prefix=/usr/local
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index ed115a4..35aa08f 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
PNGMAJ = 14
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index 1b33c4a..539d4de 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# where make install will put libpng.a and png.h
#prefix=/usr/local
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 3e2bd9c..54f0c41 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -4,7 +4,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Modified for Debian by Junichi Uekawa and Josselin Mouette
# Major modifications are:
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index de0b625..5c4fb00 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -2,7 +2,8 @@
# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
PREFIX?= /usr/local
SHLIB_VER?= %SONUM%
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index a7c4548..16bdf96 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -4,7 +4,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Location of the zlib library and include files
ZLIBINC = ../zlib
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index f84b235..038639b 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -4,7 +4,8 @@
# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Where the zlib library and include files are located
ZLIBLIB=/opt/zlib/lib
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index cc69760..419e1c4 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -5,7 +5,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME = libpng14
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index cf828ec..b13df0b 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -4,7 +4,8 @@
# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Where the zlib library and include files are located
ZLIBLIB=/opt/zlib/lib
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index 4b3ecfd..30f7b7c 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -4,7 +4,8 @@
# Copyright (C) 2000 Cosmin Truta
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# Notes:
# Derived from makefile.std
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 24771ad..960a674 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -6,7 +6,8 @@
# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# To use, do "nmake /f scripts\makefile.intel"
#
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 2ad0f88..9778114 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# This makefile requires the file ansi2knr.c, which you can get
# from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index e2f8ad5..e264609 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -4,7 +4,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME = libpng14
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index d5d4e01..06ca502 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -9,7 +9,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Built from makefile.cygwin
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index 6bb5f14..dcd9f42 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 9416c4e..da1008a 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -3,7 +3,8 @@
# Copyright (C) 2006, 2009 Glenn Randers-Pehrson
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index b550bb8..4595f73 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -5,7 +5,8 @@
# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# You should also run makefile.netbsd
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index 8ed6812..dacb78f 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -5,7 +5,8 @@
# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# You should also run makefile.ne0bsd
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx
index 01599b5..4d716d0 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -4,7 +4,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME = libpng14
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index d0c9598..ae00bab 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -3,7 +3,8 @@
# Copyright (C) 2007-2008 Glenn Randers-Pehrson
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
PREFIX?= /usr/local
LIBDIR= ${PREFIX}/lib
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2
index c250445..f716c3f 100644
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -1,7 +1,8 @@
# makefile for libpng on OS/2 with gcc
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Related files: pngos2.def
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 515394a..993e68b 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -6,7 +6,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME = libpng14
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 3ed864f..5bb26cf 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME=libpng14
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index bde27c1..d395e65 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME=libpng14
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index cfb9660..0942a95 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -6,7 +6,8 @@
# Copyright (C) 1996-1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
PNGMAJ = 14
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index a8a9f9c..377cde1 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -5,7 +5,8 @@
# Copyright (C) 1996, 1997 Andreas Dilger
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# Library name:
LIBNAME = libpng14
diff --git a/scripts/makefile.std b/scripts/makefile.std
index b720bd6..fdb7ecf 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index 3711bb7..2bdcb64 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -3,7 +3,8 @@
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index f368625..470be47 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -3,7 +3,8 @@
# Copyright (C) 1998 Tim Wegner
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcawin32"
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 9fb7cae..e177343 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -3,7 +3,8 @@
# Copyright (C) 2006,2009 Glenn Randers-Pehrson
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
#
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcwin32"
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom
index c54fb97..89c0cd6 100644
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -5,7 +5,8 @@
# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
# To use, do "wmake /f scripts\makefile.watcom"
diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc
index 8e6a613..494540e 100644
--- a/scripts/smakefile.ppc
+++ b/scripts/smakefile.ppc
@@ -3,7 +3,8 @@
# Copyright (C) 1998 by Andreas R. Kleinert
#
# This code is released under the zlib-libpng license.
-# For conditions of distribution and use, see copyright notice in png.h
+# For conditions of distribution and use, see copyright notice, disclaimer,
+# and license in png.h
CC = scppc
CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \