Changes 0.5.2:

* Improved handling of inexact PNM-to-PNG conversions.
* Fixed a typo that was breaking the build on some Unix platforms.

4 files changed, 20 insertions, 41 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 525b59e04f5..e500695a51e 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/05/06 08:48:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/08 22:31:12 adam Exp $
 
-DISTNAME=	optipng-0.5.1
+DISTNAME=	optipng-0.5.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optipng/}
 
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index 36c810b535b..8bc4a3c92cf 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/05/06 10:25:20 adam Exp $
+$NetBSD: distinfo,v 1.6 2006/05/08 22:31:12 adam Exp $
 
-SHA1 (optipng-0.5.1.tar.gz) = 9e1300aff4579d72889af8997a0eda215e2fb5ef
-RMD160 (optipng-0.5.1.tar.gz) = a0ff76be9515670fd9d16ebb43f86f6a905b8862
-Size (optipng-0.5.1.tar.gz) = 1081251 bytes
-SHA1 (patch-aa) = 9076bea2b967a0cc680f0a1604801f43d4998365
+SHA1 (optipng-0.5.2.tar.gz) = e0b579f3843b747b2cb13bac136dc6b6257a2577
+RMD160 (optipng-0.5.2.tar.gz) = 580487aead95fcc27681b3e62e39ebc5e9a84c13
+Size (optipng-0.5.2.tar.gz) = 1082229 bytes
+SHA1 (patch-aa) = 888dc7606f5b094be7d0ea8599d1a8b08fee613b
 SHA1 (patch-ab) = 2bc61b45e6f71fbb3c4fa5101cbd7b4bd2a1e760
 SHA1 (patch-ac) = fb4eb567b5a24b2d26bf357061be80c57b4d4a3c
-SHA1 (patch-ad) = c6b570f35911deee857e2bc9eda4c9d8c990e813
diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa
index d69566427c5..8d6e4eb7a7d 100644
--- a/graphics/optipng/patches/patch-aa
+++ b/graphics/optipng/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2006/05/06 10:25:20 adam Exp $
+$NetBSD: patch-aa,v 1.6 2006/05/08 22:31:12 adam Exp $
 
---- Makefile.orig	2006-04-19 14:47:12.000000000 +0200
+--- /dev/null	2006-05-09 00:31:28.000000000 +0200
 +++ Makefile
-@@ -0,0 +1,28 @@
-+OBJS=	optipng.o opngio.o opngreduc.o cbitset.o osys.o \
-+	pngxread.o pngxrbmp.o pngxrgif.o pngxrpnm.o \
-+	gifread.o pnmerror.o pnmread.o pnmwrite.o \
-+	strutil.o png_write_sig.o
+@@ -0,0 +1,30 @@
++OBJS=	optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o \
++	pngxread.o pngxrbmp.o pngxrgif.o pngxrjpg.o pngxrpnm.o \
++	pngxrtif.o gifread.o pnmerror.o pnmread.o pnmwrite.o \
++	png_write_sig.o
 +
 +CPPFLAGS=	`libpng-config --cflags` -Ilib/pngxtern -Isrc
 +
@@ -20,14 +20,16 @@ $NetBSD: patch-aa,v 1.5 2006/05/06 10:25:20 adam Exp $
 +osys.o:      src/osys.c      src/osys.h
 +strutil.o:   src/strutil.c   src/strutil.h
 +
-+gifread.o:   lib/pngxtern/gif/gifread.c		lib/pngxtern/gif/gifread.h
-+pnmerror.o:  lib/pngxtern/pnm/pnmerror.c	lib/pngxtern/pnm/pnmio.h
-+pnmread.o:   lib/pngxtern/pnm/pnmread.c		lib/pngxtern/pnm/pnmio.h
-+pnmwrite.o:  lib/pngxtern/pnm/pnmwrite.c	lib/pngxtern/pnm/pnmio.h
 +pngxread.o:  lib/pngxtern/pngxread.c		lib/pngxtern/pngxtern.h
 +pngxrbmp.o:  lib/pngxtern/pngxrbmp.c		lib/pngxtern/pngxtern.h 
 +pngxrgif.o:  lib/pngxtern/pngxrgif.c		lib/pngxtern/pngxtern.h 
++pngxrjpg.o:  lib/pngxtern/pngxrjpg.c		lib/pngxtern/pngxtern.h 
 +pngxrpnm.o:  lib/pngxtern/pngxrpnm.c		lib/pngxtern/pngxtern.h 
++pngxrtif.o:  lib/pngxtern/pngxrtif.c		lib/pngxtern/pngxtern.h 
++gifread.o:   lib/pngxtern/gif/gifread.c		lib/pngxtern/gif/gifread.h
++pnmerror.o:  lib/pngxtern/pnm/pnmerror.c	lib/pngxtern/pnm/pnmio.h
++pnmread.o:   lib/pngxtern/pnm/pnmread.c		lib/pngxtern/pnm/pnmio.h
++pnmwrite.o:  lib/pngxtern/pnm/pnmwrite.c	lib/pngxtern/pnm/pnmio.h
 +
 +install:
 +	${BSD_INSTALL_PROGRAM} optipng ${PREFIX}/bin
diff --git a/graphics/optipng/patches/patch-ad b/graphics/optipng/patches/patch-ad
deleted file mode 100644
index e60d64ad7d4..00000000000
--- a/graphics/optipng/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/05/06 08:48:43 adam Exp $
-
---- src/strutil.c.orig	2006-04-05 09:45:00.000000000 +0200
-+++ src/strutil.c
-@@ -36,7 +36,7 @@ int string_case_cmp(const char *str1, co
-         ch1 = toupper(*str1++);
-         ch2 = toupper(*str2++);
-         if (ch1 != ch2)
--            return c1 - ch2;
-+            return ch1 - ch2;
-         if (ch1 == 0)  /* no need to check if ch2 == 0 */
-             return 0;
-     }
-@@ -64,7 +64,7 @@ int string_num_case_cmp(const char *str1
-         ch1 = toupper(*str1++);
-         ch2 = toupper(*str2++);
-         if (ch1 != ch2)
--            return c1 - ch2;
-+            return ch1 - ch2;
-         if (ch1 == 0)  /* no need to check if ch2 == 0 */
-             return 0;
-     }