Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Dec 2022 23:07:36 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1396a4af3f34 - main - science/openmodelica: Fix fetch
Message-ID:  <202212132307.2BDN7ag4065545@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1396a4af3f349531c600bcc5b9891f7874e49fad

commit 1396a4af3f349531c600bcc5b9891f7874e49fad
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-12-13 15:01:59 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212132307.2BDN7ag4065545>