From b07bb71d1a4394df94539223495de65990facf9b Mon Sep 17 00:00:00 2001
From: gdt <gdt@pkgsrc.org>
Date: Thu, 29 Sep 2005 13:20:48 +0000
Subject: Take patch-aa from graphics/dcraw, avoiding defining memmem on NetBSD
 >=3.

Probably this should also avoid defining memmem on recent FreeBSD as
well, given that dcraw doesn't test for memmem presence.
---
 graphics/gimp-ufraw/Makefile         |  3 ++-
 graphics/gimp-ufraw/distinfo         |  3 ++-
 graphics/gimp-ufraw/patches/patch-ab | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 graphics/gimp-ufraw/patches/patch-ab

diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index f0c5b596c60..81ea431a4b5 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/09/27 00:31:18 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2005/09/29 13:20:48 gdt Exp $
 
 DISTNAME=		ufraw-0.5
 PKGNAME=		gimp-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
diff --git a/graphics/gimp-ufraw/distinfo b/graphics/gimp-ufraw/distinfo
index ab88e2435a6..c70cf967452 100644
--- a/graphics/gimp-ufraw/distinfo
+++ b/graphics/gimp-ufraw/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/09/27 00:31:18 gdt Exp $
+$NetBSD: distinfo,v 1.9 2005/09/29 13:20:48 gdt Exp $
 
 SHA1 (ufraw-0.5.tar.gz) = dc6d89157acd25d84ee48148772d6800dfb4eb1c
 RMD160 (ufraw-0.5.tar.gz) = 5cfe6be92507b81996d98fa6ddedc1de34a1ba52
 Size (ufraw-0.5.tar.gz) = 284234 bytes
 SHA1 (patch-aa) = 1ef87b4f0429b01338957b2e0203fd7cb95f08e1
+SHA1 (patch-ab) = ece7b54ed6e2209dd4654bc9c29d07c2c5db3e0a
diff --git a/graphics/gimp-ufraw/patches/patch-ab b/graphics/gimp-ufraw/patches/patch-ab
new file mode 100644
index 00000000000..aea016cef20
--- /dev/null
+++ b/graphics/gimp-ufraw/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2005/09/29 13:20:48 gdt Exp $
+
+--- dcraw.c.orig	2005-09-15 14:24:38.000000000 -0400
++++ dcraw.c
+@@ -188,7 +188,9 @@ int tone_curve_size = 0, tone_curve_offs
+ 	3 G R G R G R	3 B G B G B G	3 R G R G R G	3 G B G B G B
+  */
+ 
+-#ifndef __GLIBC__
++#include <sys/param.h>
++
++#if !(defined(__GLIBC__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000)))
+ char *memmem (char *haystack, size_t haystacklen,
+ 	      char *needle, size_t needlelen)
+ {
-- 
cgit v1.2.3