From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 18:05:01 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C92A95D9D0B; Mon, 12 Apr 2021 18:05:01 +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 4FJxTn4f9Wz4kZ4; Mon, 12 Apr 2021 18:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 83BC01BDE1; Mon, 12 Apr 2021 18:05:01 +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 13CI51K2090396; Mon, 12 Apr 2021 18:05:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CI51eY090395; Mon, 12 Apr 2021 18:05:01 GMT (envelope-from git) Date: Mon, 12 Apr 2021 18:05:01 GMT Message-Id: <202104121805.13CI51eY090395@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 353678f54b5f - main - biology/ncbi-vdb: Restore static libs installed with symlinks as shared libs are usually installed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 353678f54b5fcc1821077ab3f84fe389a1ef2b9b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 18:05:01 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=353678f54b5fcc1821077ab3f84fe389a1ef2b9b commit 353678f54b5fcc1821077ab3f84fe389a1ef2b9b Author: Yuri Victorovich AuthorDate: 2021-04-12 18:03:14 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-12 18:03:14 +0000 biology/ncbi-vdb: Restore static libs installed with symlinks as shared libs are usually installed Symlinks like this libxx.a->libxx.a.N.N.N first looked broken but it turned out that this is intentional. PR: 223273 --- biology/ncbi-vdb/Makefile | 6 +++--- biology/ncbi-vdb/pkg-plist | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile index e3ec6af6a55b..99f88f4f7131 100644 --- a/biology/ncbi-vdb/Makefile +++ b/biology/ncbi-vdb/Makefile @@ -1,5 +1,6 @@ PORTNAME= ncbi-vdb DISTVERSION= 2.11.0 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= mzaki@niid.go.jp @@ -57,8 +58,7 @@ post-patch: post-configure: @${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/build/COMP -post-install: - # remove static libs built instead of shared libs, see https://github.com/ncbi/ncbi-vdb/issues/36 - cd ${STAGEDIR}${PREFIX}/lib && ${RM} libkdf5.a* libncbi-ngs-c++.a* libncbi-ngs.a* libncbi-vdb.a* libncbi-wvdb.a* +# The 'install' target installs broken-looking static libs with symlinks. +# This is intentional, see comments https://github.com/ncbi/ncbi-vdb/issues/36#issuecomment-817990790 This may change in future versions. .include diff --git a/biology/ncbi-vdb/pkg-plist b/biology/ncbi-vdb/pkg-plist index bd0a6d8f1054..8473b7790ed2 100644 --- a/biology/ncbi-vdb/pkg-plist +++ b/biology/ncbi-vdb/pkg-plist @@ -1,15 +1,30 @@ include/ncbi-vdb/NGS.hpp lib/libkdf5-static.a +lib/libkdf5.a +lib/libkdf5.a.2 +lib/libkdf5.a.2.11.0 lib/libkdf5.so lib/libkdf5.so.2 lib/libkdf5.so.2.11.0 lib/libncbi-ngs-c++-static.a +lib/libncbi-ngs-c++.a +lib/libncbi-ngs-c++.a.2 +lib/libncbi-ngs-c++.a.2.11.0 lib/libncbi-ngs-static.a +lib/libncbi-ngs.a +lib/libncbi-ngs.a.2 +lib/libncbi-ngs.a.2.11.0 lib/libncbi-vdb-static.a +lib/libncbi-vdb.a +lib/libncbi-vdb.a.2 +lib/libncbi-vdb.a.2.11.0 lib/libncbi-vdb.so lib/libncbi-vdb.so.2 lib/libncbi-vdb.so.2.11.0 lib/libncbi-wvdb-static.a +lib/libncbi-wvdb.a +lib/libncbi-wvdb.a.2 +lib/libncbi-wvdb.a.2.11.0 lib/libncbi-wvdb.so lib/libncbi-wvdb.so.2 lib/libncbi-wvdb.so.2.11.0