Fri Jan 28 20:46:11 2011 UTC ()
Changes 1.7.14:
* Built with libpng-1.5.1beta06 and zlib-1.2.5
* Removed WIN32_WCE support (libpng has dropped it already)
* Include zlib.h and define png_memcpy, etc., and revise the
  png_get_iCCP() and png_set_iCCP() calls to be able to build
  with bundled libpng-1.5.x.  Pngcrush cannot be built yet with
  a system libpng-1.5.x.


(adam)
diff -r1.44 -r1.45 pkgsrc/graphics/pngcrush/Makefile
diff -r1.28 -r1.29 pkgsrc/graphics/pngcrush/distinfo
diff -r0 -r1.10 pkgsrc/graphics/pngcrush/patches/patch-aa
cvs diff -r1.44 -r1.45 pkgsrc/graphics/pngcrush/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/pngcrush/Makefile 2011/01/13 13:38:15 1.44
+++ pkgsrc/graphics/pngcrush/Makefile 2011/01/28 20:46:11 1.45
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.44 2011/01/13 13:38:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.45 2011/01/28 20:46:11 adam Exp $
2 2
3DISTNAME= pngcrush-1.7.13-nolib 3DISTNAME= pngcrush-1.7.14
4PKGNAME= ${DISTNAME:C/-nolib//} 4PKGNAME= ${DISTNAME:C/-nolib//}
5PKGREVISION= 1 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= rh@NetBSD.org 9MAINTAINER= rh@NetBSD.org
11HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html 10HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html
12COMMENT= Optimizer for PNG (Portable Network Graphics) files 11COMMENT= Optimizer for PNG (Portable Network Graphics) files
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16NO_CONFIGURE= yes 15NO_CONFIGURE= yes
17INSTALLATION_DIRS= bin 16INSTALLATION_DIRS= bin
18 17
19do-build: 18#do-build:
20 cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ 19# cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \
21 ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ 20# ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \
22 ${LDFLAGS} `libpng-config --ldflags` -lz 21# ${LDFLAGS} `libpng-config --ldflags` -lz
23 22
24do-install: 23do-install:
25 ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin
26 25
27.include "../../graphics/png/buildlink3.mk" 26.include "../../graphics/png/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/graphics/pngcrush/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/pngcrush/distinfo 2010/12/13 16:15:33 1.28
+++ pkgsrc/graphics/pngcrush/distinfo 2011/01/28 20:46:11 1.29
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.28 2010/12/13 16:15:33 adam Exp $ 1$NetBSD: distinfo,v 1.29 2011/01/28 20:46:11 adam Exp $
2 2
3SHA1 (pngcrush-1.7.13-nolib.tar.bz2) = 37e38c1e99532b5136ad62b2c3279f0b40ae103b 3SHA1 (pngcrush-1.7.14.tar.bz2) = 266cb0f0ffdfba01ff7141d5871dd2b2cedb757f
4RMD160 (pngcrush-1.7.13-nolib.tar.bz2) = 51b54f780f07e21bb0b84bedf139e333feab896c 4RMD160 (pngcrush-1.7.14.tar.bz2) = 7ce64d19bb392b4c87515506daa1407323e05ef0
5Size (pngcrush-1.7.13-nolib.tar.bz2) = 48793 bytes 5Size (pngcrush-1.7.14.tar.bz2) = 315020 bytes
 6SHA1 (patch-aa) = 5c82c5afc9923110254ac40b607fdff6d6863cc2
File Added: pkgsrc/graphics/pngcrush/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.10 2011/01/28 20:46:11 adam Exp $

--- Makefile.orig	2011-01-28 20:28:50.000000000 +0000
+++ Makefile
@@ -14,17 +14,13 @@
 #ZINC = ../../zlib
 #ZLIB = ../../zlib
 
-CC = gcc
-LD = gcc
 RM = rm -f
 #CFLAGS = -I. -O -Wall
 #CFLAGS = -I. -O2 -fomit-frame-pointer -Wall
 #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall
 #CFLAGS = -I. -Os -fomit-frame-pointer -Wall
-CFLAGS = -I. -O3 -funroll-loops -fomit-frame-pointer -Wall -Wshadow
 #CFLAGS = -I${ZINC} -I. -O3 -fomit-frame-pointer -Wall
 # [note that -Wall is a gcc-specific compilation flag ("all warnings on")]
-LDFLAGS =
 O = .o
 E =
 
@@ -63,7 +59,7 @@ pngcrush$(O): pngcrush.c png.h pngconf.h
 	$(CC) -c $(CFLAGS) $<
 
 $(PNGCRUSH)$(E): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 # maintenance ---------------------------------------------------------------