From nobody Wed Jan 03 06:30:15 2024 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 4T4fwR5XWfz54qH7; Wed, 3 Jan 2024 06:30:15 +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 4T4fwR4kSSz3wwQ; Wed, 3 Jan 2024 06:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704263415; 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=tjHPgF0C84GHkQiqPNZ3v6s31UOC/BZS5/AzpwGeUFo=; b=gxsHEyhohYaHVKvStscsgEW61W/9sDRApZYxu7yo968itSKjIFE+QWVNqvmoWQRxLLCsJA QthxVbFN5CxWLS8P4WdwQe8BkWr81x82TKnRs+UrLGNuhVbG+ojiVkC1fsdH4nh2xTNl4Y N18aOdmZl972d5XlLRanfP3FAUBriNYpcQYH04A1utSMyrazXBJ+FJ+YGqSqy8iiXUoyle /Jbesr/0IlTkxG3Bii8EeUSzrYjAZLmZiPXJAE/qvsbFzBo9Vi3eQGIs0RR95vnhD8KSMQ veaYi29YMxVG0SM9TLVRuagt7vEL5t2Dwe7LbKKJyKb71MpOXlmYB3LXVXkpuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704263415; 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=tjHPgF0C84GHkQiqPNZ3v6s31UOC/BZS5/AzpwGeUFo=; b=PDpC0xuTVGD3vdUHH8m/oDq0tKI/9pFe9AFl8Kd5bCQA0fWnSpJM7/nQo7nDD++dDBpYhW rFul80tZTWe8b5yqskd3qmxmhm1DEIby3ZpRnWN2ZjZZaVNzqW6wnrp/SmgjH9+I8STD+2 0V3UaG6EuCIAf4Mg8Jy5BoEM9hq7AYbMuj2Y2YhqXCOvcyYaPepWdoNyoE+eYkO914cNfU tv5tYhSxGCZrWMPfmwaCLBmf2jqt/MaQidQOXoaEFG2Gt7i9X5xpUDqZq7e3MfDxX3aPHu taMGux4a1YCxiPljQaTpW/sQu6wYs0vHWPLN8JphFMU04c08r1E3JQeJgRw2pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704263415; a=rsa-sha256; cv=none; b=johgGE91UUXYLN7uhFNrD8uX04WiQQ8hnlv5YeoAYV6XoRAOb6mL/BZjC1/tcZ6ddDXthS chejnJ5KbOnbIM3CySAYn11sh8AfnEBwNZfb8pvCGytXIQYJ5lRt+tamwpBkO0h4W+yRpz 3KTXbXySo2FedmP09U8iAfYRSaKK9rW2Wp3RfJhiTKTzd/GuRRV7fZrVT8vR9XTRBqXUzp UvCQ8IokiTmhFb3M28UCRCJk78utkIdTgbSGuHJ/DKKwpuLB85ETeEf3Zg8f9zozVjXmva vb4na8EOkcPm/HH9JW8Nwm24hdAs6bp8uTsJvt29UuCRRb2dgLjy7bg13Ha8zA== 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 4T4fwR3qdCzZVY; Wed, 3 Jan 2024 06:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4036UFUV002002; Wed, 3 Jan 2024 06:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4036UFUM001997; Wed, 3 Jan 2024 06:30:15 GMT (envelope-from git) Date: Wed, 3 Jan 2024 06:30:15 GMT Message-Id: <202401030630.4036UFUM001997@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: 95e83829519a - main - science/InsightToolkit: Eliminate conflict with lp_solve by renaming the shared library 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95e83829519a47602dbebfc270bce61551449d33 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=95e83829519a47602dbebfc270bce61551449d33 commit 95e83829519a47602dbebfc270bce61551449d33 Author: Yuri Victorovich AuthorDate: 2024-01-03 06:28:14 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-03 06:30:13 +0000 science/InsightToolkit: Eliminate conflict with lp_solve by renaming the shared library liblp_solve55.so is renamed into liblp_solve55_itk.so References: * https://github.com/InsightSoftwareConsortium/ITK/issues/4031 * https://github.com/RTKConsortium/RTK/issues/548 --- science/InsightToolkit/Makefile | 10 +++++++++- science/InsightToolkit/pkg-plist | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile index 32579b23fe24..9eb3fc1d6439 100644 --- a/science/InsightToolkit/Makefile +++ b/science/InsightToolkit/Makefile @@ -1,7 +1,7 @@ PORTNAME= InsightToolkit DISTVERSIONPREFIX= v DISTVERSION= 5.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science biology MASTER_SITES= https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${DISTVERSION}/:data DISTFILES= InsightData-${DISTVERSION}.tar.gz:data @@ -90,6 +90,14 @@ pre-configure: # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?i @${SETENV} ${MAKE_ENV} ${CC} -c -fPIC ${FILESDIR}/ftime.c -o ${WRKSRC}/libftime.o @${AR} -rcs ${WRKSRC}/libftime.a ${WRKSRC}/libftime.o +post-configure: # fix conflict with lp_solve by renaming the shared library to liblp_solve55_itk, see https://github.com/InsightSoftwareConsortium/ITK/issues/4031 + @${REINPLACE_CMD} \ + -e 's|lpsolve55|lpsolve55_itk|g' \ + ${WRKSRC}/Modules/Remote/RTK/CMakeLists.txt \ + ${WRKSRC}/Modules/Remote/RTK/src/CMakeLists.txt \ + ${WRKSRC}/Modules/Remote/RTK/utilities/lp_solve/CMakeLists.txt + + post-install: # remove contentless docs @${RM} -r ${STAGEDIR}${PREFIX}/share diff --git a/science/InsightToolkit/pkg-plist b/science/InsightToolkit/pkg-plist index aff18201c8e9..b2301e5560a8 100644 --- a/science/InsightToolkit/pkg-plist +++ b/science/InsightToolkit/pkg-plist @@ -4273,9 +4273,9 @@ lib/libitkopenjpeg-%%ITK_VER%%.so lib/libitkopenjpeg-%%ITK_VER%%.so.1 lib/libitksys-%%ITK_VER%%.so lib/libitksys-%%ITK_VER%%.so.1 -lib/liblpsolve55.so -lib/liblpsolve55.so.5 -lib/liblpsolve55.so.5.5.2 +lib/liblpsolve55_itk.so +lib/liblpsolve55_itk.so.5 +lib/liblpsolve55_itk.so.5.5.2 lib/rtkelektasynergygeometry.py lib/rtkorageometry.py lib/rtksimulatedgeometry.py