Date: Thu, 8 Oct 2020 15:10:00 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551710 - in head/databases/redisdesktopmanager: . files Message-ID: <202010081510.098FA0pi042171@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Thu Oct 8 15:09:59 2020 New Revision: 551710 URL: https://svnweb.freebsd.org/changeset/ports/551710 Log: databases/redisdesktopmanager: update to 2020.4 While here, clean up a bit Deleted: head/databases/redisdesktopmanager/files/patch-src_app_app.cpp head/databases/redisdesktopmanager/files/patch-src_main.cpp head/databases/redisdesktopmanager/files/patch-src_modules_console_autocompletemodel.cpp head/databases/redisdesktopmanager/files/patch-src_rdm.pro head/databases/redisdesktopmanager/files/patch-src_version.h Modified: head/databases/redisdesktopmanager/Makefile (contents, props changed) head/databases/redisdesktopmanager/distinfo (contents, props changed) head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri (contents, props changed) Modified: head/databases/redisdesktopmanager/Makefile ============================================================================== --- head/databases/redisdesktopmanager/Makefile Thu Oct 8 14:39:34 2020 (r551709) +++ head/databases/redisdesktopmanager/Makefile Thu Oct 8 15:09:59 2020 (r551710) @@ -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 gl kde:5 python:build qmake qt:5 ssl +USES= compiler:c++0x dos2unix gettext-runtime gl kde:5 python:build \ + qmake qt:5 + 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}:D 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 Modified: head/databases/redisdesktopmanager/distinfo ============================================================================== --- head/databases/redisdesktopmanager/distinfo Thu Oct 8 14:39:34 2020 (r551709) +++ head/databases/redisdesktopmanager/distinfo Thu Oct 8 15:09:59 2020 (r551710) @@ -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 Modified: head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri ============================================================================== --- head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri Thu Oct 8 14:39:34 2020 (r551709) +++ head/databases/redisdesktopmanager/files/patch-3rdparty_3rdparty.pri Thu Oct 8 15:09:59 2020 (r551710) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010081510.098FA0pi042171>