graphics/rawstudio: Add missing dependencies and renew patches

- Add dependencies found via DEVELOPERS=yes set in /etc/make.conf
- Reorder some Makefile vars, suggested by portclippy
- Add NLS option to conditionally disable gettext support
- Renew and rearrange all patches under files

PR:		254011
Approved by:	Oleksii Samorukov <samm@FreeBSD.org> (maintainer)

9 files changed, 99 insertions, 87 deletions

diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index ef5fb8debbeb..92e128d6bf80 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rawstudio
 PORTVERSION=	2.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawstudio.org/files/release/
 
@@ -11,27 +11,40 @@ COMMENT=	Open-source program to read and manipulate RAW photo images
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:graphics/png \
+BROKEN_powerpc64=	fails to link: libicuuc.so. undefined reference to __cxa_throw_bad_array_new_length
+
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libcurl.so:ftp/curl \
 		liblcms.so:graphics/lcms \
 		libexiv2.so:graphics/exiv2 \
 		libdbus-1.so:devel/dbus \
 		libfftw3f.so:math/fftw3-float \
-		liblensfun.so:graphics/lensfun \
 		libflickcurl.so:www/flickcurl \
-		libgphoto2.so:graphics/libgphoto2
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgphoto2.so:graphics/libgphoto2 \
+		libharfbuzz.so:print/harfbuzz \
+		liblensfun.so:graphics/lensfun \
+		libpng.so:graphics/png \
+		libraptor2.so:textproc/raptor2 \
+		libtiff.so:graphics/tiff
 
-BROKEN_powerpc64=	fails to link: libicuuc.so. undefined reference to __cxa_throw_bad_array_new_length
+USES=		compiler:c++11-lang desktop-file-utils gmake gnome \
+		jpeg libtool localbase pathfix pkgconfig sqlite xorg
+USE_GNOME=	cairo gconf2 gdkpixbuf2 gtk20 libxml2
+USE_LDCONFIG=	yes
+USE_XORG=	x11
 
-USES=		compiler:c++11-lang cpe desktop-file-utils gettext gmake \
-		gnome jpeg libtool localbase pathfix pkgconfig sqlite
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 libxml2 gconf2
-USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 CXXFLAGS+=	-Wno-c++11-narrowing
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^pkg_modules=/s,libssl,gthread-2.0,' \
 		${WRKSRC}/configure
