Index: head/graphics/ufraw/Makefile
===================================================================
--- head/graphics/ufraw/Makefile	(revision 473683)
+++ head/graphics/ufraw/Makefile	(revision 473684)
@@ -1,65 +1,65 @@
 # Created by: Mark Murray <markm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ufraw
 PORTVERSION=	0.22
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Read and manipulate raw images from various digital cameras
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libpng.so:graphics/png \
 		liblcms2.so:graphics/lcms2 \
 		libjasper.so:graphics/jasper \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-extras
 USES=		gettext gmake jpeg pkgconfig autoreconf
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME
 OPTIONS_DEFAULT=CONTRAST EXIV2 LENSFUN GTK2
 OPTIONS_SUB=	yes
 
 CONTRAST_DESC=	Enable contrast setting option
 DST_DESC=	Use local time for timestamps
 FITS_DESC=	FITS output support
 GIMP_DESC=	Install GIMP plugin
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sergiomb2
 GH_PROJECT=	ufraw
 GH_TAGNAME=	6d3259a
 
 USE_GNOME+=glib20 gtk20 cairo gdkpixbuf2
 
 CONTRAST_CONFIGURE_ENABLE=	contrast
 DST_CONFIGURE_ENABLE=	dst-correction
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_VARS_OFF=		PC_FALSE+=exiv2
 LENSFUN_LIB_DEPENDS=	liblensfun.so:graphics/lensfun
 LENSFUN_VARS_OFF=	PC_FALSE+=lensfun
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 FITS_VARS_OFF=		PC_FALSE+=cfitsio
 GIMP_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 GIMP_CONFIGURE_WITH=	gimp
 GIMP_VARS_OFF=		PC_FALSE+=gimp
 GIMP_IMPLIES=		GTK2
 GTK2_LIB_DEPENDS=	libgtkimageview.so:x11-toolkits/gtkimageview
 GTK2_CONFIGURE_WITH=	gtk
 GNOME_USE=		GNOME=gconf2
 GNOME_CONFIGURE_ENABLE=	mime
 GNOME_VARS=		CATEGORIES+=gnome GCONF_SCHEMAS=${PORTNAME}.schemas
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/ufraw.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/ufraw/files/patch-dcraw.cc
===================================================================
--- head/graphics/ufraw/files/patch-dcraw.cc	(revision 473683)
+++ head/graphics/ufraw/files/patch-dcraw.cc	(revision 473684)
@@ -1,23 +1,41 @@
---- dcraw.cc.orig	2018-04-03 22:16:35 UTC
+--- dcraw.cc.orig	2018-06-23 21:54:05 UTC
 +++ dcraw.cc
 @@ -2287,7 +2287,7 @@ void CLASS quicktake_100_load_raw()
  
  void CLASS kodak_radc_load_raw()
  {
 -  static const char src[] = {
 +  static const signed char src[] = {
      1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
      1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
      2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
 @@ -3017,7 +3017,10 @@ void CLASS smal_decode_segment (unsigned
        diff = diff ? -diff : 0x80;
      if (ftell(ifp) + 12 >= (int) seg[1][1])
        diff = 0;
 -    raw_image[pix] = pred[pix & 1] += diff;
 +    if(pix>=raw_width*raw_height)
 +      derror();
 +    else
 +      raw_image[pix] = pred[pix & 1] += diff;
      if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2;
    }
    maximum = 0xff;
+@@ -8946,7 +8949,7 @@ void CLASS identify()
+     parse_fuji (get4());
+     if (thumb_offset > 120) {
+       fseek (ifp, 120, SEEK_SET);
+-      is_raw += (i = get4()) && 1;
++      is_raw += (i = get4()) & 1;
+       if (is_raw == 2 && shot_select)
+ 	parse_fuji (i);
+     }
+@@ -10192,7 +10195,7 @@ void CLASS tiff_head (struct tiff_hdr *t
+   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);
Index: head/graphics/ufraw/files/patch-ufraw__developer.c
===================================================================
--- head/graphics/ufraw/files/patch-ufraw__developer.c	(nonexistent)
+++ head/graphics/ufraw/files/patch-ufraw__developer.c	(revision 473684)
@@ -0,0 +1,11 @@
+--- ufraw_developer.c.orig	2018-06-23 21:40:09 UTC
++++ ufraw_developer.c
+@@ -387,7 +387,7 @@ static double findExpCoeff(double b)
+     else a = b;
+     bg = a / (1 - exp(-a));
+     /* The limit on try is just to be sure there is no infinite loop. */
+-    for (try = 0; abs(bg - b) > 0.001 || try < 100; try++) {
++    for (try = 0; fabs(bg - b) > 0.001 || try < 100; try++) {
+                     a = a + (b - bg);
+                     bg = a / (1 - exp(-a));
+                 }

Property changes on: head/graphics/ufraw/files/patch-ufraw__developer.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property