From ccec786ca73f38eaf99ff09b3990a1918530b956 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@acm.org>
Date: Wed, 27 Feb 2013 13:36:08 -0600
Subject: [PATCH] [libpng16] Revised scripts/dfn.awk to work with the buggy
 MSYS awk that has

trouble with CRLF line endings.
---
 ANNOUNCE        | 6 ++++--
 CHANGES         | 4 +++-
 scripts/dfn.awk | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index a2c8bc186..a91a019e2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.1beta04 - February 23, 2013
+Libpng 1.6.1beta04 - February 27, 2013
 
 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.
@@ -58,9 +58,11 @@ Version 1.6.1beta03 [February 22, 2013]
     for it on then the build will fail if it can't be done.)
   Updated the INSTALL document.
 
-Version 1.6.1beta04 [February 23, 2013]
+Version 1.6.1beta04 [February 27, 2013]
   Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
   Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
+  Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble
+    with CRLF line endings.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 670f9ffc5..00715ee08 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4415,9 +4415,11 @@ Version 1.6.1beta03 [February 22, 2013]
     for it on then the build will fail if it can't be done.)
   Updated the INSTALL document.
 
-Version 1.6.1beta04 [February 23, 2013]
+Version 1.6.1beta04 [February 27, 2013]
   Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
   Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
+  Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble
+    with CRLF line endings.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/dfn.awk b/scripts/dfn.awk
index 8a5dab6f9..910704594 100644
--- a/scripts/dfn.awk
+++ b/scripts/dfn.awk
@@ -31,11 +31,11 @@ NR==1 && out == "/dev/null" {
 
 # Output can be sorted; two lines are recognized
 $1 == "PNG_DFN_START_SORT"{
-   sort=$2
+   sort=0+$2
    next
 }
 
-$1 == "PNG_DFN_END_SORT"{
+$1 ~ /^PNG_DFN_END_SORT/{
    # Do a very simple, slow, sort; notice that blank lines won't be
    # output by this
    for (entry in array) {