4 files changed, 11 insertions, 99 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 9de7373478d5..ef3de27efad4 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,33 +6,22 @@
 #
 
 PORTNAME=	png
-PORTVERSION=	1.2.5
-PORTREVISION=	8
+PORTVERSION=	1.2.6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=	libpng-patch00-pngrtran-filler-RRGGBB-overflow.txt \
-		libpng-patch01-pngrtran-filler-GG-overflow.txt \
-		libpng-patch02-pngerror-memcpy-overflow.txt \
-		libpng-patch03-trns-chunk-overflow.txt \
-		libpng-patch04-get-uint-31.txt \
-		libpng-patch05-pngpread-chunklength.txt \
-		libpng-patch06-pngread-chunklength.txt \
-		libpng-patch07-png-read-png-overflow.txt \
-		libpng-patch08-splt-buffer-overflow.txt \
-		libpng-patch09-null-iccp-profile.txt \
-		libpng-patch10-find-duplicate-chunk.txt \
-		libpng-patch11-limit-dimensions.txt
+PATCHFILES=	libpng-1.2.6-patch-pngwutil.txt
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	Library for manipulating PNG images
 
 MAKEFILE=       ${WRKSRC}/scripts/makefile.freebsd
-ALL_TARGET=	all test
+# "test" target not works after libpng-1.2.6-patch-pngwutil.txt
+ALL_TARGET=	all #test
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	5
 
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 504a0b67ccde..70db3d70e56e 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,26 +1,4 @@
-MD5 (libpng-1.2.5.tar.gz) = 0cec860559f2f5f7145da3c6851bacb7
-SIZE (libpng-1.2.5.tar.gz) = 505988
-MD5 (libpng-patch00-pngrtran-filler-RRGGBB-overflow.txt) = 1e49d90ffa33c25b5af90311fe022436
-SIZE (libpng-patch00-pngrtran-filler-RRGGBB-overflow.txt) = 1105
-MD5 (libpng-patch01-pngrtran-filler-GG-overflow.txt) = e233371ec0a57d2bfa462dac6d5d089d
-SIZE (libpng-patch01-pngrtran-filler-GG-overflow.txt) = 1081
-MD5 (libpng-patch02-pngerror-memcpy-overflow.txt) = cacaea50d5c6a0e6b2876c50d79b50d3
-SIZE (libpng-patch02-pngerror-memcpy-overflow.txt) = 1232
-MD5 (libpng-patch03-trns-chunk-overflow.txt) = 91697e957e08e26aac2178a25f410dac
-SIZE (libpng-patch03-trns-chunk-overflow.txt) = 608
-MD5 (libpng-patch04-get-uint-31.txt) = d4c45cf4a1292a6fabca27dd39c779e7
-SIZE (libpng-patch04-get-uint-31.txt) = 1686
-MD5 (libpng-patch05-pngpread-chunklength.txt) = b2d0d1d9455ff99a46f24ab9e45f1cf1
-SIZE (libpng-patch05-pngpread-chunklength.txt) = 1329
-MD5 (libpng-patch06-pngread-chunklength.txt) = 00ad5b7467fd768a3316c1b340913997
-SIZE (libpng-patch06-pngread-chunklength.txt) = 1848
-MD5 (libpng-patch07-png-read-png-overflow.txt) = 8880f8530118a86075b3993bee711e65
-SIZE (libpng-patch07-png-read-png-overflow.txt) = 510
-MD5 (libpng-patch08-splt-buffer-overflow.txt) = 9dac4fcd1a9c01ad978b3e19e140558a
-SIZE (libpng-patch08-splt-buffer-overflow.txt) = 812
-MD5 (libpng-patch09-null-iccp-profile.txt) = c7f49429bf33281938c6b751b216329f
-SIZE (libpng-patch09-null-iccp-profile.txt) = 480
-MD5 (libpng-patch10-find-duplicate-chunk.txt) = 1ee3546f7568db193b788a60642864d2
-SIZE (libpng-patch10-find-duplicate-chunk.txt) = 1991
-MD5 (libpng-patch11-limit-dimensions.txt) = 1cea85235f65c953f7b3d2f9736dc086
-SIZE (libpng-patch11-limit-dimensions.txt) = 1092
+MD5 (libpng-1.2.6.tar.gz) = f84b206672a3ffcf1e741087ee49257e
+SIZE (libpng-1.2.6.tar.gz) = 502503
+MD5 (libpng-1.2.6-patch-pngwutil.txt) = 7f916d63b7b6aaaff386681a0cbf3102
+SIZE (libpng-1.2.6-patch-pngwutil.txt) = 3382
diff --git a/graphics/png/files/patch-ab b/graphics/png/files/patch-ab
index d36b99a474c9..09eb8d4092e8 100644
--- a/graphics/png/files/patch-ab
+++ b/graphics/png/files/patch-ab
@@ -1,9 +1,9 @@
---- scripts/libpng.pc.in.orig	Wed Dec 11 13:25:12 2002
-+++ scripts/libpng.pc.in	Wed Dec 11 13:25:35 2002
+--- scripts/libpng.pc.in.orig	Sun Aug 15 16:15:22 2004
++++ scripts/libpng.pc.in	Fri Sep  3 07:09:49 2004
 @@ -7,5 +7,5 @@
  Name: libpng12
  Description: Loads and saves PNG files
