From nobody Mon Oct 03 02:24:37 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 4Mgl5x6Kylz4f9DD; Mon, 3 Oct 2022 02:24:37 +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 4Mgl5x5mWQz45JG; Mon, 3 Oct 2022 02:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664763877; 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=xEDRSyXMjclFKDZR2KzDPhN1NScXZt+NmZvLq0W7UfE=; b=prqh3ZP5/WSHxJ2+YLjgs5RlFf/IzApLJE0kTFzjjHIbZsNXbE+78lItl28eUGkM9vyD+i jFw+YRT2Gl+3njp7rNxISTABe8cAB7T3eeOla13u0Qcg7sQzhviNUZYsS15OnraKCwNBk7 bjj/pY3zABs3cTLLj28/SvDgIvD5cQH6eFV8c9b6tyU+cg3eBTBHKz+x47XfIjPorlh7N9 G8p0Il0Qwd0VK7woxhYF6ITmzeMDEjh3NpWyJeeNTfJKGMCURUSDjOsty1aFJukjAS6NKR /0QQA7JR+pjmzGqJVQvKiJsGGZSLiKdX1xBUvep8ePaZM+1PDc/ppvj7QZi3kg== 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 4Mgl5x4rl1z141C; Mon, 3 Oct 2022 02:24:37 +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 2932Obek096879; Mon, 3 Oct 2022 02:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2932ObxL096878; Mon, 3 Oct 2022 02:24:37 GMT (envelope-from git) Date: Mon, 3 Oct 2022 02:24:37 GMT Message-Id: <202210030224.2932ObxL096878@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b1be4326da7f - main - databases/leveldb: Clean up 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1be4326da7f9b7ac3eeb7fcfd8b73245e77e86d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664763877; 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=xEDRSyXMjclFKDZR2KzDPhN1NScXZt+NmZvLq0W7UfE=; b=WPsbOav8R77YktaWvz9ezmGuSGVyI5JReH7jljgskTzu1agFQmAJY5FqhCGUclaU2OoK8T 8Y5+MHMZ9Qa3UerbJHOMcQUFQcNBwpEaoXAIAieMYW/iZLun68EEO/8ACRDbDpJEn/V+oZ eT9ghjgKXq9HVXsKxhggpRdxxk/jg/NroVV+wu6EIBU/SttbF8MHfSPsvLTw4FOng+QDnd lu+F4nd/z5i8J5qvViJoS7as/YwSTX8rVnfttiwtIKUEH3ZZIX4MKpl6SvJTwI5dpUclQP Yx/H1a6Fy6Ide0H6OWExTAsZzgz/uHFAHp2oD9DyrPeYG5Ls/sLNXAVJiMTZ3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664763877; a=rsa-sha256; cv=none; b=f+F9Dyvo6SnOgjl1LfCVP4t+hB0dCBbGE2RuqghG4g+JcFyII/UV5CyzgdjIDsSnANImSK 7Znn87AhX9rDGRw0/JgN0z22p20DjzkkK6xrLtNYeaK+ZOw8giSVI9a6F2NKaXjLm374UT Zm6iZymuOK+0Tr0EeOGJDvskhJiAqXZhhlJm090XgOZlrQjNh96YKbUA6ZGpRTRGE5tBdk qa2yGUIg31x/h3GpI2oLy54S94uolt9DpTFKhY5SlQVnQYNKcOYZXO8BtoioGcjHMjJUQ8 4OafjeDXl7qnbC3wJeEDucc8/po4UCdkIeTDWJgtxVxIs+PuaVyHhzNuMI6lbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1be4326da7f9b7ac3eeb7fcfd8b73245e77e86d commit b1be4326da7f9b7ac3eeb7fcfd8b73245e77e86d Author: Po-Chuan Hsieh AuthorDate: 2022-10-03 02:14:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-03 02:14:04 +0000 databases/leveldb: Clean up - Bump PORTREVISION for package change SOVERSION has been added by upstream since 1.22. Reference: https://github.com/google/leveldb/commit/37300aa54b8256dd2edfd504942eb2bd20823647 https://github.com/google/leveldb/commit/09fa8868dbe0cb2701f0560c59ebb63cc17f1271 --- databases/leveldb/Makefile | 10 ++-------- databases/leveldb/files/patch-CMakeLists.txt | 14 -------------- databases/leveldb/pkg-plist | 4 ++-- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile index 19220a612e46..c73f1013018e 100644 --- a/databases/leveldb/Makefile +++ b/databases/leveldb/Makefile @@ -1,5 +1,6 @@ PORTNAME= leveldb PORTVERSION= 1.23 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -15,11 +16,7 @@ CMAKE_ON= BUILD_SHARED_LIBS LEVELDB_BUILD_BENCHMARKS LEVELDB_INSTALL USE_CXXSTD= c++11 USE_LDCONFIG= yes -PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR} \ - SHLIB_MINOR=${SHLIB_MINOR} - -SHLIB_MAJOR= ${PORTVERSION:R} -SHLIB_MINOR= ${PORTVERSION:E} +PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R} GH_ACCOUNT= google USE_GITHUB= yes @@ -32,9 +29,6 @@ SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy SNAPPY_VARS= SNAPPY=1 SNAPPY_CFLAGS=-DSNAPPY SNAPPY_VARS_OFF= SNAPPY=0 SNAPPY_CFLAGS= -post-patch: - @${REINPLACE_CMD} -e 's|%%SHLIB_MAJOR%%|${SHLIB_MAJOR}|; s|%%SHLIB_MINOR%%|${SHLIB_MINOR}|' ${WRKSRC}/CMakeLists.txt - post-install: ${AR} cq ${STAGEDIR}${PREFIX}/lib/libleveldb.a ${BUILD_WRKSRC}/CMakeFiles/leveldb.dir/*/*.o # backward compatibility (for databases/p5-Tie-LevelDB) diff --git a/databases/leveldb/files/patch-CMakeLists.txt b/databases/leveldb/files/patch-CMakeLists.txt deleted file mode 100644 index f4c15a9c4f26..000000000000 --- a/databases/leveldb/files/patch-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- CMakeLists.txt.orig 2019-03-29 21:37:39 UTC -+++ CMakeLists.txt -@@ -228,6 +228,11 @@ if (NOT HAVE_CXX17_HAS_INCLUDE) - endif(NOT HAVE_CXX17_HAS_INCLUDE) - - if(BUILD_SHARED_LIBS) -+ set_target_properties(leveldb -+ PROPERTIES -+ VERSION %%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -+ SOVERSION %%SHLIB_MAJOR%% -+ ) - target_compile_definitions(leveldb - PUBLIC - # Used by include/export.h. diff --git a/databases/leveldb/pkg-plist b/databases/leveldb/pkg-plist index 69dde5e2f7ab..37bbd042e2ed 100644 --- a/databases/leveldb/pkg-plist +++ b/databases/leveldb/pkg-plist @@ -19,6 +19,6 @@ lib/cmake/leveldb/leveldbTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/leveldb/leveldbTargets.cmake lib/libleveldb.a lib/libleveldb.so -lib/libleveldb.so.%%SHLIB_MAJOR%% -lib/libleveldb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +lib/libleveldb.so.%%SHLIB_VER%% +lib/libleveldb.so.%%PORTVERSION%%.0 %%DATADIR%%/build_config.mk