Update to upstream bugfix revision #1.

Changelog: <http://rawtherapee.com/blog/rawtherapee-5.0-revision-1-released>

8 files changed, 58 insertions, 39 deletions

diff --git a/graphics/rawtherapee-devel/Makefile b/graphics/rawtherapee-devel/Makefile
index bbcf0e8d8e3f..b3775672dbb4 100644
--- a/graphics/rawtherapee-devel/Makefile
+++ b/graphics/rawtherapee-devel/Makefile
@@ -77,10 +77,6 @@ OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-loops -msse2
 #
 
 .if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1003000
-IGNORE=	is only for supported FreeBSD releases
-.endif
-
 .if ${OSVERSION} >= 1200000
 # don't waste everybody's time with Tier-2 and moving targets.
 # might add ARM64 or SPARC64 later on if they are established by the
@@ -101,7 +97,6 @@ LDFLAGS+=	${OPENMP_FLAGS}
 .endif
 
 .if defined(WITH_DEBUG)
-CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
diff --git a/graphics/rawtherapee-devel/distinfo b/graphics/rawtherapee-devel/distinfo
index 8acad474da5e..f8a602884362 100644
--- a/graphics/rawtherapee-devel/distinfo
+++ b/graphics/rawtherapee-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485205646
-SHA256 (rawtherapee-5.0-gtk3.tar.xz) = 25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8
-SIZE (rawtherapee-5.0-gtk3.tar.xz) = 10442940
+TIMESTAMP = 1486072535
+SHA256 (rawtherapee-5.0-r1-gtk3.tar.xz) = fa6d69dd25de14c9b1798955beae2f957a998ab08cbb2c3744d8dd55924bea51
+SIZE (rawtherapee-5.0-r1-gtk3.tar.xz) = 10392408
diff --git a/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc b/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc
deleted file mode 100644
index 1a996041fd7e..000000000000
--- a/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtengine/dcraw.cc.orig	2016-12-30 15:28:53 UTC
-+++ rtengine/dcraw.cc
-@@ -2011,7 +2011,7 @@ void CLASS hasselblad_correct()
-                                             {bhu-1,0},{bhu-1,bwu/2},{bhu-1,bwu-1}};
-             for (col = 0; col < bw; col++) {
-                 for (i = 0; i < 9; i++) {
--                    ushort dist = (ushort)sqrt(abs(corners[i][0] - row) * abs(corners[i][0] - row) + abs(corners[i][1] - col) * abs(corners[i][1] - col));
-+                    ushort dist = (ushort)sqrt(std::fabs(corners[i][0] - row) * std::fabs(corners[i][0] - row) + std::fabs(corners[i][1] - col) * std::fabs(corners[i][1] - col));
-                     ushort weight = dist > maxdist ? 0 : maxdist - dist;
-                     corners_weight[9*(row*bw+col)+i] = weight;
-                 }
diff --git a/graphics/rawtherapee-devel/pkg-plist b/graphics/rawtherapee-devel/pkg-plist
index 88a8b6612ab0..12702b65911a 100644
--- a/graphics/rawtherapee-devel/pkg-plist
+++ b/graphics/rawtherapee-devel/pkg-plist
@@ -876,4 +876,29 @@ share/icons/hicolor/48x48/apps/rawtherapee.png
 %%DATADIR%%/themes/RawTherapee-GTK3-_19.css
 %%DATADIR%%/themes/TooWaBlue-Dark-GTK3-20_.css
 %%DATADIR%%/themes/TooWaBlue-GTK3-20_.css
+%%DATADIR%%/themes/TooWaBlue-GTK3-_19.css
+%%DATADIR%%/themes/images/svg/twb/checkbox-checked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-checked.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked.svg
+%%DATADIR%%/themes/images/svg/twb/radio-checked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/radio-checked.svg
+%%DATADIR%%/themes/images/svg/twb/radio-inconsistent-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/radio-inconsistent.svg
+%%DATADIR%%/themes/images/svg/twb/radio-unchecked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/radio-unchecked.svg
+%%DATADIR%%/themes/images/twb/checkbox-checked-disabled.png
+%%DATADIR%%/themes/images/twb/checkbox-checked.png
+%%DATADIR%%/themes/images/twb/checkbox-inconsistent-disabled.png
+%%DATADIR%%/themes/images/twb/checkbox-inconsistent.png
+%%DATADIR%%/themes/images/twb/checkbox-unchecked-disabled.png
+%%DATADIR%%/themes/images/twb/checkbox-unchecked.png
+%%DATADIR%%/themes/images/twb/radio-checked-disabled.png
+%%DATADIR%%/themes/images/twb/radio-checked.png
+%%DATADIR%%/themes/images/twb/radio-inconsistent-disabled.png
+%%DATADIR%%/themes/images/twb/radio-inconsistent.png
+%%DATADIR%%/themes/images/twb/radio-unchecked-disabled.png
+%%DATADIR%%/themes/images/twb/radio-unchecked.png
 %%DATADIR%%/themes/system.iconset
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 017a5585c3d1..cf8abe8b708b 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	rawtherapee
-PORTVERSION=	5.0
+PORTVERSION=	5.0.1
 DISTVERSIONSUFFIX=	-gtk3
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}${DISTVERSIONSUFFIX}
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawtherapee.com/shared/source/
 
