diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-10-22 09:07:31 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-10-22 09:07:31 +0000 |
commit | 051bd96f0cf527e9a4477c5337318005b3f2f05d (patch) | |
tree | 8588811a4906fdc4725a68b19b6c49f932bcbca9 /misc | |
parent | net-mgmt/icinga2: Update to 2.12.1 which fixes a long standing bug in distrib... (diff) |
- Update to the latest snapshot (still alpha quality)
- Now compatible with wxWidgets version 3.0 and 3.1
- Reformat port description for somewhat better looks
Notes
Notes:
svn path=/head/; revision=552954
Diffstat (limited to 'misc')
-rw-r--r-- | misc/far2l/Makefile | 18 | ||||
-rw-r--r-- | misc/far2l/distinfo | 6 | ||||
-rw-r--r-- | misc/far2l/files/patch-WinPort_src_APIFSNotify.cpp | 10 | ||||
-rw-r--r-- | misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake | 26 | ||||
-rw-r--r-- | misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake | 22 | ||||
-rw-r--r-- | misc/far2l/pkg-descr | 9 | ||||
-rw-r--r-- | misc/far2l/pkg-plist | 8 |
7 files changed, 31 insertions, 68 deletions
diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile index 06cee4f3f709..88f19419bd86 100644 --- a/misc/far2l/Makefile +++ b/misc/far2l/Makefile @@ -2,19 +2,23 @@ # $FreeBSD$ PORTNAME= far2l -PORTVERSION= g20200622 +PORTVERSION= g20201021 CATEGORIES= misc MAINTAINER= danfe@FreeBSD.org COMMENT= Port of FAR v2 to Unix-like systems -BUILD_DEPENDS= gawk:lang/gawk gm4:devel/m4 -LIB_DEPENDS= libpcre.so:devel/pcre +BUILD_DEPENDS= gawk:lang/gawk gm4:devel/m4 \ + ${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog +LIB_DEPENDS= libfmt.so:devel/libfmt \ + libpcre.so:devel/pcre \ + libuchardet.so:textproc/uchardet \ + libxerces-c.so:textproc/xerces-c3 RUN_DEPENDS= bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= elfmz -GH_TAGNAME= 43057bd +GH_TAGNAME= aee26c9 USES= cmake compiler:c++11-lang libarchive pkgconfig shebangfix ssl SHEBANG_FILES= far2l/bootstrap/roots.sh @@ -34,6 +38,10 @@ WEBDAV_DESC= WebDav protocol support via libneon WEBDAV_LIB_DEPENDS= libneon.so:www/neon WXGTK_CMAKE_OFF= -DUSEWX:BOOL=OFF -WXGTK_USE= WX=3.0 +WXGTK_USE= WX=3.0+ + +post-patch: + @${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \ + -0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,' .include <bsd.port.mk> diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo index 34ca2acf3622..baa651357a2f 100644 --- a/misc/far2l/distinfo +++ b/misc/far2l/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592869154 -SHA256 (elfmz-far2l-g20200622-43057bd_GH0.tar.gz) = 676f47878d22bd26faa728d2521742f54bc9f729bc83e33d3688fca633aa8bcb -SIZE (elfmz-far2l-g20200622-43057bd_GH0.tar.gz) = 5487398 +TIMESTAMP = 1603319048 +SHA256 (elfmz-far2l-g20201021-aee26c9_GH0.tar.gz) = 99245d627065996d50cebd7134f2b6913be309345652a079774154b8424d3219 +SIZE (elfmz-far2l-g20201021-aee26c9_GH0.tar.gz) = 5217952 diff --git a/misc/far2l/files/patch-WinPort_src_APIFSNotify.cpp b/misc/far2l/files/patch-WinPort_src_APIFSNotify.cpp deleted file mode 100644 index 1b5854e06bc5..000000000000 --- a/misc/far2l/files/patch-WinPort_src_APIFSNotify.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- WinPort/src/APIFSNotify.cpp.orig 2020-06-22 23:39:14 UTC -+++ WinPort/src/APIFSNotify.cpp -@@ -6,6 +6,7 @@ - #include <thread> - #include <condition_variable> - #if defined(__APPLE__) || defined(__FreeBSD__) -+# include <sys/types.h> - # include <sys/event.h> - # include <sys/time.h> - #elif !defined(__CYGWIN__) diff --git a/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake b/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake deleted file mode 100644 index 21c12557098a..000000000000 --- a/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake +++ /dev/null @@ -1,26 +0,0 @@ ---- cmake/modules/FindLibSSH.cmake.orig 2020-06-22 23:39:14 UTC -+++ cmake/modules/FindLibSSH.cmake -@@ -61,15 +61,20 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS) - ) - - if (LibSSH_FIND_VERSION) -- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR -+ # libssh >= 0.9.5 provides dedicated version header file -+ set(_libssh_version_header ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h) -+ if (NOT EXISTS ${_libssh_version_header}) -+ set(_libssh_version_header ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h) -+ endif() -+ file(STRINGS ${_libssh_version_header} LIBSSH_VERSION_MAJOR - REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+") - # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR - if (LIBSSH_VERSION_MAJOR) - string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR}) -- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR -+ file(STRINGS ${_libssh_version_header} LIBSSH_VERSION_MINOR - REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+") - string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR}) -- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH -+ file(STRINGS ${_libssh_version_header} LIBSSH_VERSION_PATCH - REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+") - string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH}) - diff --git a/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake b/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake index 9d5fee6386de..377c6d572952 100644 --- a/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake +++ b/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake @@ -1,6 +1,6 @@ ---- cmake/modules/FindLibsmbclient.cmake.orig 2020-06-22 23:39:14 UTC +--- cmake/modules/FindLibsmbclient.cmake.orig 2020-10-21 22:24:08 UTC +++ cmake/modules/FindLibsmbclient.cmake -@@ -21,23 +21,17 @@ else (LIBSMBCLIENT_LIBRARIES AND LIBSMBCLIENT_INCLUDE_ +@@ -21,11 +21,6 @@ else (LIBSMBCLIENT_LIBRARIES AND LIBSMBCLIENT_INCLUDE_ find_path(LIBSMBCLIENT_INCLUDE_DIR NAMES libsmbclient.h @@ -11,20 +11,4 @@ - /sw/include PATH_SUFFIXES samba-4.0 -+ samba4 - ) - - find_library(SMBCLIENT_LIBRARY - NAMES - smbclient -- PATHS -- /usr/lib -- /usr/local/lib -- /opt/local/lib -- /sw/lib -+ PATH_SUFFIXES -+ samba-4.0 -+ samba4 - ) - - if (SMBCLIENT_LIBRARY) + samba4 diff --git a/misc/far2l/pkg-descr b/misc/far2l/pkg-descr index b0c63a439a91..e3b04692399a 100644 --- a/misc/far2l/pkg-descr +++ b/misc/far2l/pkg-descr @@ -1,8 +1,9 @@ -Linux port of the FAR Manager v2 (http://farmanager.com/); also work on macOS -and *BSD systems. ALPHA VERSION. Currently interesting only for enthusiasts! +Linux port of the FAR Manager v2 (http://farmanager.com/); also works on +macOS and *BSD systems. ALPHA VERSION. Currently interesting only for +enthusiasts! Plugins that currently work: NetRocks (SFTP/SCP/FTP/FTPS/SMB/NFS/WebDAV), -colorer, multiarc, tmppanel, align, autowrap, drawline, editcase, SimpleIndent, -Python (optional scripting support). +colorer, multiarc, tmppanel, align, autowrap, drawline, editcase, +SimpleIndent, Python (optional scripting support). WWW: https://github.com/elfmz/far2l diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist index d73c2dd0a18e..ce122021224d 100644 --- a/misc/far2l/pkg-plist +++ b/misc/far2l/pkg-plist @@ -54,6 +54,7 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/colorer/base/hrc/base/fsharp.hrc %%DATADIR%%/Plugins/colorer/base/hrc/base/gen/perl-brackets.ent.hrc %%DATADIR%%/Plugins/colorer/base/hrc/base/go.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/base/groovy.hrc %%DATADIR%%/Plugins/colorer/base/hrc/base/haxe.hrc %%DATADIR%%/Plugins/colorer/base/hrc/base/idl.hrc %%DATADIR%%/Plugins/colorer/base/hrc/base/java.hrc @@ -109,6 +110,7 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/colorer/base/hrc/inet/gen/xhtml-frameset.hrc %%DATADIR%%/Plugins/colorer/base/hrc/inet/gen/xhtml-strict.hrc %%DATADIR%%/Plugins/colorer/base/hrc/inet/gen/xhtml-trans.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/inet/gsp.hrc %%DATADIR%%/Plugins/colorer/base/hrc/inet/haml.hrc %%DATADIR%%/Plugins/colorer/base/hrc/inet/html-css.hrc %%DATADIR%%/Plugins/colorer/base/hrc/inet/html.hrc @@ -278,6 +280,9 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/colorer/base/hrc/scripts/avisynth.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/awk.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/batch.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake-auto.ent.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake.ent.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/bkt.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/colorer5catalog.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/ent.hrc.hrc @@ -370,6 +375,7 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/colorer/base/hrd/catalog-console.xml %%DATADIR%%/Plugins/colorer/base/hrd/catalog-rgb.xml %%DATADIR%%/Plugins/colorer/base/hrd/catalog-text.xml +%%DATADIR%%/Plugins/colorer/base/hrd/catalog-user.xml %%DATADIR%%/Plugins/colorer/base/hrd/console/black.hrd %%DATADIR%%/Plugins/colorer/base/hrd/console/blue.hrd %%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/black_ay.hrd @@ -423,7 +429,6 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/colorer/base/hrd/rgb/white.hrd %%DATADIR%%/Plugins/colorer/base/hrd/text/htmlcss.hrd %%DATADIR%%/Plugins/colorer/base/hrd/text/tags.hrd -%%DATADIR%%/Plugins/colorer/plug/Plugin.Colorer.lua %%DATADIR%%/Plugins/colorer/plug/colorere.hlf %%DATADIR%%/Plugins/colorer/plug/colorere.lng %%DATADIR%%/Plugins/colorer/plug/colorerr.hlf @@ -464,6 +469,7 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/tmppanel/plug/TmpRus.lng %%DATADIR%%/notify.sh %%DATADIR%%/open.sh +%%DATADIR%%/ps.sh %%DATADIR%%/roots.sh %%DATADIR%%/trash.sh share/icons/far2l.svg |