Changes 0.5:

++ Added pngxtern, a libpng add-on for external image format
   support: BMP (uncompressed), GIF, PNM.
   (This was incorporated from OptiPNG-Plus.)
++ Implemented RGB(A)-to-palette reductions.
 + If trials are ended prematurely, detailed progression is only
   reported under the user option -v.
 - Removed reporting of some IDAT sizes that exceeded the optimum.
   (This was NOT a bug, but a "feature" that confused some users.)
 ! Fixed an RGB-to-gray reduction problem that occured under some
   specific background colors.
 + Added support for builds based on the system-supplied zlib.
 * Modified LICENSE.  It is now a verbatim spell of the zlib license.

4 files changed, 36 insertions, 28 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 709cfd5967b..bba933f46d6 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2005/07/14 13:28:53 grant Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/19 11:18:41 adam Exp $
 
-DISTNAME=	optipng-0.4.8
-PKGREVISION=	1
+DISTNAME=	optipng-0.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cs.toronto.edu/~cosmin/pngtech/optipng/
 
@@ -9,7 +8,6 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.cs.toronto.edu/~cosmin/pngtech/optipng/
 COMMENT=	Advanced PNG Optimizer
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 BUILDLINK_DEPENDS.zlib+=	zlib>=1.2.2
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index ee544579d61..aab1d47cbce 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/07/13 14:52:39 adam Exp $
+$NetBSD: distinfo,v 1.2 2006/01/19 11:18:41 adam Exp $
 
-SHA1 (optipng-0.4.8.tar.gz) = e1b7c00d276828bb9324011d1a19c7916307fdff
-RMD160 (optipng-0.4.8.tar.gz) = 0484daacbdba1b7e7c424d3af24f34b9a7e3177f
-Size (optipng-0.4.8.tar.gz) = 666570 bytes
-SHA1 (patch-aa) = aca716bdffabecad8f6c024c16751f61483c3659
-SHA1 (patch-ab) = e044f6cde38c4e3c1f95c38934daaa938e11b101
+SHA1 (optipng-0.5.tar.gz) = c724e52802ea7419874ba7b4d3dfa55abf964ed6
+RMD160 (optipng-0.5.tar.gz) = 6bd7594856b31f42aef4811b4b6a52d18e7803c5
+Size (optipng-0.5.tar.gz) = 746749 bytes
+SHA1 (patch-aa) = 0ce5ea5ceeabe74fb37938b19657365a594917a9
+SHA1 (patch-ab) = 5608933a0725a7c0ac0f68e3de77d57dc6f0569a
diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa
index f7b2e7b2ecb..60debaf36b9 100644
--- a/graphics/optipng/patches/patch-aa
+++ b/graphics/optipng/patches/patch-aa
@@ -1,21 +1,31 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/07/13 14:52:39 adam Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/19 11:18:41 adam Exp $
 
---- /dev/null	2005-07-13 16:20:21.000000000 +0000
+--- /dev/null	2006-01-19 12:14:22.000000000 +0100
 +++ Makefile
-@@ -0,0 +1,16 @@
-+OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o
+@@ -0,0 +1,26 @@
++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
++
++CPPFLAGS=	-I${PREFIX}/include -Ilib/pngxtern -Isrc
 +
 +all: $(OBJS)
-+	$(CC) -o optipng $(LDFLAGS) $(OBJS) -lz -lpng
++	$(CC) -o optipng $(LDFLAGS) $(OBJS) -lm -lz -lpng
 +
-+.c.o:
-+	$(CC) -c $(CFLAGS) -I${PREFIX}/include $*.c
++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
++cbitset.o:   src/cbitset.c   src/cbitset.h
++osys.o:      src/osys.c      src/osys.h
 +
-+optipng.o  : optipng.c   opng.h osys.h cbitset.h cexcept.h
-+opngio.o   : opngio.c    opng.h
-+opngreduc.o: opngreduc.c opng.h
-+cbitset.o  : cbitset.c   cbitset.h
-+osys.o     : osys.c      osys.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 
++pngxrpnm.o:  lib/pngxtern/pngxrpnm.c		lib/pngxtern/pngxtern.h 
 +
 +install:
 +	${BSD_INSTALL_PROGRAM} optipng ${PREFIX}/bin
diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab
index 8b1fd5812de..82fe671484f 100644
--- a/graphics/optipng/patches/patch-ab
+++ b/graphics/optipng/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/07/13 14:52:39 adam Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/19 11:18:41 adam Exp $
 
---- opng.h.orig	2005-07-13 16:41:40.000000000 +0000
-+++ opng.h
-@@ -33,9 +33,6 @@
- 
+--- src/opng.h.orig	2006-01-19 08:59:26.000000000 +0100
++++ src/opng.h
+@@ -34,9 +34,6 @@
  #include "png.h"
+ #include "pngxtern.h"
  
 -#if !(PNG_LIBPNG_BUILD_TYPE & PNG_LIBPNG_BUILD_PRIVATE)
--#error This program requires the BUNDLED libpng version 1.0.x-optipng
+-#error This program requires the BUNDLED libpng version 1.2.x-optipng
 -#endif