[devel] Revise references to zlib/libpng license

2009-06-25 13:43:50 -05:00 · 2009-06-25 13:43:50 -05:00 · c332bbcd34
commit c332bbcd34
parent e0dc4c8a1e
63 changed files with 63 additions and 64 deletions
--- a/libpng-1.4.0beta65.txt
+++ b/libpng-1.4.0beta65.txt
@ -6,7 +6,7 @@ libpng.txt - A description on how to use and modify libpng
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

 This document is released under the zlib/libpng license.
- For conditions of distribution and use, see copyright notice, disclaimer,
+ For conditions of distribution and use, see the disclaimer
 and license in png.h

 Based on:
--- a/libpng.3
+++ b/libpng.3
@ -815,7 +815,7 @@ libpng.txt - A description on how to use and modify libpng
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

 This document is released under the zlib/libpng license.
- For conditions of distribution and use, see copyright notice, disclaimer,
+ For conditions of distribution and use, see the disclaimer
 and license in png.h

 Based on:
--- a/png.c
+++ b/png.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/pngconf.h
+++ b/pngconf.h
@ -8,7 +8,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 */
--- a/pngerror.c
+++ b/pngerror.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file provides a location for all error handling.  Users who
--- a/pngget.c
+++ b/pngget.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 */
--- a/pngmem.c
+++ b/pngmem.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file provides a location for all memory allocation.  Users who
--- a/pngpread.c
+++ b/pngpread.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/pngpriv.h
+++ b/pngpriv.h
@ -8,7 +8,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/pngread.c
+++ b/pngread.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file contains routines that an application calls directly to
--- a/pngrio.c
+++ b/pngrio.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file provides a location for all input.  Users who need
--- a/pngrtran.c
+++ b/pngrtran.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file contains functions optionally called by an application
--- a/pngrutil.c
+++ b/pngrutil.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file contains routines that are only called from within
--- a/pngset.c
+++ b/pngset.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * The functions here are used during reads to store data from the file
--- a/pngtest.c
+++ b/pngtest.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This program reads in a PNG image, writes it out again, and then
--- a/pngtrans.c
+++ b/pngtrans.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/pngwio.c
+++ b/pngwio.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 *
 * This file provides a location for all output.  Users who need
--- a/pngwrite.c
+++ b/pngwrite.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/pngwtran.c
+++ b/pngwtran.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/pngwutil.c
+++ b/pngwutil.c
@ -7,7 +7,7 @@
 * (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, disclaimer,
+ * For conditions of distribution and use, see the disclaimer
 * and license in png.h
 */

--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@ -4,7 +4,7 @@ project(PNG)
 # Copyright (C) 2007 Glenn Randers-Pehrson

 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 set(PNGLIB_MAJOR 1)
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@ -6,7 +6,7 @@
 # Copyright (C) 2002 Glenn Randers-Pehrson

 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Modeled after libxml-config.
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@ -6,7 +6,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Modeled after libxml-config.
--- a/scripts/libpng.icc
+++ b/scripts/libpng.icc
@ -3,7 +3,7 @@
 // Copyright (C) 2000 Cosmin Truta
 //
 // This code is released under the zlib/libpng license.
-// For conditions of distribution and use, see copyright notice, disclaimer,
+// For conditions of distribution and use, see the disclaimer
 // and license in png.h
 //
 // Notes:
@ -11,7 +11,6 @@
 //   Tested with IBM VAC++ 4.0 under Win32
 //   Expected to work with IBM VAC++ 4.0 or later under OS/2 and Win32
 //   Can be easily adapted for IBM VAC++ 4.0 or later under AIX
-// For conditions of distribution and use, see copyright notice in png.h

 option incl(searchpath, "../zlib"), opt(level, "2"),
 link(libsearchpath, "../zlib")
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger

 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger

 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@ -5,7 +5,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Location of the zlib library and include files
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@ -3,7 +3,7 @@
 # Copyright (C) 1995-2000 Wolf Faust
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # modified for LC56/ATARI assumes libz.lib is in same dir and uses default
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@ -9,7 +9,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # This makefile intends to support building outside the src directory
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@ -6,7 +6,7 @@
 #  Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # where make install will put libpng.a and png.h
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@ -4,7 +4,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Modified for Debian by Junichi Uekawa and Josselin Mouette
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@ -2,7 +2,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 PREFIX?=        /usr/local
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@ -4,7 +4,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Location of the zlib library and include files
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@ -4,7 +4,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Where the zlib library and include files are located
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@ -4,7 +4,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Where the zlib library and include files are located
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@ -4,7 +4,7 @@
 # Copyright (C) 2000 Cosmin Truta
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Notes:
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@ -6,7 +6,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # To use, do "nmake /f scripts\makefile.intel"
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # This makefile requires the file ansi2knr.c, which you can get
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@ -4,7 +4,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@ -9,7 +9,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Built from makefile.cygwin
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # where make install puts libpng.a and png.h
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@ -5,7 +5,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # You should also run makefile.netbsd
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@ -5,7 +5,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # You should also run makefile.ne0bsd
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@ -4,7 +4,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 PREFIX?= /usr/local
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@ -1,7 +1,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Related files: pngos2.def
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@ -6,7 +6,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@ -6,7 +6,7 @@
 # Copyright (C) 1996-1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@ -5,7 +5,7 @@
 # Copyright (C) 1996, 1997 Andreas Dilger
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # Library name:
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # where make install puts libpng.a and png.h
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # where make install puts libpng.a and png.h
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@ -3,7 +3,7 @@
 # Copyright (C) 1998 Tim Wegner
 #
 # This code is released under the zlib/libpng license.
-# For conditions of distribution and use, see copyright notice, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h
 #
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@ -5,7 +5,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 # To use, do "wmake /f scripts\makefile.watcom"
--- a/scripts/smakefile.ppc
+++ b/scripts/smakefile.ppc
@ -3,7 +3,7 @@
 # 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, disclaimer,
+# For conditions of distribution and use, see the disclaimer
 # and license in png.h

 CC       = scppc