databases/redisdesktopmanager: update to 2020.4

While here, clean up a bit

8 files changed, 37 insertions, 121 deletions

diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
index c890f00de8d8..6a19bf79ee94 100644
--- a/databases/redisdesktopmanager/Makefile
+++ b/databases/redisdesktopmanager/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	redisdesktopmanager
-PORTVERSION=	2020.3
+PORTVERSION=	2020.4
 CATEGORIES=	databases
 
 MAINTAINER=	swills@FreeBSD.org
@@ -10,16 +10,20 @@ COMMENT=	Redis DB management tool
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libssh2.so:security/libssh2
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libpython${PYTHON_VER}${PYTHON_ABIVER}.so:lang/python${PYTHON_SUFFIX} \
+		libssh2.so:security/libssh2
+
+USES=		compiler:c++0x dos2unix gettext-runtime gl kde:5 python:build \
+		qmake qt:5
 
-USES=		compiler:c++0x dos2unix gl kde:5 python:build qmake qt:5 ssl
 USE_GL=		gl
 USE_GITHUB=	yes
 
 DOS2UNIX_FILES=		3rdparty/3rdparty.pri
 BUILD_WRKSRC=		${WRKSRC}/src
 CONFIGURE_WRKSRC=	${WRKSRC}/src
-INSTALL_WRKSRC=		${WRKSRC}/bin/freebsd/release
+INSTALL_WRKSRC=		${WRKSRC}/bin/linux/release
 PLIST_FILES=		bin/rdm \
 			share/pixmaps/rdm.png
 BINARY_ALIAS=		python3-config=${PYTHON_CMD}-config
@@ -31,7 +35,6 @@ DESKTOP_ENTRIES=	"Redis Desktop Manager" \
 			""
 GH_TUPLE=		uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \
 			benlau:asyncfuture:4579d53:asyncfuture/3rdparty/qredisclient/3rdparty/asyncfuture \
-			RedisDesktop:CrashReporter:0202f9b:crashreporter/3rdparty/crashreporter \
 			uglide:qredisclient:470b76c:qredisclient/3rdparty/qredisclient \
 			sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
 			uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
@@ -40,8 +43,9 @@ GH_TUPLE=		uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager
 USE_QT=			charts concurrent core declarative gui network svg \
 			widgets buildtools_build qmake_build
 
-post-patch:
-	@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h
+QMAKE_ARGS+=	SYSTEM_LZ4=1 VERSION=${PORTVERSION}
+
+BINARY_ALIAS=	python3-config=${PYTHON_CMD}-config python3=${PYTHON_CMD}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/databases/redisdesktopmanager/distinfo b/databases/redisdesktopmanager/distinfo
index 852a9a99faae..d39820fc572d 100644
--- a/databases/redisdesktopmanager/distinfo
+++ b/databases/redisdesktopmanager/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1599939190
-SHA256 (uglide-RedisDesktopManager-2020.3_GH0.tar.gz) = bc6b63f6c5dd6044d76c69b012d114da5af74437ecd64d58d1b715c92d202e0a
-SIZE (uglide-RedisDesktopManager-2020.3_GH0.tar.gz) = 2827041
+TIMESTAMP = 1602096894
+SHA256 (uglide-RedisDesktopManager-2020.4_GH0.tar.gz) = 9993275581ee27fb57b51d5933ab4954c986dbe00d16e2f8cacf543cccd03acd
+SIZE (uglide-RedisDesktopManager-2020.4_GH0.tar.gz) = 2828629
 SHA256 (benlau-asyncfuture-4579d53_GH0.tar.gz) = ce5a3a4bc61f22f182eb8f932a3736289fc541e7487244fd57c93a141a038fe4
 SIZE (benlau-asyncfuture-4579d53_GH0.tar.gz) = 31928
 SHA256 (RedisDesktop-CrashReporter-0202f9b_GH0.tar.gz) = 4b0745dd12449716279a618eab0c8706422a0f67af680d0bf71471f9dbd371cb
