Changes 0.6.2:

* Upgraded libpng to version 1.2.33-optipng [private]
* Put back a speed optimization, accidentally removed in version 0.6,
  allowing singleton trials (-o1) to be bypassed in certain conditions.
* Fixed an array overflow in the BMP reader.
* Fixed the loss of private chunks under the -snip option.
* Produced a more concise on-screen output in the non-verbose mode.
* Added a programming interface to the optimization engine, in order
  to facilitate the development of PNG-optimizing GUI apps and plugins.

3 files changed, 36 insertions, 35 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index aa6bb51d5da..e2eaea3e994 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2008/07/28 22:46:38 adam Exp $
+# $NetBSD: Makefile,v 1.16 2008/11/12 18:45:04 adam Exp $
 
-DISTNAME=	optipng-0.6.1
+DISTNAME=	optipng-0.6.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optipng/}
 
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index dd34c1187a5..3e97c3b3483 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2008/07/28 22:46:38 adam Exp $
+$NetBSD: distinfo,v 1.12 2008/11/12 18:45:04 adam Exp $
 
-SHA1 (optipng-0.6.1.tar.gz) = d8ef15dd3f1c6d9bafecde9bdf6172ecf5ad5ce8
-RMD160 (optipng-0.6.1.tar.gz) = c07fd7f2b4ae18a31658398721383ff2804a56f3
-Size (optipng-0.6.1.tar.gz) = 1043851 bytes
-SHA1 (patch-aa) = a09e1c71c45759845502fa4cd3ff2f156a561fa9
+SHA1 (optipng-0.6.2.tar.gz) = 374b3537a262590ba2822f2b10d9241247b4da95
+RMD160 (optipng-0.6.2.tar.gz) = cd9ecfbd1c8901d14cb93fbc9f07403071cea37e
+Size (optipng-0.6.2.tar.gz) = 1052509 bytes
+SHA1 (patch-aa) = 0a0c92b9786193862465646373b82c6bc47cee2c
 SHA1 (patch-ac) = fb4eb567b5a24b2d26bf357061be80c57b4d4a3c
diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa
index 5c35530b386..3b392e5d324 100644
--- a/graphics/optipng/patches/patch-aa
+++ b/graphics/optipng/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.9 2008/07/28 22:46:38 adam Exp $
+$NetBSD: patch-aa,v 1.10 2008/11/12 18:45:04 adam Exp $
 
---- Makefile.orig	2007-11-10 20:01:12.000000000 +0100
+--- Makefile.orig	2008-11-12 19:29:05.000000000 +0100
 +++ Makefile
-@@ -0,0 +1,37 @@
-+OBJS=	optipng.o opngreduc.o cbitset.o osys.o strutil.o pngxio.o pngxmem.o \
-+	pngxrbmp.o pngxread.o pngxrgif.o pngxrjpg.o pngxrpnm.o pngxrtif.o \
-+	pngxset.o pngxwrite.o gifread.o pnmin.o pnmout.o pnmutil.o \
+@@ -0,0 +1,38 @@
++OBJS=	optipng.o opngoptim.o opngreduc.o cbitset.o osys.o strutil.o pngxio.o \
++	pngxmem.o pngxrbmp.o pngxread.o pngxrgif.o pngxrjpg.o pngxrpnm.o \
++	pngxrtif.o pngxset.o pngxwrite.o gifread.o pnmin.o pnmout.o pnmutil.o \
 +	png_write_sig.o minitiff.o tiffread.o tiffwrite.o
 +
 +CPPFLAGS=	`libpng-config --cflags` -Ilib/pngxtern -Isrc
@@ -13,29 +13,30 @@ $NetBSD: patch-aa,v 1.9 2008/07/28 22:46:38 adam Exp $
 +all: $(OBJS)
 +	$(CC) -o optipng $(LDFLAGS) $(OBJS) -lz `libpng-config --ldflags`
 +
-+optipng.o:   src/optipng.c   src/opngreduc.h src/osys.h src/cbitset.h src/cexcept.h
-+opngreduc.o: src/opngreduc.c src/opngreduc.h
-+cbitset.o:   src/cbitset.c   src/cbitset.h
-+osys.o:      src/osys.c      src/osys.h
-+strutil.o:   src/strutil.c   src/strutil.h
++optipng.o:   src/optipng.c
++opngoptim.o: src/opngoptim.c
++opngreduc.o: src/opngreduc.c
++cbitset.o:   src/cbitset.c
++osys.o:      src/osys.c
++strutil.o:   src/strutil.c
 +
-+pngxio.o:    lib/pngxtern/pngxio.c		lib/pngxtern/pngxtern.h
-+pngxmem.o:   lib/pngxtern/pngxmem.c		lib/pngxtern/pngxtern.h
-+pngxrbmp.o:  lib/pngxtern/pngxrbmp.c		lib/pngxtern/pngxtern.h 
-+pngxread.o:  lib/pngxtern/pngxread.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 
-+pngxset.o:   lib/pngxtern/pngxset.c		lib/pngxtern/pngxtern.h 
-+pngxwrite.o: lib/pngxtern/pngxwrite.c		lib/pngxtern/pngxtern.h 
-+gifread.o:   lib/pngxtern/gif/gifread.c	lib/pngxtern/gif/gifread.h
-+pnmin.o:     lib/pngxtern/pnm/pnmin.c		lib/pngxtern/pnm/pnmio.h
-+pnmout.o:    lib/pngxtern/pnm/pnmout.c		lib/pngxtern/pnm/pnmio.h
-+pnmutil.o:   lib/pngxtern/pnm/pnmutil.c	lib/pngxtern/pnm/pnmio.h
-+minitiff.o:  lib/pngxtern/minitiff/minitiff.c	lib/pngxtern/minitiff/minitiff.h
-+tiffread.o:  lib/pngxtern/minitiff/tiffread.c	lib/pngxtern/minitiff/tiffdef.h
-+tiffwrite.o: lib/pngxtern/minitiff/tiffwrite.c	lib/pngxtern/minitiff/tiffdef.h
++pngxio.o:    lib/pngxtern/pngxio.c
++pngxmem.o:   lib/pngxtern/pngxmem.c
++pngxrbmp.o:  lib/pngxtern/pngxrbmp.c
++pngxread.o:  lib/pngxtern/pngxread.c
++pngxrgif.o:  lib/pngxtern/pngxrgif.c
++pngxrjpg.o:  lib/pngxtern/pngxrjpg.c
++pngxrpnm.o:  lib/pngxtern/pngxrpnm.c
++pngxrtif.o:  lib/pngxtern/pngxrtif.c
++pngxset.o:   lib/pngxtern/pngxset.c
++pngxwrite.o: lib/pngxtern/pngxwrite.c
++gifread.o:   lib/pngxtern/gif/gifread.c
++pnmin.o:     lib/pngxtern/pnm/pnmin.c
++pnmout.o:    lib/pngxtern/pnm/pnmout.c
++pnmutil.o:   lib/pngxtern/pnm/pnmutil.c
++minitiff.o:  lib/pngxtern/minitiff/minitiff.c
++tiffread.o:  lib/pngxtern/minitiff/tiffread.c
++tiffwrite.o: lib/pngxtern/minitiff/tiffwrite.c
 +
 +install:
 +	${BSD_INSTALL_PROGRAM} optipng "${DESTDIR}${PREFIX}/bin"