graphics/nomacs: Update to 3.14.2, take MAINTAINER

ChangeLog: https://github.com/nomacs/nomacs/releases

* Themes added (light and dark)
	* RAW loader improvements
	* Anti-aliasing improved
	* Printing improved
	* Batch cropping added
	* Support for more file formats
	* Start-up time reduced
	* And various bug fixes

Submitter requests maintainership

PR:     245079
Submitted by:   vidar@karlsen.tech

8 files changed, 93 insertions, 139 deletions

diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 4331797265f3..cb99878263db 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -1,39 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	nomacs
-PORTVERSION=	3.6.1
-PORTREVISION=	9
+PORTVERSION=	3.14.2
 CATEGORIES=	graphics
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	vidar@karlsen.tech
 COMMENT=	Small, fast, and free image viewer
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
-		libsysinfo.so:devel/libsysinfo \
 		libopencv_highgui.so:graphics/opencv \
 		libopencv_core.so:graphics/opencv-core \
 		liblcms2.so:graphics/lcms2 \
-		libtbb.so:devel/tbb
+		libquazip5.so:archivers/quazip
 
-USES=		cmake compiler:c++11-lang desktop-file-utils dos2unix \
-		pkgconfig qt:5 tar:bzip2
+USES=		cmake compiler:c++11-lang desktop-file-utils \
+		pkgconfig qt:5
 USE_QT=		concurrent core gui network printsupport svg widgets \
 		buildtools_build linguisttools_build qmake_build
 
-DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	RAW TIFF
-OPTIONS_DEFAULT=	RAW TIFF
+USE_GITHUB=	yes
+
+CMAKE_ARGS=		-DUSE_SYSTEM_QUAZIP=ON
+CMAKE_SOURCE_PATH=	${WRKSRC}/ImageLounge
+
+OPTIONS_DEFINE=		RAW TIFF TRANSLATIONS PLUGINS
+OPTIONS_DEFAULT=	RAW TIFF TRANSLATIONS PLUGINS
+OPTIONS_SUB=		yes
 
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_CMAKE_BOOL=		ENABLE_RAW
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CMAKE_BOOL=		ENABLE_TIFF
+TIFF_CMAKE_BOOL=	ENABLE_TIFF
 
-USE_GITHUB=	yes
-WRKSRC_SUBDIR=	ImageLounge
+TRANSLATIONS_CMAKE_BOOL=	ENABLE_TRANSLATIONS
+TRANSLATIONS_DESC=		Install translations
+
+PLUGINS_GH_TUPLE=	nomacs:nomacs-plugins:3.14:plugins/ImageLounge/plugins
+PLUGINS_CMAKE_ON=	ENABLE_PLUGINS
 
 .include <bsd.port.mk>
