Changes 0.6.1:

* Upgraded cexcept to version 2.0.1.
* Added a configure script, to be used instead of unix-secure.mak.
* Fixed a build issue that occured when using libpng from the system.
* Fixed processing when image reduction yields an output larger than
  the original.
* Fixed behavior of -preserve.
* Removed displaying of partial progress when abandoning IDATs under
  the -v option.  The percentages displayed were not very accurate.

Changes 0.6:
* Upgraded libpng to version 1.2.29-optipng [private]
* Implemented grayscale(alpha)-to-palette reductions.
* Improved conversion of bKGD info during RGB-to-palette reductions.
* Fixed conversion of bKGD and tRNS during 16-to-8-bit reductions.
* Added support for compressed BMP (incl. PNG-compressed BMP, you bet!)
* Improved the speed of reading raw PNM files.
* Recognized PNG digital signatures (dSIG) and disabled optimization
  in their presence, to preserve their integrity.
* Allowed the user to enforce the optimization of dSIG'ed files.
* Recognized APNG animation files and disabled reductions to preserve
  their integrity.
* Added the -snip option, to allow the user to "snip" one image out of
  a multi-image file, such as animated GIF, multi-page TIFF, or APNG.
* Improved recovery of PNG files with incomplete IDAT.
* Fixed a crash triggered by the use of -log on some platforms.
* Fixed behavior of -out and -dir when the input is already optimized.
* Provided more detailed image information at the start of processing.
* Provided a more detailed summary at the end of processing, under the
  presence of the -v option and/or the occurence of exceptional events.

3 files changed, 23 insertions, 20 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 3ba576ceaf4..aa6bb51d5da 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2007/11/10 19:08:51 heinz Exp $
+# $NetBSD: Makefile,v 1.15 2008/07/28 22:46:38 adam Exp $
 
-DISTNAME=	optipng-0.5.5
+DISTNAME=	optipng-0.6.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optipng/}
 
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index 8755b089fd7..dd34c1187a5 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/11/10 19:08:51 heinz Exp $
+$NetBSD: distinfo,v 1.11 2008/07/28 22:46:38 adam Exp $
 
-SHA1 (optipng-0.5.5.tar.gz) = 670da3b01da903fa04886e4b6e625648570b3d9c
-RMD160 (optipng-0.5.5.tar.gz) = 39e4b0587e4bcc7cb705e329dde35b1f9426b1d0
-Size (optipng-0.5.5.tar.gz) = 1109905 bytes
-SHA1 (patch-aa) = 792cf24939dcaa40a5499515980cd807a66c198d
+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 (patch-ac) = fb4eb567b5a24b2d26bf357061be80c57b4d4a3c
diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa
index 4ff0efea709..5c35530b386 100644
--- a/graphics/optipng/patches/patch-aa
+++ b/graphics/optipng/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.8 2007/11/10 19:08:51 heinz Exp $
+$NetBSD: patch-aa,v 1.9 2008/07/28 22:46:38 adam Exp $
 
 --- Makefile.orig	2007-11-10 20:01:12.000000000 +0100
 +++ Makefile
-@@ -0,0 +1,34 @@
-+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 \
+@@ -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 \
 +	png_write_sig.o minitiff.o tiffread.o tiffwrite.o
 +
 +CPPFLAGS=	`libpng-config --cflags` -Ilib/pngxtern -Isrc
@@ -13,23 +13,26 @@ $NetBSD: patch-aa,v 1.8 2007/11/10 19:08:51 heinz Exp $
 +all: $(OBJS)
 +	$(CC) -o optipng $(LDFLAGS) $(OBJS) -lz `libpng-config --ldflags`
 +
-+optipng.o:   src/optipng.c   src/opng.h src/osys.h src/cbitset.h src/cexcept.h
-+opngio.o:    src/opngio.c    src/opng.h
-+opngreduc.o: src/opngreduc.c src/opng.h
++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
 +
-+pngxread.o:  lib/pngxtern/pngxread.c		lib/pngxtern/pngxtern.h
++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 
-+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
++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