summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pngcrush/Makefile4
-rw-r--r--graphics/pngcrush/distinfo12
-rw-r--r--graphics/pngcrush/patches/patch-aa21
3 files changed, 19 insertions, 18 deletions
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 73fb1aeb306..89e6c0d90b0 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2015/06/15 09:03:31 adam Exp $
+# $NetBSD: Makefile,v 1.86 2016/10/08 06:16:24 adam Exp $
-DISTNAME= pngcrush-1.7.85-nolib
+DISTNAME= pngcrush-1.8.8-nolib
PKGNAME= ${DISTNAME:C/-nolib//}
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/}
diff --git a/graphics/pngcrush/distinfo b/graphics/pngcrush/distinfo
index c7c580e440e..080b4d67f13 100644
--- a/graphics/pngcrush/distinfo
+++ b/graphics/pngcrush/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.65 2015/11/03 21:34:15 agc Exp $
+$NetBSD: distinfo,v 1.66 2016/10/08 06:16:24 adam Exp $
-SHA1 (pngcrush-1.7.85-nolib.tar.xz) = 95ecddb7efb7e627a5c98676a93f5fc29dbe8c3e
-RMD160 (pngcrush-1.7.85-nolib.tar.xz) = 9700e8084b10ccefaf924391c31b142fa18e6ac7
-SHA512 (pngcrush-1.7.85-nolib.tar.xz) = 7b959fc6a8839fb0dab6471b13e866e11d5fefa072d6b135c7f621bd4b475765c2e8d0b471f074b6df7d6ccd8b5c33938e1143fb2e013986c4e8e5fada68c8ca
-Size (pngcrush-1.7.85-nolib.tar.xz) = 59828 bytes
-SHA1 (patch-aa) = c8342e5bb7947f1dc2ff31f0ef45190ebcc71d8e
+SHA1 (pngcrush-1.8.8-nolib.tar.xz) = 6cf6708cb5514b4ae290ac0ee1d801b2d977178d
+RMD160 (pngcrush-1.8.8-nolib.tar.xz) = b0960d946ec34b9b6a24cf1d7b6bf493af771864
+SHA512 (pngcrush-1.8.8-nolib.tar.xz) = fa2035fd7cf1c2a8ca5fbf95984dd3c8bbde60a109b366a5f07140d5c94aedff02156b8839c4c64a21280e44c40fef4684e9d7d5f5453d35a715cc4e8d53f046
+Size (pngcrush-1.8.8-nolib.tar.xz) = 64944 bytes
+SHA1 (patch-aa) = 5726060ffed7c1d0763ce7322acce31528d87b30
diff --git a/graphics/pngcrush/patches/patch-aa b/graphics/pngcrush/patches/patch-aa
index c4c436a62b1..bfdee6dc1cd 100644
--- a/graphics/pngcrush/patches/patch-aa
+++ b/graphics/pngcrush/patches/patch-aa
@@ -1,26 +1,27 @@
-$NetBSD: patch-aa,v 1.12 2012/06/11 07:06:21 adam Exp $
+$NetBSD: patch-aa,v 1.13 2016/10/08 06:16:24 adam Exp $
Don't override CC, LD, CFLAGS and LDFLAGS.
---- Makefile.orig 2011-01-21 23:04:44.000000000 +0000
+--- Makefile.orig 2016-10-03 05:16:21.000000000 +0000
+++ Makefile
-@@ -17,14 +17,10 @@ PNGLIB = ${HOME}/lib
- ZINC = ${HOME}/include
- ZLIB = ${HOME}/lib
+@@ -17,15 +17,11 @@ PNGLIB = /usr/local/lib
+ ZINC = /usr/local/include
+ ZLIB = /usr/local/lib
-CC = gcc
-LD = gcc
RM = rm -f
- #CFLAGS = -I. -O -Wall
- #CFLAGS = -I. -O3 -fomit-frame-pointer -Wall
--CFLAGS = -I${ZINC} -I. -g -O3 -fomit-frame-pointer -Wall
+
+ CPPFLAGS = -I $(PNGINC)
+
+-CFLAGS = -g -O3 -fomit-frame-pointer -Wall
# [note that -Wall is a gcc-specific compilation flag ("all warnings on")]
-LDFLAGS =
O = .o
E =
-@@ -68,7 +64,7 @@ pngcrush$(O): pngcrush.c cexcept.h
- # $(CC) -c $(CFLAGS) $<
+@@ -54,7 +50,7 @@ pngcrush$(O): pngcrush.c cexcept.h
+ mv png.h_embedded png.h
$(PNGCRUSH)$(E): $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)