@@ -75,10 +76,6 @@ OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-loops -msse2
 #
 
 .if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1003000
-IGNORE=	is only for supported FreeBSD releases
-.endif
-
 .if ${OSVERSION} >= 1200000
 # don't waste everybody's time with Tier-2 and moving targets.
 # might add ARM64 or SPARC64 later on if they are established by the
@@ -99,7 +96,6 @@ LDFLAGS+=	${OPENMP_FLAGS}
 .endif
 
 .if defined(WITH_DEBUG)
-CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
diff --git a/graphics/rawtherapee/distinfo b/graphics/rawtherapee/distinfo
index 8acad474da5e..f8a602884362 100644
--- a/graphics/rawtherapee/distinfo
+++ b/graphics/rawtherapee/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485205646
-SHA256 (rawtherapee-5.0-gtk3.tar.xz) = 25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8
-SIZE (rawtherapee-5.0-gtk3.tar.xz) = 10442940
+TIMESTAMP = 1486072535
+SHA256 (rawtherapee-5.0-r1-gtk3.tar.xz) = fa6d69dd25de14c9b1798955beae2f957a998ab08cbb2c3744d8dd55924bea51
+SIZE (rawtherapee-5.0-r1-gtk3.tar.xz) = 10392408
diff --git a/graphics/rawtherapee/files/patch-rtengine_dcraw.cc b/graphics/rawtherapee/files/patch-rtengine_dcraw.cc
deleted file mode 100644
index 1a996041fd7e..000000000000
--- a/graphics/rawtherapee/files/patch-rtengine_dcraw.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- rtengine/dcraw.cc.orig	2016-12-30 15:28:53 UTC
-+++ rtengine/dcraw.cc
-@@ -2011,7 +2011,7 @@ void CLASS hasselblad_correct()
-                                             {bhu-1,0},{bhu-1,bwu/2},{bhu-1,bwu-1}};
-             for (col = 0; col < bw; col++) {
-                 for (i = 0; i < 9; i++) {
--                    ushort dist = (ushort)sqrt(abs(corners[i][0] - row) * abs(corners[i][0] - row) + abs(corners[i][1] - col) * abs(corners[i][1] - col));
-+                    ushort dist = (ushort)sqrt(std::fabs(corners[i][0] - row) * std::fabs(corners[i][0] - row) + std::fabs(corners[i][1] - col) * std::fabs(corners[i][1] - col));
-                     ushort weight = dist > maxdist ? 0 : maxdist - dist;
-                     corners_weight[9*(row*bw+col)+i] = weight;
-                 }
diff --git a/graphics/rawtherapee/pkg-plist b/graphics/rawtherapee/pkg-plist
index 88a8b6612ab0..12702b65911a 100644
--- a/graphics/rawtherapee/pkg-plist
+++ b/graphics/rawtherapee/pkg-plist
@@ -876,4 +876,29 @@ share/icons/hicolor/48x48/apps/rawtherapee.png
 %%DATADIR%%/themes/RawTherapee-GTK3-_19.css
 %%DATADIR%%/themes/TooWaBlue-Dark-GTK3-20_.css
 %%DATADIR%%/themes/TooWaBlue-GTK3-20_.css
+%%DATADIR%%/themes/TooWaBlue-GTK3-_19.css
+%%DATADIR%%/themes/images/svg/twb/checkbox-checked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-checked.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked.svg
+%%DATADIR%%/themes/images/svg/twb/radio-checked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/radio-checked.svg
+%%DATADIR%%/themes/images/svg/twb/radio-inconsistent-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/radio-inconsistent.svg
+%%DATADIR%%/themes/images/svg/twb/radio-unchecked-disabled.svg
+%%DATADIR%%/themes/images/svg/twb/radio-unchecked.svg
+%%DATADIR%%/themes/images/twb/checkbox-checked-disabled.png
+%%DATADIR%%/themes/images/twb/checkbox-checked.png
+%%DATADIR%%/themes/images/twb/checkbox-inconsistent-disabled.png
+%%DATADIR%%/themes/images/twb/checkbox-inconsistent.png
+%%DATADIR%%/themes/images/twb/checkbox-unchecked-disabled.png
+%%DATADIR%%/themes/images/twb/checkbox-unchecked.png
+%%DATADIR%%/themes/images/twb/radio-checked-disabled.png
+%%DATADIR%%/themes/images/twb/radio-checked.png
+%%DATADIR%%/themes/images/twb/radio-inconsistent-disabled.png
+%%DATADIR%%/themes/images/twb/radio-inconsistent.png
+%%DATADIR%%/themes/images/twb/radio-unchecked-disabled.png
+%%DATADIR%%/themes/images/twb/radio-unchecked.png
 %%DATADIR%%/themes/system.iconset