diff --git a/graphics/nomacs/distinfo b/graphics/nomacs/distinfo
index bf245b53de67..b75fac32d751 100644
--- a/graphics/nomacs/distinfo
+++ b/graphics/nomacs/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1503992141
-SHA256 (nomacs-nomacs-3.6.1_GH0.tar.gz) = 09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068
-SIZE (nomacs-nomacs-3.6.1_GH0.tar.gz) = 28604636
+TIMESTAMP = 1585235191
+SHA256 (nomacs-nomacs-3.14.2_GH0.tar.gz) = 0e9e59fac5e369c1141692b723c2139ca28d59a9b0a909f0685bc437d3aa183f
+SIZE (nomacs-nomacs-3.14.2_GH0.tar.gz) = 2169504
+SHA256 (nomacs-nomacs-plugins-3.14_GH0.tar.gz) = df752bc57c0136a367553457452ee5b44b35524536e5fea1b51083d4ac09b76a
+SIZE (nomacs-nomacs-plugins-3.14_GH0.tar.gz) = 514472
diff --git a/graphics/nomacs/files/patch-ImageLounge_3rdparty_drif_drif__image.h b/graphics/nomacs/files/patch-ImageLounge_3rdparty_drif_drif__image.h
new file mode 100644
index 000000000000..1a3cb5d5374e
--- /dev/null
+++ b/graphics/nomacs/files/patch-ImageLounge_3rdparty_drif_drif__image.h
@@ -0,0 +1,11 @@
+--- ImageLounge/3rdparty/drif/drif_image.h.orig	2020-03-25 14:20:37 UTC
++++ ImageLounge/3rdparty/drif/drif_image.h
+@@ -26,7 +26,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ 
+-#if defined(Q_OS_MAC) || defined(Q_OS_OPENBSD)
++#if defined(Q_OS_MAC) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
+ #include <stdlib.h>
+ #else 
+ #include <malloc.h>
diff --git a/graphics/nomacs/files/patch-cmake_Unix.cmake b/graphics/nomacs/files/patch-cmake_Unix.cmake
deleted file mode 100644
index bbb591230844..000000000000
--- a/graphics/nomacs/files/patch-cmake_Unix.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-Sent upstream: https://github.com/nomacs/nomacs/pull/187
-
-From 6617595f409f13f035895f6494a4d8e14047334e Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Mon, 29 Jan 2018 12:01:50 +0100
-Subject: [PATCH] cmake: Stop calling QT5_WRAP_CPP() when building quazip and
- libqpsd.
-
-cmake/Utils.cmake already sets CMAKE_AUTOMOC to on.
-
-Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and
-LIBQPSD_MOC_SRC were never actually added as source dependencies in
-MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own
-automoc infrastructure was actually being used and the moc invocations from
-QT5_WRAP_CPP() were not being made at all.
-
-Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property
-on the macro's input files, which means neither CMake's automoc
-infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up
-with several 'undefined reference to vtable' errors when linking.
---- cmake/Unix.cmake.orig	2017-03-24 14:47:13 UTC
-+++ cmake/Unix.cmake
-@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE)
- 
- unset(QUAZIP_HEADERS CACHE)
- unset(QUAZIP_SOURCES CACHE)
--unset(QUAZIP_MOCS CACHE)
- unset(QT_ROOT CACHE)
- 
- if(ENABLE_QUAZIP)
-@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP)
- 
-     file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp")
-     file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
--    file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")
- 
--    QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
-     add_definitions(-DWITH_QUAZIP)
-   endif(USE_SYSTEM_QUAZIP)
- endif(ENABLE_QUAZIP)
-@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD)
- ELSE()
- 	file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
- 	file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
--	file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
--	QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
- ENDIF(USE_SYSTEM_LIBQPSD)
diff --git a/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake b/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
deleted file mode 100644
index 1eda23093d0d..000000000000
--- a/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/UnixBuildTarget.cmake.orig	2017-08-29 07:50:23 UTC
-+++ cmake/UnixBuildTarget.cmake
-@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/tr
- #  manpage
- install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
- #  appdata
--install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/)
-+install(FILES nomacs.appdata.xml DESTINATION share/appdata/)
- 
- # "make dist" target
- string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)
diff --git a/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp b/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
deleted file mode 100644
index ccc25805bf76..000000000000
--- a/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/DkCore/DkMetaData.cpp.orig	2019-07-07 07:58:56 UTC
-+++ src/DkCore/DkMetaData.cpp
-@@ -40,6 +40,7 @@
- #include <QVector2D>
- #include <QApplication>
- #pragma warning(pop)		// no warnings from includes - end
-+#include <iostream>
- 
- namespace nmc {
- 
-@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const {
- 
- 	std::string xmpPacket;
- 	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {
--		throw Exiv2::Error(1, "Failed to serialize XMP data");
-+		throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Failed to serialize XMP data");
- 	}
- 	std::cout << xmpPacket << "\n";
- }
diff --git a/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp b/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp
deleted file mode 100644
index 94856dcaf295..000000000000
--- a/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: warning: '&&' within '||' [-Wlogical-op-parentheses]
-        else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
-                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~
-/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: note: place parentheses around the '&&' expression to silence this warning
-        else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
-                   ^
-                 (                                                            )
-
---- src/DkCore/DkPluginManager.cpp.orig	2019-07-07 07:04:23 UTC
-+++ src/DkCore/DkPluginManager.cpp
-@@ -368,7 +368,7 @@ void DkPluginContainer::run() {
- 		connect(vPlugin->getViewPort(), SIGNAL(showToolbar(QToolBar*, bool)), vPlugin->getMainWindow(), SLOT(showToolbar(QToolBar*, bool)));
- 		emit runPlugin(vPlugin, false);
- 	}
--	else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
-+	else if (p && (p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch)) {
- 
- 		QAction* a = qobject_cast<QAction*>(QObject::sender());
- 
diff --git a/graphics/nomacs/pkg-plist b/graphics/nomacs/pkg-plist
index efa41f72757c..84a3b4a0383b 100644
--- a/graphics/nomacs/pkg-plist
+++ b/graphics/nomacs/pkg-plist
@@ -1,33 +1,63 @@
 bin/nomacs
 lib/libnomacsCore.so
 lib/libnomacsCore.so.3
-lib/libnomacsCore.so.3.6.0
-share/appdata/nomacs.appdata.xml
+lib/libnomacsCore.so.3.14.0
 share/applications/nomacs.desktop
 share/man/man1/nomacs.1.gz
-%%DATADIR%%/translations/nomacs_als.qm
-%%DATADIR%%/translations/nomacs_ar.qm
-%%DATADIR%%/translations/nomacs_az.qm
-%%DATADIR%%/translations/nomacs_bg.qm
-%%DATADIR%%/translations/nomacs_bs.qm
-%%DATADIR%%/translations/nomacs_cs.qm
-%%DATADIR%%/translations/nomacs_de.qm
-%%DATADIR%%/translations/nomacs_en.qm
-%%DATADIR%%/translations/nomacs_es.qm
-%%DATADIR%%/translations/nomacs_fr.qm
-%%DATADIR%%/translations/nomacs_hr.qm
-%%DATADIR%%/translations/nomacs_it.qm
-%%DATADIR%%/translations/nomacs_ja.qm
-%%DATADIR%%/translations/nomacs_ko.qm
-%%DATADIR%%/translations/nomacs_nl.qm
-%%DATADIR%%/translations/nomacs_pl.qm
-%%DATADIR%%/translations/nomacs_pt.qm
-%%DATADIR%%/translations/nomacs_ru.qm
-%%DATADIR%%/translations/nomacs_sk.qm
-%%DATADIR%%/translations/nomacs_sl.qm
-%%DATADIR%%/translations/nomacs_sr.qm
-%%DATADIR%%/translations/nomacs_sv.qm
-%%DATADIR%%/translations/nomacs_tr.qm
-%%DATADIR%%/translations/nomacs_uk.qm
-%%DATADIR%%/translations/nomacs_zh.qm
+share/metainfo/nomacs.appdata.xml
+%%DATADIR%%/Image Lounge/themes/Dark-Theme.css
+%%DATADIR%%/Image Lounge/themes/Light-Theme.css
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_af.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_als.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ar.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_az.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bg.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_br_pt.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_bs.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ca.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_cs.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_da.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_de.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_el.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_en.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_es.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_et.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fi.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_fr.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_he.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hi.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hr.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_hu.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_id.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_it.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ja.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ko.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_nl.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_no.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pl.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_pt.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ro.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_ru.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sk.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sl.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sr.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_sv.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tr.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_tw_zh.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_uk.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_vi.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh.qm
+%%TRANSLATIONS%%%%DATADIR%%/Image Lounge/translations/nomacs_zh_CN.qm
 share/pixmaps/nomacs.svg
+%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so
+%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3
+%%PLUGINS%%lib/nomacs-plugins/libaffineTransformPlugin.so.3.14.0
+%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so
+%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3
+%%PLUGINS%%lib/nomacs-plugins/libfakeMiniaturesPlugin.so.3.14.0
+%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so
+%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3
+%%PLUGINS%%lib/nomacs-plugins/libpageExtractionPlugin.so.3.14.0
+%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so
+%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3
+%%PLUGINS%%lib/nomacs-plugins/libpaintPlugin.so.3.14.0