diff --git a/graphics/rawstudio/files/patch-exiv2 b/graphics/rawstudio/files/patch-exiv2
deleted file mode 100644
index 0212d7c6d9b6..000000000000
--- a/graphics/rawstudio/files/patch-exiv2
+++ /dev/null
@@ -1,33 +0,0 @@
---- librawstudio/rs-exif.cc.orig
-+++ librawstudio/rs-exif.cc
-@@ -21,6 +21,8 @@
- #include <iomanip>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <exiv2/error.hpp>
-+#include <exiv2/version.hpp>
- #include "rs-exif.h"
- #include <assert.h>
- #include "rs-library.h"
---- plugins/load-gdk/exiv2-colorspace.cpp.orig
-+++ plugins/load-gdk/exiv2-colorspace.cpp
-@@ -22,6 +22,8 @@
- #include <iomanip>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <exiv2/version.hpp>
-+#include <exiv2/error.hpp>
- #include <assert.h>
- #include "exiv2-colorspace.h"
- #include <math.h>
---- plugins/meta-exiv2/exiv2-metadata.cpp.orig
-+++ plugins/meta-exiv2/exiv2-metadata.cpp
-@@ -22,6 +22,8 @@
- #include <iomanip>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-+#include <exiv2/version.hpp>
-+#include <exiv2/error.hpp>
- #include <assert.h>
- #include "exiv2-metadata.h"
- #include <math.h>
diff --git a/graphics/rawstudio/files/patch-libpng15 b/graphics/rawstudio/files/patch-libpng15
deleted file mode 100644
index c23a24f64034..000000000000
--- a/graphics/rawstudio/files/patch-libpng15
+++ /dev/null
@@ -1,35 +0,0 @@
---- plugins/output-pngfile/output-pngfile.c
-+++ plugins/output-pngfile/output-pngfile.c
-@@ -23,6 +23,7 @@
- #include <gettext.h>
- #include "config.h"
- #include <png.h>
-+#include <zlib.h>
- 
- #define RS_TYPE_PNGFILE (rs_pngfile_type)
- #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
-@@ -198,7 +199,7 @@
- 		rs_icc_profile_get_data(profile, &data, &data_length);
- 
- 		// FIXME: Insert correct profile name
--		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length);
-+		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length);
- 		if (pngfile->save16bit)
- 			png_set_gAMA(png_ptr, info_ptr, 1.0);
- 	}
---- plugins/load-gdk/exiv2-colorspace.cpp
-+++ plugins/load-gdk/exiv2-colorspace.cpp
-@@ -125,11 +125,11 @@
- 
- 					int compression_type;
- 					/* Extract embedded ICC profile */
--					if (info_ptr->valid & PNG_INFO_iCCP)
-+					if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP)
- 					{
- 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
- 													(png_charpp) &icc_profile_title, &compression_type,
--													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-+													(png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
- 						if (retval != 0)
- 						{
- 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
diff --git a/graphics/rawstudio/files/patch-librawstudio_rs-exif.cc b/graphics/rawstudio/files/patch-librawstudio_rs-exif.cc
new file mode 100644
index 000000000000..b6ba4a48bf13
--- /dev/null
+++ b/graphics/rawstudio/files/patch-librawstudio_rs-exif.cc
@@ -0,0 +1,11 @@
+--- librawstudio/rs-exif.cc.orig	2011-02-15 17:28:05 UTC
++++ librawstudio/rs-exif.cc
+@@ -21,6 +21,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
++#include <exiv2/version.hpp>
+ #include "rs-exif.h"
+ #include <assert.h>
+ #include "rs-library.h"
diff --git a/graphics/rawstudio/files/patch-rs-macros.h b/graphics/rawstudio/files/patch-librawstudio_rs-macros.h
index fdc456950c0c..f57e79f1be0d 100644
--- a/graphics/rawstudio/files/patch-rs-macros.h
+++ b/graphics/rawstudio/files/patch-librawstudio_rs-macros.h
@@ -1,5 +1,5 @@
---- librawstudio/rs-macros.h	2014-02-19 06:34:15.000000000 +0100
-+++ librawstudio/rs-macros.h	2014-02-19 06:34:21.000000000 +0100
+--- librawstudio/rs-macros.h.orig	2011-02-15 17:28:05 UTC
++++ librawstudio/rs-macros.h
 @@ -51,12 +51,12 @@
  #if __GNUC__ >= 3
  #define likely(x) __builtin_expect (!!(x), 1)
@@ -14,3 +14,4 @@
 +// #define align(x)
  #define __deprecated
  #endif
+ 
diff --git a/graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp b/graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp
new file mode 100644
index 000000000000..66b5ee793016
--- /dev/null
+++ b/graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp
@@ -0,0 +1,25 @@
+--- plugins/load-gdk/exiv2-colorspace.cpp.orig	2011-02-23 22:35:18 UTC
++++ plugins/load-gdk/exiv2-colorspace.cpp
+@@ -22,6 +22,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
++#include <exiv2/error.hpp>
+ #include <assert.h>
+ #include "exiv2-colorspace.h"
+ #include <math.h>
+@@ -125,11 +127,11 @@ jpeg_fail:
+ 
+ 					int compression_type;
+ 					/* Extract embedded ICC profile */
+-					if (info_ptr->valid & PNG_INFO_iCCP)
++					if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP)
+ 					{
+ 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+ 													(png_charpp) &icc_profile_title, &compression_type,
+-													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++													(png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
+ 						if (retval != 0)
+ 						{
+ 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
diff --git a/graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp b/graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp
new file mode 100644
index 000000000000..c78ebecd9bf2
--- /dev/null
+++ b/graphics/rawstudio/files/patch-plugins_meta-exiv2_exiv2-metadata.cpp
@@ -0,0 +1,11 @@
+--- plugins/meta-exiv2/exiv2-metadata.cpp.orig	2011-02-26 23:13:39 UTC
++++ plugins/meta-exiv2/exiv2-metadata.cpp
+@@ -22,6 +22,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
++#include <exiv2/error.hpp>
+ #include <assert.h>
+ #include "exiv2-metadata.h"
+ #include <math.h>
diff --git a/graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c b/graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c
new file mode 100644
index 000000000000..e1de783c9e0a
--- /dev/null
+++ b/graphics/rawstudio/files/patch-plugins_output-pngfile_output-pngfile.c
@@ -0,0 +1,19 @@
+--- plugins/output-pngfile/output-pngfile.c.orig	2011-03-26 01:52:29 UTC
++++ plugins/output-pngfile/output-pngfile.c
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
+@@ -198,7 +199,7 @@ execute(RSOutput *output, RSFilter *filter)
+ 		rs_icc_profile_get_data(profile, &data, &data_length);
+ 
+ 		// FIXME: Insert correct profile name
+-		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length);
++		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length);
+ 		if (pngfile->save16bit)
+ 			png_set_gAMA(png_ptr, info_ptr, 1.0);
+ 	}
diff --git a/graphics/rawstudio/files/patch-rs-tag-gui.c b/graphics/rawstudio/files/patch-src_rs-tag-gui.c
index c4033fb4df25..a0b69d3c2c53 100644
--- a/graphics/rawstudio/files/patch-rs-tag-gui.c
+++ b/graphics/rawstudio/files/patch-src_rs-tag-gui.c
@@ -1,6 +1,6 @@
---- src/rs-tag-gui.c.orig	2011-02-15 18:28:05.000000000 +0100
-+++ src/rs-tag-gui.c	2014-02-14 18:36:48.000000000 +0100
-@@ -93,11 +93,6 @@
+--- src/rs-tag-gui.c.orig	2011-02-15 17:28:05 UTC
++++ src/rs-tag-gui.c
+@@ -93,11 +93,6 @@ rs_tag_gui_toolbox_new(RSLibrary *library, RSStore *st
  	return box;
  }
  
@@ -12,15 +12,15 @@
  	gboolean
  	selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
  	{
-@@ -179,6 +174,11 @@
+@@ -178,6 +173,11 @@ rs_library_tag_entry_new(RSLibrary *library)
+ 
  		return found;
  	}
- 
++
 +GtkWidget *
 +rs_library_tag_entry_new(RSLibrary *library)
 +{
 +	g_assert(RS_IS_LIBRARY(library));
-+
+ 
  	GtkWidget *entry = gtk_entry_new();
  	GtkEntryCompletion *completion = gtk_entry_completion_new();
- 	GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);