- Version: 1.2.5
+ Version: 1.2.6
 -Libs: -L${libdir} -lpng12 -lz -lm
 -Cflags: -I${includedir}/libpng12
 +Libs: -L${libdir} -lpng -lz -lm
diff --git a/graphics/png/files/patch-pnggccrd.c b/graphics/png/files/patch-pnggccrd.c
deleted file mode 100644
index c08c0a60deae..000000000000
--- a/graphics/png/files/patch-pnggccrd.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- pnggccrd.c.old	Thu Oct  3 15:32:28 2002
-+++ pnggccrd.c	Sat Jul 24 14:07:13 2004
-@@ -1767,7 +1767,8 @@
- 
-                         : "1" (sptr),      // esi      // input regs
-                           "2" (dp),        // edi
--                          "0" (width)      // ecx
-+                          "0" (width),      // ecx
-+                          "rim" (_const4)
- // doesn't work           "i" (0x0000000000FFFFFFLL)   // %1 (a.k.a. _const4)
- 
- #if 0  /* %mm0, ..., %mm4 not supported by gcc 2.7.2.3 or egcs 1.1 */
-@@ -1811,7 +1812,8 @@
- 
-                         : "1" (sptr),      // esi      // input regs
-                           "2" (dp),        // edi
--                          "0" (width)      // ecx
-+                          "0" (width),     // ecx
-+                          "rim" (_const4)
- 
- #if 0  /* %mm0, ..., %mm2 not supported by gcc 2.7.2.3 or egcs 1.1 */
-                         : "%mm0", "%mm1", "%mm2"       // clobber list
-@@ -1865,7 +1867,9 @@
- 
-                            : "1" (sptr),      // esi      // input regs
-                              "2" (dp),        // edi
--                             "0" (width_mmx)  // ecx
-+                             "0" (width_mmx), // ecx
-+                             "rim" (_const4),
-+                             "rim" (_const6)
- 
- #if 0  /* %mm0, ..., %mm3 not supported by gcc 2.7.2.3 or egcs 1.1 */
-                            : "%mm0", "%mm1"               // clobber list
-@@ -4529,8 +4533,7 @@
-       : "0" (bpp),              // eax    // input regs
-         "1" (row)               // edi
- 
--      : "%ebx", "%ecx", "%edx"            // clobber list
--      , "%esi"
-+      : "%esi", "%ecx", "%edx"            // clobber list
- 
- #if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
-       , "%mm0", "%mm1", "%mm2", "%mm3"
-@@ -5034,7 +5037,10 @@
-         "1" (prev_row),         // esi
-         "2" (row)               // edi
- 
--      : "%eax", "%ebx", "%ecx"            // clobber list (no input regs!)
-+      : "%eax", "%ecx"            // clobber list (no input regs!)
-+#ifndef __PIC__
-+      , "%ebx"
-+#endif
- 
- #if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
-       , "%mm0", "%mm1", "%mm2", "%mm3"