Changes 1.6.2:

* Fixed bug with "PNG_ROWBYTES" usage, introduced in version 1.6.1.
  The bug could cause a crash and only affects the "nolib" builds.
* Converted C++ style (// ...) comments to C style (/* ... */).
* Defined TOO_FAR == 32767 in deflate.c (again). The definition was omitted
  from version 1.6.0 when zlib was upgraded to version 1.2.3.

Changes 1.6.1:
* Copied non-exported libpng functions from libpng into pngcrush, to make
  pngcrush play more nicely with shared libpng. These are ifdef'ed out when
  a static library is being built with the bundled libpng and pngcrush.h is
  included.

Changes 1.6.0:
* Moved ChangeLog out of pngcrush.c comments and into a separate file.
* Filtered pngcrush.c through "indent -kr" and "expand" for readability.
* Moved 550 lines of usage/help/copyright/license/version info to separate
  function(s) and cleaned up significantly.
* Added some comments for ease of navigation and readability.
* Stripped out a bunch of ancient-libpng compatibility stuff.
* Defined PNG_UINT_* macros (pngcrush.h for now).
* Fixed unknown-chunk handling ("-rem alla" and "-rem gifx" now work).
* Created modified version of makefile that supports external zlib.
* Added support for methods using Z_RLE zlib strategy (zlib 1.2.x only).
* Documented -huffman option in usage screen.
* Added IDAT statistics to final per-file summary.
* Added utime() support to give output files same timestamps as input files.

4 files changed, 17 insertions, 21 deletions

diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 95445b38e85..bb3c235fa07 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:58 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.21 2006/02/18 11:07:10 adam Exp $
 
-DISTNAME=	pngcrush-1.5.10
-PKGREVISION=	1
+DISTNAME=	pngcrush-1.6.2-nolib
+PKGNAME=	pngcrush-1.6.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pmt/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://pmt.sourceforge.net/pngcrush/index.html
 COMMENT=	Optimizer for PNG (Portable Network Graphics) files
 
-NO_CONFIGURE=		YES
+NO_CONFIGURE=		yes
 INSTALLATION_DIRS=	bin
 
 do-build:
@@ -19,8 +19,6 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pngcrush
-	${INSTALL_MAN} ${WRKSRC}/README.txt ${PREFIX}/share/pngcrush
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pngcrush/PLIST b/graphics/pngcrush/PLIST
index 6c6271a0828..1b7450debc5 100644
--- a/graphics/pngcrush/PLIST
+++ b/graphics/pngcrush/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/18 11:07:10 adam Exp $
 bin/pngcrush
-share/pngcrush/README.txt
-@dirrm share/pngcrush
diff --git a/graphics/pngcrush/distinfo b/graphics/pngcrush/distinfo
index b474bec8127..96b9f67f4f5 100644
--- a/graphics/pngcrush/distinfo
+++ b/graphics/pngcrush/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:12 agc Exp $
+$NetBSD: distinfo,v 1.9 2006/02/18 11:07:10 adam Exp $
 
-SHA1 (pngcrush-1.5.10.tar.gz) = 469e41c2fdf5fefd307119643616d8d2c86e35b4
-RMD160 (pngcrush-1.5.10.tar.gz) = 78b3b01fc05ec87b003b7492931f1d2cf8b433cd
-Size (pngcrush-1.5.10.tar.gz) = 313220 bytes
-SHA1 (patch-aa) = e0c26f3cb2eb01c7f11f7cfb1b575d3c5ab71361
+SHA1 (pngcrush-1.6.2.tar.bz2) = 2038863627dfe1fb840c94f5805b2d8b74bba2a6
+RMD160 (pngcrush-1.6.2.tar.bz2) = 912c7d140acc3f7f0fe48483eb1d828256c3628a
+Size (pngcrush-1.6.2.tar.bz2) = 294713 bytes
+SHA1 (patch-aa) = 27f768ae5f3a073ed9e39093ae9a958acc1d0628
diff --git a/graphics/pngcrush/patches/patch-aa b/graphics/pngcrush/patches/patch-aa
index 44f2966e201..d1da2039090 100644
--- a/graphics/pngcrush/patches/patch-aa
+++ b/graphics/pngcrush/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/08/29 16:44:48 kim Exp $
+$NetBSD: patch-aa,v 1.3 2006/02/18 11:07:10 adam Exp $
 
---- pngcrush.c.orig	2002-07-20 23:51:20.000000000 -0400
-+++ pngcrush.c	2004-08-29 12:43:38.000000000 -0400
-@@ -416,7 +416,20 @@
+--- pngcrush.c.orig	2006-02-16 18:57:17.000000000 +0100
++++ pngcrush.c
+@@ -120,7 +120,20 @@
   */
  
  #define PNG_INTERNAL
@@ -22,5 +22,5 @@ $NetBSD: patch-aa,v 1.2 2004/08/29 16:44:48 kim Exp $
 +#define HANDLE_CHUNK_ALWAYS	PNG_HANDLE_CHUNK_ALWAYS
 +#endif
  
- /* we don't need the some of the extra libpng transformations
-  * so they are ifdef'ed out in a special version of pngconf.h, which
+ /* we don't need some of the extra libpng transformations
+  * so they are ifdef'ed out in pngcrush.h, which is included by