From nobody Wed Nov 30 10:47:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NMbWW05NWz4jbdb; Wed, 30 Nov 2022 10:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NMbWV6Sgpz4Q7T; Wed, 30 Nov 2022 10:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669805254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPFbVxZDFE7Zf21EVNDLL6andOchLNZk7vzDb+pkFKQ=; b=a+1vh31LW0w/dDy3/IAMBEKfTZOGnT7K3ZOlsSXZvL+mx+krxb4i65b1qWprTeHulsuhjQ HYboydDOZ8vzpjn2H/k0s+Ey/I/baYEAsep/3dki6wjpawODmBu6UfVwI9LXxi3R3kWune +75A6pT91AkTiT91LqeH8EK5RnnhM27xbVMTNJec8UPB3NNZ5HTP9k1ue7gAHL/O2Z4DI0 XG5vT84++Ka34zWn6oSvOHO9aohL3+hFeT8sT5LE+syab1P4e2qkxMDSjxwNL0VI4hKJVc 4rY1yErjbSHL0AYOcMSLDMbCrhZMxhPIpSMQcdQ6ttWyPpoaQ/QQAEZRKV3cJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669805254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPFbVxZDFE7Zf21EVNDLL6andOchLNZk7vzDb+pkFKQ=; b=nHxc0w7vl44R/AhLHOII0kdlDwsmwmbqmuq/Onq/8VZPgd20ZEBXg2FEnIv4khhyhQf++y RCtPzMvcBjxWi8sSGqlG9jDltUj/5r4oH104J8gtJrbN+g+rtjWj31xEV3U1Z3w2z0KO2V 0Lmw9DxVp2tCOi/aPfiw6XwMa4NoNZnkLBlJWS0+OnV/zVnnTTua6SwxM11g0R9kSkFEB1 OW50Aym9lj8nIyJuFXE/ofEGkk8Tm3uW1FLyGlt3Q9NvzGrStiJnTwVF8pZbWr/dNOnUuX dwz4Ut/ZLcWTJrk4pejlOdYpo1QQMQLnqWaXWd8NvbXwHYO/saUNFmhsv/8JtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669805254; a=rsa-sha256; cv=none; b=gqkzwkR9Zuj68Iuy5pa4IjHkD6hI2pAH2+23dJjT2L55mpKPHzFerWBGM6ryGI5TJrhUs1 7fxZ8fVpP0Rub351BpomCJdVp97YIYfgZQpB4zQzJXs9eMTN8e0ebd0uicbGYtiGGq7agS xbaulcW2KZEychmqV8sHSEqwDKJJgIhwKfxFMV29l3Zc/ZKmFzLUbEw0HDBL6+fvc4MbP0 C2g6l7P7Ai6FWK5Tvl/9pFWuhwbXfVJ11GJFkk046qJi4tZWuQbOGauN9jcvnyTG3eykaO vlEMXTYPq1gMubnSXGTOcS+T0fang+cdobuadq1M4fYxtDnfZsDYQxCCa13OoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NMbWV5XvQztQJ; Wed, 30 Nov 2022 10:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AUAlYmU006814; Wed, 30 Nov 2022 10:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUAlYJd006813; Wed, 30 Nov 2022 10:47:34 GMT (envelope-from git) Date: Wed, 30 Nov 2022 10:47:34 GMT Message-Id: <202211301047.2AUAlYJd006813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 14afc6b19e36 - main - devel/linenoise-ng: upgrade to v1.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14afc6b19e36dd1d1e56af2d5b21f5a5ca16f3ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=14afc6b19e36dd1d1e56af2d5b21f5a5ca16f3ec commit 14afc6b19e36dd1d1e56af2d5b21f5a5ca16f3ec Author: Thierry Thomas AuthorDate: 2022-11-30 10:29:48 +0000 Commit: Thierry Thomas 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 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 - #include - #include -+#include - #include - #include - #include -@@ -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 + #include + #include ++#include + #include + #include + #include 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