From 6af156235b3b94e0c3542e1b617f2653855e0c4f Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 13 Jun 2010 22:43:46 +0000
Subject: Bump PKGREVISION for libpng shlib name change. Also add some patches
 to remove use of deprecated symbols and fix other problems when looking for
 or compiling against libpng-1.4.x.

---
 graphics/optipng/Makefile         |  3 ++-
 graphics/optipng/distinfo         |  3 ++-
 graphics/optipng/patches/patch-ab | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 graphics/optipng/patches/patch-ab

(limited to 'graphics/optipng')

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index f3e0d6e8bd6..cddedd452ed 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/04/11 10:08:51 adam Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:39 wiz Exp $
 
 DISTNAME=	optipng-0.6.4
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optipng/}
 
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index c89eeb244c0..9424b89d3bc 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/04/11 10:08:51 adam Exp $
+$NetBSD: distinfo,v 1.17 2010/06/13 22:44:39 wiz 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
diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab
new file mode 100644
index 00000000000..54af2d23beb
--- /dev/null
+++ b/graphics/optipng/patches/patch-ab
@@ -0,0 +1,17 @@
+$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
-- 
cgit v1.2.3