Changes 0.6.5:

* Upgraded libpng to version 1.4.5-optipng [private]
* Upgraded zlib to version 1.2.5-optipng [private]
* Fixed the I/O states (in libpng 1.4.5);
  they caused incorrect file reads in some rare cases.
* Fixed processing of PNG files with chunks of size 0.
* Fixed a display error in the TIFF import.
* Improved checking of the arguments of -f, -zc, -zm and -zs.
* Removed quirks from the rangeset option argument syntax.
* Fixed a build issue under the system-supplied libpng-1.4.
* Resolved forward-compatibility issues regarding libpng-1.5;
  however, the system-supplied libpng-1.5 is not yet supported.
* Added various enhancements to the configure+make build system.

4 files changed, 13 insertions, 70 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index 33218c94d8f..24e912370b4 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,21 +1,26 @@
-# $NetBSD: Makefile,v 1.22 2011/01/13 13:38:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2011/01/28 07:28:16 adam Exp $
 
-DISTNAME=	optipng-0.6.4
-PKGREVISION=	2
+DISTNAME=	optipng-0.6.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optipng/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://optipng.sourceforge.net/
 COMMENT=	Advanced PNG Optimizer
+LICENSE=	png-license
 
 PKG_DESTDIR_SUPPORT=		user-destdir
 
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	-prefix=${PREFIX}
+CONFIGURE_ARGS+=	-with-system-zlib
+#CONFIGURE_ARGS+=	-with-system-libpng
+
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.2
 BUILDLINK_API_DEPENDS.png+=	png>=1.2.9nb2
 
 INSTALLATION_DIRS+=		bin ${PKGMANDIR}/man1
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+#.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index 9424b89d3bc..0d0297e63eb 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.17 2010/06/13 22:44:39 wiz Exp $
+$NetBSD: distinfo,v 1.18 2011/01/28 07:28:16 adam Exp $
 
-SHA1 (optipng-0.6.4.tar.gz) = ebb8d623c7f79c5c6942803bb96789103780bce9
-RMD160 (optipng-0.6.4.tar.gz) = 6b5248c3c6b744315e70e86b49d998fe66759879
-Size (optipng-0.6.4.tar.gz) = 1483806 bytes
-SHA1 (patch-aa) = 0d1340f90699d1c059d8d8afea67d9fa065a6778
-SHA1 (patch-ab) = a3dc6fc1b0009437d5c7011de6d93cf0539f3565
+SHA1 (optipng-0.6.5.tar.gz) = 91525748a0bbd9bbfa8355529da7c17a408173e5
+RMD160 (optipng-0.6.5.tar.gz) = 2b67ce48cba37e5c77ef13bdc285b37e919e2b01
+Size (optipng-0.6.5.tar.gz) = 1534271 bytes
diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa
deleted file mode 100644
index 78874f610b2..00000000000
--- a/graphics/optipng/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2009/12/21 07:22:14 adam Exp $
-
---- Makefile.orig	2008-11-12 19:29:05.000000000 +0100
-+++ Makefile
-@@ -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 \
-+	minitiff.o tiffread.o tiffwrite.o
-+
-+CPPFLAGS=	`libpng-config --cflags` -Ilib/pngxtern -Isrc
-+
-+all: $(OBJS)
-+	$(CC) -o optipng $(LDFLAGS) $(OBJS) -lz `libpng-config --ldflags`
-+
-+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
-+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"
-+	${BSD_INSTALL_MAN} man/optipng.1 "${DESTDIR}${PREFIX}/${PKGMANDIR}/man1"
diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab
deleted file mode 100644
index 54af2d23beb..00000000000
--- a/graphics/optipng/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2010/06/13 22:44:39 wiz Exp $
-
---- src/opngreduc.c.orig	2010-01-03 05:59:00.000000000 +0000
-+++ src/opngreduc.c
-@@ -23,7 +23,11 @@
- #define PNG_NO_PEDANTIC_WARNINGS
- #include "png.h"
- #if PNG_LIBPNG_VER >= 10400
--#include "pngpriv.h"
-+#define PNG_FILLER              0x8000L
-+#define PNG_FLAG_FILLER_AFTER             0x0080
-+#ifndef png_debug
-+#define png_debug(l,m)  
-+#endif
- #else
- #define trans_alpha trans
- #define trans_color trans_values