From nobody Tue Dec 13 23:07:36 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 4NWvKP14Hdz4jpGG; Tue, 13 Dec 2022 23:07: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 4NWvKP0Y3Nz3ttp; Tue, 13 Dec 2022 23:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670972857; 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=ZjYhmTgS7F8J6zK2JMznsAQdASVEYToQcLz0UmgOatg=; b=KMpkW0RqFyeE3Ls2NhNjzGLEevYGrrmOQYICkpa6+evwHtYQWjWp1eRUQTeWh/vSkZEsMz pXkUnvsMmMiRM8jVRl11ooBUr+m7p0uSopBtF2yGGOeX3HxIV7AglcwGtFuiWUUFB+HNsa xtxWXXvv//pbLBiEwJa+NVmJEjmC3ajLAiiY5pmCYRTbupfKfv8GpbXjms3rpqZtJq9wrc fNmPbPwo0EzmxbRblSkMbkcMB4Iw/bGTcVTEE7f80mTBpyOkGTsu4+7Cu4B6rFFCLt5ei9 wUde4X8UD4WN1oEFcsMxVTfpXsdCAeyr52XxB++mM71to/lh6RH/diPIZuHCYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670972857; 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=ZjYhmTgS7F8J6zK2JMznsAQdASVEYToQcLz0UmgOatg=; b=m0HRPq7mrr3DEeR2ZOtfmtiIXDgRfuVwJiLvfSfHSYgXOZMhyuU0TaNffYlTdOG+6FERm4 E/t6lEY7PmO4QocUoExnp38r4ri3T68w8LInKaG+0+3FCKAwRGn5s40bJkrWYIQuxZEWYt HLVdYtJK0nRfCQ+X7f2eieWNbyZByVQdavj9D1PiasKu6Ym59yUNP7yBieOXEirQX63t06 a5eQMfZLf/dQXR59VKWiojgEMJgsKHS/PEzK2wdtZg0N0coAfrfdszwNZGFvPqSHp2alJp z/3dcClBLLl+BzoVBiQKw85/HvF/VCGRrDAlT4bnVtuNLPaihg1JagGe0MQ1tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670972857; a=rsa-sha256; cv=none; b=ZB8zuQHZrUTI8SI5IahaDSWA+NPXogQ4jDOaHnAUxBjE86JWvfO/WIm3LC4ESKI/Xbj4a6 zB1z+4wn/b2P9QTLH/GpO0zP5Kj/CgSuai9XyXanJET8iOdm0XWX/B9tx3PM1gfkK1uDKB uDfgEY2H/tNw7b1Xji16sipHIPcz7zbiXy95xuQqFNBACXbsRVo8miPMVyfb6NTaXYNAP3 XQuhGA32DB8p/iPF9l0XtQFPZdG+g7ZfB+Oi8NC8i/CLFhzemhkIT6S1Vp58oaII5AOrI+ 8Eb7SZA8Rk44l+gv+6HZYhz8LBnLOXNh2JlfjJi9BTqfct+9NSSxkf70zvVXaw== 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 4NWvKN6hdzzW3B; Tue, 13 Dec 2022 23:07:36 +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 2BDN7ar2065546; Tue, 13 Dec 2022 23:07:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDN7ag4065545; Tue, 13 Dec 2022 23:07:36 GMT (envelope-from git) Date: Tue, 13 Dec 2022 23:07:36 GMT Message-Id: <202212132307.2BDN7ag4065545@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: 1396a4af3f34 - main - science/openmodelica: Fix fetch 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: 1396a4af3f349531c600bcc5b9891f7874e49fad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1396a4af3f349531c600bcc5b9891f7874e49fad commit 1396a4af3f349531c600bcc5b9891f7874e49fad Author: Yuri Victorovich AuthorDate: 2022-12-13 15:01:59 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-13 23:07:34 +0000 science/openmodelica: Fix fetch 2 GH tuples referred to exactly same download - this breaks. Reported by: fallout --- science/openmodelica/Makefile | 9 +++++---- science/openmodelica/distinfo | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile index f04c2a539bab..e3137dda280e 100644 --- a/science/openmodelica/Makefile +++ b/science/openmodelica/Makefile @@ -21,8 +21,7 @@ BUILD_DEPENDS= asciidoc:textproc/asciidoc \ gmake:devel/gmake \ libtool>0:devel/libtool \ ${LOCALBASE}/include/readline/readline.h:devel/readline -LIB_DEPENDS= \ - libboost_filesystem.so:devel/boost-libs \ +LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libcurl.so:ftp/curl \ libosg.so:graphics/osg \ libuuid.so:misc/e2fsprogs-libuuid @@ -58,8 +57,8 @@ GH_TUPLE= \ OpenModelica:OMTLMSimulator:07d5353:OMSimulator_OMTLMSimulator/OMSimulator/OMTLMSimulator \ OpenModelica:OMCompiler-3rdParty:a60ba6c:OMCompiler_3rdParty/OMCompiler/3rdParty \ OpenModelica:OMSens:66b920b:OMSens/OMSens \ - OpenModelica:OMSens_Qt:ef85128:OMSens_Qt/OMSens_Qt \ - OpenModelica:OpenModelica-common:08a0180:OMSens_Qt_common/OMSens_Qt/common + OpenModelica:OMSens_Qt:ef85128:OMSens_Qt/OMSens_Qt + #OpenModelica:OpenModelica-common:08a0180:OMSens_Qt_common/OMSens_Qt/common # this should change make program everywhere, but it doesn't, # hence the patches in OMCompiler/Compiler/runtime/CMakeLists.txt, OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp @@ -80,6 +79,8 @@ post-extract: # create symlink for sources.tar.gz @${MKDIR} ${WRKSRC}/OMCompiler/Compiler/boot/bomc @${LN} -s ${DISTDIR}/${DIST_SUBDIR}/sources.tar.gz ${WRKSRC}/OMCompiler/Compiler/boot/bomc/sources.tar.gz + # workaround for broken fetch + @${RLN} ${WRKSRC}/OMOptim/common ${WRKSRC}/OMSens_Qt/common post-patch: # fix bash shebangs diff --git a/science/openmodelica/distinfo b/science/openmodelica/distinfo index d80c68babd09..a77912c426bb 100644 --- a/science/openmodelica/distinfo +++ b/science/openmodelica/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1670827690 +TIMESTAMP = 1670970232 SHA256 (openmodelica-1.20.0/sources.tar.gz) = d41b20ccb9395189fa1edd6dd86ae09023571876f2504904366a91d3491a8c19 SIZE (openmodelica-1.20.0/sources.tar.gz) = 3322762 SHA256 (openmodelica-1.20.0/OpenModelica-OpenModelica-v1.20.0_GH0.tar.gz) = 0b04923cc4d0b5d9e29679864a1d1b8e6ec8ecd7f456779dfe5212886f644f5c @@ -19,5 +19,3 @@ SHA256 (openmodelica-1.20.0/OpenModelica-OMSens-66b920b_GH0.tar.gz) = f0982350a9 SIZE (openmodelica-1.20.0/OpenModelica-OMSens-66b920b_GH0.tar.gz) = 8870024 SHA256 (openmodelica-1.20.0/OpenModelica-OMSens_Qt-ef85128_GH0.tar.gz) = a6db8a107098a1f2c999923e020a5f337485a00057771ac9407a8af373278493 SIZE (openmodelica-1.20.0/OpenModelica-OMSens_Qt-ef85128_GH0.tar.gz) = 210584 -SHA256 (openmodelica-1.20.0/OpenModelica-OpenModelica-common-08a0180_GH0.tar.gz) = ef6045612777ede7cab882ca1bd665ba5c6d5ebfa4760be3bf797558d71fd9fe -SIZE (openmodelica-1.20.0/OpenModelica-OpenModelica-common-08a0180_GH0.tar.gz) = 36101