diff --git a/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri b/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri
index 9b35633dac7c..ba85d2b1318b 100644
--- a/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri
+++ b/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri
@@ -1,26 +1,30 @@
---- 3rdparty/3rdparty.pri.orig	2020-08-10 20:11:17 UTC
+--- 3rdparty/3rdparty.pri.orig	2020-10-08 14:45:47 UTC
 +++ 3rdparty/3rdparty.pri
-@@ -53,15 +53,16 @@ unix:!macx { # ubuntu & debian   
+@@ -30,8 +30,10 @@ if(win32*):exists( $$PWD/qredisclient/qredisclient.lib
+ include($$PWD/pyotherside.pri)
+ 
+ #LZ4
+-LZ4DIR = $$PWD/lz4/
+-INCLUDEPATH += $$LZ4DIR/lib
++!defined(SYSTEM_LZ4, var) {
++    LZ4DIR = $$PWD/lz4/
++    INCLUDEPATH += $$LZ4DIR/lib
++}
+ 
+ win32* {
+     ZLIBDIR = $$PWD/zlib-msvc14-x64.1.2.11.7795/build/native    
+@@ -56,7 +58,13 @@ unix:!macx { # ubuntu & debian   
          #QMAKE_LFLAGS = -Wl,-rpath=/home/user/Qt5.9.3/5.9.3/gcc_64/lib
      }
  
-+    # Unix signal watcher
-+    DEFINES += LINUX_SIGNALS
+-    LIBS += -lz $$LZ4DIR/build/cmake/liblz4.a
++    LIBS += -lz
++    defined(SYSTEM_LZ4, var) {
++        LIBS += -llz4
++    } else {
++        LIBS += $$LZ4DIR/build/cmake/liblz4.a
++    }
 +
-     LIBS += -lz
  
      # Unix signal watcher
--    defined(LINUX_SIGNALS, var) {
--        message("Build with qt-unix-signals")
-+    message("Build with qt-unix-signals")
- 
--        DEFINES += LINUX_SIGNALS
--        HEADERS += $$PWD/qt-unix-signals/sigwatch.h
--        SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp
--        INCLUDEPATH += $$PWD/qt-unix-signals/
--    }
-+    DEFINES += LINUX_SIGNALS
-+    HEADERS += $$PWD/qt-unix-signals/sigwatch.h
-+    SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp
-+    INCLUDEPATH += $$PWD/qt-unix-signals/
- }
+     defined(LINUX_SIGNALS, var) {
diff --git a/databases/redisdesktopmanager/files/patch-src_app_app.cpp b/databases/redisdesktopmanager/files/patch-src_app_app.cpp
deleted file mode 100644
index 7216332b9e58..000000000000
--- a/databases/redisdesktopmanager/files/patch-src_app_app.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/app/app.cpp.orig	2020-08-10 20:06:43 UTC
-+++ src/app/app.cpp
-@@ -43,9 +43,6 @@ Application::Application(int& argc, char** argv)
-   processCmdArgs();
-   initAppFonts();
-   initRedisClient();
--#ifndef RDM_APPSTORE
--  initUpdater();
--#endif
-   installTranslator();
-   initPython();
- }
-@@ -254,9 +251,6 @@ void Application::initQml() {
- }
- 
- void Application::initUpdater() {
--  m_updater = QSharedPointer<Updater>(new Updater());
--  connect(m_updater.data(), SIGNAL(updateUrlRetrived(QString&)), this,
--          SLOT(OnNewUpdateAvailable(QString&)));
- }
- 
- void Application::initPython() {
diff --git a/databases/redisdesktopmanager/files/patch-src_main.cpp b/databases/redisdesktopmanager/files/patch-src_main.cpp
deleted file mode 100644
index da55ab103d3b..000000000000
--- a/databases/redisdesktopmanager/files/patch-src_main.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/main.cpp.orig	2020-08-10 20:08:12 UTC
-+++ src/main.cpp
-@@ -13,9 +13,7 @@
- #include "crashpad/handler.h"
- #endif
- 
--#ifdef LINUX_SIGNALS
- #include <sigwatch.h>
--#endif
- 
- #include "app/app.h"
- 
-@@ -50,12 +48,10 @@ int main(int argc, char *argv[])
- 
-     Application a(argc, argv);
- 
--#ifdef LINUX_SIGNALS
-     UnixSignalWatcher sigwatch;
-     sigwatch.watchForSignal(SIGINT);
-     sigwatch.watchForSignal(SIGTERM);
-     QObject::connect(&sigwatch, SIGNAL(unixSignal(int)), &a, SLOT(quit()));
--#endif
-     a.initModels();
-     a.initQml();
-     returnCode = a.exec();
diff --git a/databases/redisdesktopmanager/files/patch-src_modules_console_autocompletemodel.cpp b/databases/redisdesktopmanager/files/patch-src_modules_console_autocompletemodel.cpp
deleted file mode 100644
index 50387e0d9763..000000000000
--- a/databases/redisdesktopmanager/files/patch-src_modules_console_autocompletemodel.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-Fix build with Qt5-5.14
-
---- src/modules/console/autocompletemodel.cpp.orig	2020-04-04 11:36:31 UTC
-+++ src/modules/console/autocompletemodel.cpp
-@@ -1,4 +1,5 @@
- #include "autocompletemodel.h"
-+#include <QFile>
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QJsonArray>
diff --git a/databases/redisdesktopmanager/files/patch-src_rdm.pro b/databases/redisdesktopmanager/files/patch-src_rdm.pro
deleted file mode 100644
index bcf7534ff8dc..000000000000
--- a/databases/redisdesktopmanager/files/patch-src_rdm.pro
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/rdm.pro.orig	2020-08-10 20:02:36 UTC
-+++ src/rdm.pro
-@@ -30,7 +30,6 @@ SOURCES += \
-     $$files($$PWD/modules/console/*.cpp) \
-     $$files($$PWD/modules/value-editor/*model.cpp) \
-     $$files($$PWD/modules/value-editor/embedded*.cpp) \
--    $$files($$PWD/modules/updater/*.cpp) \
-     $$files($$PWD/modules/bulk-operations/*.cpp) \
-     $$files($$PWD/modules/bulk-operations/operations/*.cpp) \
-     $$files($$PWD/modules/common/*.cpp) \
-@@ -50,7 +49,6 @@ HEADERS  += \
-     $$files($$PWD/modules/value-editor/*factory.h) \
-     $$files($$PWD/modules/value-editor/*model.h) \
-     $$files($$PWD/modules/value-editor/embedded*.h) \
--    $$files($$PWD/modules/updater/*.h) \
-     $$files($$PWD/modules/*.h) \
-     $$files($$PWD/modules/bulk-operations/*.h) \
-     $$files($$PWD/modules/bulk-operations/operations/*.h) \
-@@ -102,8 +100,8 @@ unix:!macx { # ubuntu & debian
- 
-     QMAKE_CXXFLAGS += -Wno-sign-compare    
- 
--    release: DESTDIR = $$PWD/../bin/linux/release
--    debug:   DESTDIR = $$PWD/../bin/linux/debug
-+    release: DESTDIR = $$PWD/../bin/freebsd/release
-+    debug:   DESTDIR = $$PWD/../bin/freebsd/debug
- 
-     #deployment
-     LINUX_INSTALL_PATH = /opt/redis-desktop-manager
diff --git a/databases/redisdesktopmanager/files/patch-src_version.h b/databases/redisdesktopmanager/files/patch-src_version.h
deleted file mode 100644
index 3bad1dc9e745..000000000000
--- a/databases/redisdesktopmanager/files/patch-src_version.h
+++ /dev/null
@@ -1,6 +0,0 @@
---- src/version.h.orig	2018-04-23 05:38:55 UTC
-+++ src/version.h
-@@ -0,0 +1,3 @@
-+#ifndef RDM_VERSION
-+    #define RDM_VERSION "%%PORTVERSION%%"
-+#endif // !RDM_VERSION