Update to version 7.12 (dcraw.c revision 1.249):

This package is now numbered after the version number output by
dcraw program when run without argument.

Also add patch to compile on NetBSD >= 3.0 (memmem() addition).

Changes since last packaged version (dcraw.c revision 1.234):

revision 1.249
date: 2005/04/05 07:21:29;  author: dcoffin;  state: Exp;  lines: +43 -45
Added camera WB for the Canon S60 and all Fuji cameras.
----------------------------
revision 1.248
date: 2005/03/31 19:42:59;  author: dcoffin;  state: Exp;  lines: +28 -33
Added support for 22-megapixel Imacon Ixpress.
Moved some flip logic and adjusted the Casio EX-Z50.
----------------------------
revision 1.247
date: 2005/03/29 06:33:18;  author: dcoffin;  state: Exp;  lines: +15 -4
Added the Logitech Fotoman Pixtura, matrix for Fuji F810.
----------------------------
revision 1.246
date: 2005/03/28 19:32:13;  author: dcoffin;  state: Exp;  lines: +3 -3
Added the Fuji F710 and F800.
----------------------------
revision 1.245
date: 2005/03/28 04:56:02;  author: dcoffin;  state: Exp;  lines: +73 -52
Added the Nikon E900 and Casio EX-Z50.
Rewrote dng_coeff() to show saturated pixels as pure white.
----------------------------
revision 1.244
date: 2005/03/25 19:39:58;  author: dcoffin;  state: Exp;  lines: +1 -1
Fixed the maximum for the FinePix S3Pro.
----------------------------
revision 1.243
date: 2005/03/23 23:00:33;  author: dcoffin;  state: Exp;  lines: +4 -3
Added color matrix for the PowerShot S60.
----------------------------
revision 1.242
date: 2005/03/23 17:52:43;  author: dcoffin;  state: Exp;  lines: +34 -73
Fixed Kodak DC25 color and condensed three functions into simple_coeff().
----------------------------
revision 1.241
date: 2005/03/19 01:40:04;  author: dcoffin;  state: Exp;  lines: +28 -33
Added the Canon EOS 350D with more general CR2 support.
----------------------------
revision 1.240
date: 2005/03/18 22:15:37;  author: dcoffin;  state: Exp;  lines: +26 -14
Support "-w" for Canon CR2 and Contax N Digital images.
New cam_mul[] array will support 4-color cameras in the future.
----------------------------
revision 1.239
date: 2005/03/11 18:47:13;  author: dcoffin;  state: Exp;  lines: +11 -8
Fixed array bounds error in foveon_interpolate().
Don't use snprintf(), but keep strings safe anyway.
----------------------------
revision 1.238
date: 2005/03/11 00:50:22;  author: dcoffin;  state: Exp;  lines: +17 -5
Added the Canon EOS DIGITAL REBEL XT.
----------------------------
revision 1.237
date: 2005/03/10 03:48:40;  author: dcoffin;  state: Exp;  lines: +1745 -1238
Dcraw 7.00 is a major rewrite:
* It decodes all Adobe DNG files, and applies the same color matrices
  to non-DNG files.  Color science replaces black magic.
* It correctly decodes all Foveon images based on encrypted metadata.
* It decodes the Casio QV-R51, Casio EX-Z55, Minolta Alpha-7, Nikon D2X,
  and ST Micro STV680.
----------------------------
revision 1.236
date: 2005/02/27 03:26:37;  author: dcoffin;  state: Exp;  lines: +2 -1
Fixed divide by zero error.
----------------------------
revision 1.235
date: 2005/02/16 06:11:39;  author: dcoffin;  state: Exp;  lines: +19 -5
Added the Casio EX-P700.
Fixed three potential buffer overruns.

3 files changed, 25 insertions, 9 deletions

diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
index 6fcac02672d..d997383047a 100644
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/02/05 12:30:46 seb Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/07 09:16:47 seb Exp $
 #
 
 DISTNAME=	dcraw
-PKGNAME=	dcraw-1.234
+PKGNAME=	dcraw-7.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cybercom.net/~dcoffin/dcraw/
 DISTFILES=	dcraw.c dcraw.1
diff --git a/graphics/dcraw/distinfo b/graphics/dcraw/distinfo
index 71c38d59351..47ba447afa5 100644
--- a/graphics/dcraw/distinfo
+++ b/graphics/dcraw/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2005/02/24 08:45:04 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/04/07 09:16:47 seb Exp $
 
-SHA1 (dcraw-1.234/dcraw.c) = f663894c111e459076920117cb18fb2b06135974
-RMD160 (dcraw-1.234/dcraw.c) = d626a49bf2ba807a81b5e1d9eaf07d9c74f54f94
-Size (dcraw-1.234/dcraw.c) = 117836 bytes
-SHA1 (dcraw-1.234/dcraw.1) = 1d39e4de2072c42ebe73846f24be8d1098b64d0d
-RMD160 (dcraw-1.234/dcraw.1) = 796ca9f2c2fb28b767a97e0d58ad4519e1f6f8bf
-Size (dcraw-1.234/dcraw.1) = 3435 bytes
+SHA1 (dcraw-7.12/dcraw.c) = fb8d6ebbeb9ae29536b05c23e7c1ad90fcfb409a
+RMD160 (dcraw-7.12/dcraw.c) = 91438e26b6b5436af5c6f0ee527aa7bd1ce221a8
+Size (dcraw-7.12/dcraw.c) = 137294 bytes
+SHA1 (dcraw-7.12/dcraw.1) = 172a93d434c5352086b0e909267275276324ba7c
+RMD160 (dcraw-7.12/dcraw.1) = 96d18acc298c54f487961631b7d5b2947d76ab27
+Size (dcraw-7.12/dcraw.1) = 3612 bytes
+SHA1 (patch-aa) = 796166f137d12b3d49eb09fda50b8871d4683092
diff --git a/graphics/dcraw/patches/patch-aa b/graphics/dcraw/patches/patch-aa
new file mode 100644
index 00000000000..c0b3ba22498
--- /dev/null
+++ b/graphics/dcraw/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2005/04/07 09:16:47 seb Exp $
+
+--- dcraw.c.orig	2005-04-07 09:09:23.000000000 +0000
++++ dcraw.c
+@@ -163,7 +163,9 @@ struct decode {
+ 	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)
+ {