git: 14afc6b19e36 - main - devel/linenoise-ng: upgrade to v1.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Nov 2022 10:47:34 UTC
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=14afc6b19e36dd1d1e56af2d5b21f5a5ca16f3ec commit 14afc6b19e36dd1d1e56af2d5b21f5a5ca16f3ec Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2022-11-30 10:29:48 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2022-11-30 10:47:30 +0000 devel/linenoise-ng: upgrade to v1.0.1 Also switch to a shared library and pet portlint. --- devel/linenoise-ng/Makefile | 11 ++++++-- devel/linenoise-ng/distinfo | 6 ++--- devel/linenoise-ng/files/patch-CMakeLists.txt | 32 ++++++++++++++++++++++++ devel/linenoise-ng/files/patch-linenoise.cpp | 28 --------------------- devel/linenoise-ng/files/patch-src_linenoise.cpp | 10 ++++++++ devel/linenoise-ng/pkg-plist | 2 -- 6 files changed, 54 insertions(+), 35 deletions(-) diff --git a/devel/linenoise-ng/Makefile b/devel/linenoise-ng/Makefile index 229409d71b27..339205a2b7bb 100644 --- a/devel/linenoise-ng/Makefile +++ b/devel/linenoise-ng/Makefile @@ -1,6 +1,5 @@ PORTNAME= linenoise-ng -PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTVERSION= 1.0.1 DISTVERSIONPREFIX=v CATEGORIES= devel @@ -12,9 +11,17 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++11-lang +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= arangodb CFLAGS+= -fPIC +CMAKE_ON= BUILD_SHARED_LIBS + +PLIST_FILES= include/linenoise.h \ + lib/liblinenoise.so \ + lib/liblinenoise.so.0 + .include <bsd.port.mk> diff --git a/devel/linenoise-ng/distinfo b/devel/linenoise-ng/distinfo index 6ddfee91068c..77406ef01626 100644 --- a/devel/linenoise-ng/distinfo +++ b/devel/linenoise-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487277234 -SHA256 (arangodb-linenoise-ng-v1.0.0_GH0.tar.gz) = ff50a18cf02bbdb13161cf2c445be2d862d4c6663c4291c581130d9fd74ca7cd -SIZE (arangodb-linenoise-ng-v1.0.0_GH0.tar.gz) = 40249 +TIMESTAMP = 1669801684 +SHA256 (arangodb-linenoise-ng-v1.0.1_GH0.tar.gz) = c91c074aa2edc6d73c1e135b6c5c64feabd7e499cd93aa0f643e21e5d34490e4 +SIZE (arangodb-linenoise-ng-v1.0.1_GH0.tar.gz) = 42724 diff --git a/devel/linenoise-ng/files/patch-CMakeLists.txt b/devel/linenoise-ng/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..22405f937b7d --- /dev/null +++ b/devel/linenoise-ng/files/patch-CMakeLists.txt @@ -0,0 +1,32 @@ +--- CMakeLists.txt.orig 2017-03-06 16:01:33 UTC ++++ CMakeLists.txt +@@ -1,6 +1,6 @@ + # -*- mode: CMAKE; -*- + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.9) + + project(linenoise) + +@@ -13,7 +13,7 @@ endif() + message(STATUS "Build mode: ${CMAKE_BUILD_TYPE}") + + # INFO +-set(LINENOISE_VERSION "1.0.0" CACHE path "Linenoise version") ++set(LINENOISE_VERSION "1.0.1" CACHE path "Linenoise version") + set(LINENOISE_DISPLAY_NAME "Linenoise-NG") + set(LINENOISE_URL_INFO_ABOUT "https://github.com/arangodb/linenoise-ng") + set(LINENOISE_CONTACT "hackers@arangodb.org") +@@ -77,11 +77,11 @@ include_directories(${PROJECT_SOURCE_DIR}/include ${PR + # build liblinenoise + add_library( + linenoise +- STATIC + src/ConvertUTF.cpp + src/linenoise.cpp + src/wcwidth.cpp + ) ++set_target_properties(linenoise PROPERTIES SOVERSION 0) + + # install + install(TARGETS linenoise DESTINATION lib) diff --git a/devel/linenoise-ng/files/patch-linenoise.cpp b/devel/linenoise-ng/files/patch-linenoise.cpp deleted file mode 100644 index f3ed504dcb7e..000000000000 --- a/devel/linenoise-ng/files/patch-linenoise.cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- src/linenoise.cpp 2015-11-25 01:30:22.000000000 -0800 -+++ /tmp/linenoise.cpp 2017-02-17 10:10:37.354285000 -0800 -@@ -105,6 +105,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/stat.h> - #include <sys/types.h> - #include <sys/ioctl.h> - #include <cctype> -@@ -3093,10 +3094,17 @@ - /* Save the history in the specified file. On success 0 is returned - * otherwise -1 is returned. */ - int linenoiseHistorySave(const char* filename) { -+#ifndef _WIN32 -+ mode_t old_umask = umask(S_IXUSR|S_IRWXG|S_IRWXO); -+#endif - FILE* fp = fopen(filename, "wt"); - if (fp == NULL) { - return -1; - } -+#ifndef _WIN32 -+ umask(old_umask); -+ chmod(filename,S_IRUSR|S_IWUSR); -+#endif - - for (int j = 0; j < historyLen; ++j) { - if (history[j][0] != '\0') { diff --git a/devel/linenoise-ng/files/patch-src_linenoise.cpp b/devel/linenoise-ng/files/patch-src_linenoise.cpp new file mode 100644 index 000000000000..04335b7f74c7 --- /dev/null +++ b/devel/linenoise-ng/files/patch-src_linenoise.cpp @@ -0,0 +1,10 @@ +--- src/linenoise.cpp.orig 2017-03-06 16:01:33 UTC ++++ src/linenoise.cpp +@@ -110,6 +110,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/stat.h> + #include <sys/types.h> + #include <sys/ioctl.h> + #include <cctype> diff --git a/devel/linenoise-ng/pkg-plist b/devel/linenoise-ng/pkg-plist deleted file mode 100644 index c9dad0b91fc5..000000000000 --- a/devel/linenoise-ng/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -include/linenoise.h -lib/liblinenoise.a