Update ufraw from 0.21 to 0.22

Major changes :
- Upstream fix for CVE-2015-3885
- replace liblcms1 by liblcms2
- lot of new cameras and bugfixes
- better foveon support

3 files changed, 4 insertions, 25 deletions

diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index dbf5a1e86ae0..0f14e45cacb2 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ufraw
-PORTVERSION=	0.21
+PORTVERSION=	0.22
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpng.so:${PORTSDIR}/graphics/png \
-		liblcms.so:${PORTSDIR}/graphics/lcms
+		liblcms2.so:${PORTSDIR}/graphics/lcms2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --enable-extras
diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo
index 897b838786c0..21babb99a0d9 100644
--- a/graphics/ufraw/distinfo
+++ b/graphics/ufraw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ufraw-0.21.tar.gz) = 2a6a1bcc633bdc8e15615cf726befcd7f27ab00e7c2a518469a24e1a96964d87
-SIZE (ufraw-0.21.tar.gz) = 1016298
+SHA256 (ufraw-0.22.tar.gz) = f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e
+SIZE (ufraw-0.22.tar.gz) = 1103554
diff --git a/graphics/ufraw/files/patch-dcraw.cc b/graphics/ufraw/files/patch-dcraw.cc
deleted file mode 100644
index d5278fbd8eb0..000000000000
--- a/graphics/ufraw/files/patch-dcraw.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- dcraw.cc.orig	2015-01-30 15:15:16.000000000 +0000
-+++ dcraw.cc	2015-05-14 19:29:47.000000000 +0000
-@@ -934,7 +934,8 @@
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x10000];
-   const uchar *dp;
- 
-@@ -9715,7 +9716,7 @@
-   strncpy (th->desc, desc, 512);
-   strncpy (th->make, make, 64);
-   strncpy (th->model, model, 64);
--  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
-+  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
-   t = localtime (&timestamp);
-   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
-       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);