patch-ac is no longer needed; fixes linking problem

4 files changed, 6 insertions, 72 deletions

diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index ca10ccd0026..51f871f5246 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2009/05/28 08:07:50 adam Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/21 07:22:14 adam Exp $
 
 DISTNAME=	optipng-0.6.3
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optipng/}
 
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index 3321fee63db..001c2b1d686 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2009/05/28 08:07:50 adam Exp $
+$NetBSD: distinfo,v 1.15 2009/12/21 07:22:14 adam Exp $
 
 SHA1 (optipng-0.6.3.tar.gz) = eba6e3c940588b1d02abfabc407e5c759a3fdd8a
 RMD160 (optipng-0.6.3.tar.gz) = 3ef55878defee86a57b8b0b268da1a7e9eca0d14
 Size (optipng-0.6.3.tar.gz) = 1060571 bytes
-SHA1 (patch-aa) = 0a0c92b9786193862465646373b82c6bc47cee2c
-SHA1 (patch-ac) = fb4eb567b5a24b2d26bf357061be80c57b4d4a3c
+SHA1 (patch-aa) = 0d1340f90699d1c059d8d8afea67d9fa065a6778
diff --git a/graphics/optipng/patches/patch-aa b/graphics/optipng/patches/patch-aa
index 3b392e5d324..78874f610b2 100644
--- a/graphics/optipng/patches/patch-aa
+++ b/graphics/optipng/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2008/11/12 18:45:04 adam Exp $
+$NetBSD: patch-aa,v 1.11 2009/12/21 07:22:14 adam Exp $
 
 --- Makefile.orig	2008-11-12 19:29:05.000000000 +0100
 +++ Makefile
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.10 2008/11/12 18:45:04 adam Exp $
 +OBJS=	optipng.o opngoptim.o opngreduc.o cbitset.o osys.o strutil.o pngxio.o \
 +	pngxmem.o pngxrbmp.o pngxread.o pngxrgif.o pngxrjpg.o pngxrpnm.o \
 +	pngxrtif.o pngxset.o pngxwrite.o gifread.o pnmin.o pnmout.o pnmutil.o \
-+	png_write_sig.o minitiff.o tiffread.o tiffwrite.o
++	minitiff.o tiffread.o tiffwrite.o
 +
 +CPPFLAGS=	`libpng-config --cflags` -Ilib/pngxtern -Isrc
 +
diff --git a/graphics/optipng/patches/patch-ac b/graphics/optipng/patches/patch-ac
deleted file mode 100644
index bc5ed49735f..00000000000
--- a/graphics/optipng/patches/patch-ac
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/19 17:02:22 wiz Exp $
-
---- png_write_sig.c.orig	2006-04-19 15:45:16.000000000 +0200
-+++ png_write_sig.c
-@@ -0,0 +1,61 @@
-+/* png_write_sig.c from libpng-1.2.9 */
-+
-+/* pngwutil.c - utilities to write a PNG file
-+ *
-+ * Last changed in libpng 1.2.9 April 14, 2006
-+ * For conditions of distribution and use, see copyright notice in png.h
-+ * Copyright (c) 1998-2006 Glenn Randers-Pehrson
-+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
-+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
-+ */
-+
-+#define PNG_INTERNAL
-+#include "png.h"
-+
-+/* Simple function to write the signature.  If we have already written
-+ * the magic bytes of the signature, or more likely, the PNG stream is
-+ * being embedded into another stream and doesn't need its own signature,
-+ * we should call png_set_sig_bytes() to tell libpng how many of the
-+ * bytes have already been written.
-+ */
-+void /* PRIVATE */
-+png_write_sig(png_structp png_ptr)
-+{
-+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-+   /* write the rest of the 8 byte signature */
-+   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
-+      (png_size_t)8 - png_ptr->sig_bytes);
-+   if(png_ptr->sig_bytes < 3)
-+      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-+}
-+
-+/* pngwio.c - functions for data output
-+ *
-+ * Last changed in libpng 1.2.3 - May 21, 2002
-+ * For conditions of distribution and use, see copyright notice in png.h
-+ * Copyright (c) 1998-2002 Glenn Randers-Pehrson
-+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
-+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
-+ *
-+ * This file provides a location for all output.  Users who need
-+ * special handling are expected to write functions that have the same
-+ * arguments as these and perform similar functions, but that possibly
-+ * use different output methods.  Note that you shouldn't change these
-+ * functions, but rather write replacement functions and then change
-+ * them at run time with png_set_write_fn(...).
-+ */
-+
-+/* Write the data to whatever output you are using.  The default routine
-+   writes to a file pointer.  Note that this routine sometimes gets called
-+   with very small lengths, so you should implement some kind of simple
-+   buffering if you are using unbuffered writes.  This should never be asked
-+   to write more than 64K on a 16 bit machine.  */
-+
-+void /* PRIVATE */
-+png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-+{
-+   if (png_ptr->write_data_fn != NULL )
-+      (*(png_ptr->write_data_fn))(png_ptr, data, length);
-+   else
-+      png_error(png_ptr, "Call to NULL write function");
-+}