Changes 1.7.29: * Set "things_have_changed" flag when adding text chunks, so the "-force" option is no longer necessary when adding text to an already-compressed file. * Direct usage message and error messages to stderr instead of stdout. If anyone is still using DOS they may have to change the "if 0" at line 990 to "if 1". * Added "pngcrush -n -v files.png" to the usage message.diff -r1.56 -r1.57 pkgsrc/graphics/pngcrush/Makefile
(adam)
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | # $NetBSD: Makefile,v 1.56 2012/05/25 08:01:33 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.57 2012/06/11 07:06:21 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= pngcrush-1.7.28-nolib | 3 | DISTNAME= pngcrush-1.7.29-nolib | |
4 | PKGNAME= ${DISTNAME:C/-nolib//} | 4 | PKGNAME= ${DISTNAME:C/-nolib//} | |
5 | CATEGORIES= graphics | 5 | CATEGORIES= graphics | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/} | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= rh@NetBSD.org | 9 | MAINTAINER= rh@NetBSD.org | |
10 | HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html | 10 | HOMEPAGE= http://pmt.sourceforge.net/pngcrush/index.html | |
11 | COMMENT= Optimizer for PNG (Portable Network Graphics) files | 11 | COMMENT= Optimizer for PNG (Portable Network Graphics) files | |
12 | LICENSE= zlib | 12 | LICENSE= zlib | |
13 | 13 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 15 | |||
16 | NO_CONFIGURE= yes | 16 | NO_CONFIGURE= yes | |
17 | INSTALLATION_DIRS= bin | 17 | INSTALLATION_DIRS= bin | |
18 | 18 | |||
19 | do-build: | 19 | do-build: | |
20 | cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ | 20 | cd ${WRKSRC} && ${CC} -DPNG_USE_LOCAL_ARRAYS \ | |
21 | ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ | 21 | ${CFLAGS} `libpng-config --cflags` -o pngcrush pngcrush.c \ | |
22 | ${LDFLAGS} `libpng-config --ldflags` -lz | 22 | ${LDFLAGS} `libpng-config --ldflags` -lz | |
23 | 23 | |||
24 | do-install: | 24 | do-install: | |
25 | ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin | 25 | ${INSTALL_PROGRAM} ${WRKSRC}/pngcrush ${DESTDIR}${PREFIX}/bin | |
26 | 26 | |||
27 | .include "../../graphics/png/buildlink3.mk" | 27 | .include "../../graphics/png/buildlink3.mk" | |
28 | .include "../../mk/bsd.pkg.mk" | 28 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.38 2012/05/25 08:01:33 adam Exp $ | 1 | $NetBSD: distinfo,v 1.39 2012/06/11 07:06:21 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (pngcrush-1.7.28-nolib.tar.xz) = 80647f7dd385453d6dc7a2b1fc8f28d4ca766489 | 3 | SHA1 (pngcrush-1.7.29-nolib.tar.xz) = 7797818ee3346eebc448267a8185efac74505e22 | |
4 | RMD160 (pngcrush-1.7.28-nolib.tar.xz) = 158f52a1d7f8f6f0aab5dec69c85780a42dbff41 | 4 | RMD160 (pngcrush-1.7.29-nolib.tar.xz) = ee77bbfe2ce4a228329a5f26ebede5b458916d14 | |
5 | Size (pngcrush-1.7.28-nolib.tar.xz) = 49356 bytes | 5 | Size (pngcrush-1.7.29-nolib.tar.xz) = 49660 bytes | |
6 | SHA1 (patch-aa) = fc0fd239c05513469554264a7e62dd8a722ab522 | 6 | SHA1 (patch-aa) = c8342e5bb7947f1dc2ff31f0ef45190ebcc71d8e |
@@ -1,28 +1,30 @@ | @@ -1,28 +1,30 @@ | |||
1 | $NetBSD: patch-aa,v 1.11 2011/10/14 17:56:24 adam Exp $ | 1 | $NetBSD: patch-aa,v 1.12 2012/06/11 07:06:21 adam Exp $ | |
2 | ||||
3 | Don't override CC, LD, CFLAGS and LDFLAGS. | |||
2 | 4 | |||
3 | --- Makefile.orig 2011-01-21 23:04:44.000000000 +0000 | 5 | --- Makefile.orig 2011-01-21 23:04:44.000000000 +0000 | |
4 | +++ Makefile | 6 | +++ Makefile | |
5 | @@ -17,14 +17,10 @@ PNGLIB = ${HOME}/lib | 7 | @@ -17,14 +17,10 @@ PNGLIB = ${HOME}/lib | |
6 | ZINC = ${HOME}/include | 8 | ZINC = ${HOME}/include | |
7 | ZLIB = ${HOME}/lib | 9 | ZLIB = ${HOME}/lib | |
8 | 10 | |||
9 | -CC = gcc | 11 | -CC = gcc | |
10 | -LD = gcc | 12 | -LD = gcc | |
11 | RM = rm -f | 13 | RM = rm -f | |
12 | #CFLAGS = -I. -O -Wall | 14 | #CFLAGS = -I. -O -Wall | |
13 | #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall | 15 | #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall | |
14 | -CFLAGS = -I${ZINC} -I. -g -O3 -fomit-frame-pointer -Wall | 16 | -CFLAGS = -I${ZINC} -I. -g -O3 -fomit-frame-pointer -Wall | |
15 | # [note that -Wall is a gcc-specific compilation flag ("all warnings on")] | 17 | # [note that -Wall is a gcc-specific compilation flag ("all warnings on")] | |
16 | -LDFLAGS = | 18 | -LDFLAGS = | |
17 | O = .o | 19 | O = .o | |
18 | E = | 20 | E = | |
19 | 21 | |||
20 | @@ -68,7 +64,7 @@ pngcrush$(O): pngcrush.c cexcept.h | 22 | @@ -68,7 +64,7 @@ pngcrush$(O): pngcrush.c cexcept.h | |
21 | # $(CC) -c $(CFLAGS) $< | 23 | # $(CC) -c $(CFLAGS) $< | |
22 | 24 | |||
23 | $(PNGCRUSH)$(E): $(OBJS) | 25 | $(PNGCRUSH)$(E): $(OBJS) | |
24 | - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | 26 | - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | |
25 | + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | 27 | + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | |
26 | 28 | |||
27 | # maintenance --------------------------------------------------------------- | 29 | # maintenance --------------------------------------------------------------- | |
28 | 30 |