diff --git a/ports/calceph/makefilevc.patch b/ports/calceph/makefilevc.patch deleted file mode 100755 index 796eeb2026c506..00000000000000 --- a/ports/calceph/makefilevc.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/doc/Makefile.vc b/doc/Makefile.vc -index 60c7eee..1e783a0 100644 ---- a/doc/Makefile.vc -+++ b/doc/Makefile.vc -@@ -62,7 +62,7 @@ - # - - install: -- copy calceph_c.pdf $(DESTDIR)\doc -- copy calceph_fortran2003.pdf $(DESTDIR)\doc -- copy calceph_fortran77.pdf $(DESTDIR)\doc -- copy calceph_python.pdf $(DESTDIR)\doc -+ copy calceph_c.pdf "$(DESTDIR)"\doc -+ copy calceph_fortran2003.pdf "$(DESTDIR)"\doc -+ copy calceph_fortran77.pdf "$(DESTDIR)"\doc -+ copy calceph_python.pdf "$(DESTDIR)"\doc -diff --git a/mexapi/src/Makefile.vc b/mexapi/src/Makefile.vc -index 68e5d45..803c12f 100644 ---- a/mexapi/src/Makefile.vc -+++ b/mexapi/src/Makefile.vc -@@ -62,10 +62,10 @@ - # - - install: -- copy interfacemex.c $(DESTDIR)\libexec\calceph\mex -- copy CalcephBin.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_compilemex.m $(DESTDIR)\libexec\calceph\mex -- copy Constants.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_getversion_str.m $(DESTDIR)\libexec\calceph\mex -- copy NaifId.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_seterrorhandler.m $(DESTDIR)\libexec\calceph\mex -+ copy interfacemex.c "$(DESTDIR)"\libexec\calceph\mex -+ copy CalcephBin.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_compilemex.m "$(DESTDIR)"\libexec\calceph\mex -+ copy Constants.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_getversion_str.m "$(DESTDIR)"\libexec\calceph\mex -+ copy NaifId.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_seterrorhandler.m "$(DESTDIR)"\libexec\calceph\mex -diff --git a/src/Makefile.vc b/src/Makefile.vc -index 730b4a7..9e790b1 100644 ---- a/src/Makefile.vc -+++ b/src/Makefile.vc -@@ -111,9 +111,9 @@ clean: - # install target: "nmake /f Makefile.vc install DESTDIR=xxx" to perform the installation. - # - install: all $(F2003INSTALL) -- copy f90calceph.h $(DESTDIR)\include -- copy calceph.h $(DESTDIR)\include -- copy $(LIBRARY) $(DESTDIR)\lib -+ copy f90calceph.h "$(DESTDIR)"\include -+ copy calceph.h "$(DESTDIR)"\include -+ copy $(LIBRARY) "$(DESTDIR)"\lib - - f2003install : -- copy f2003calceph.mod $(DESTDIR)\include -+ copy f2003calceph.mod "$(DESTDIR)"\include diff --git a/ports/calceph/portfile.cmake b/ports/calceph/portfile.cmake index 30be927c85162c..ecd7636e4d22fa 100755 --- a/ports/calceph/portfile.cmake +++ b/ports/calceph/portfile.cmake @@ -1,5 +1,5 @@ -set(CALCEPH_VERSION "3.5.0") -set(CALCEPH_HASH 12bb269d846aab93799656919cd9ca5a995248fb806727ea95667374b9380ca8f52c57dc6a5930c6995c13749bff1459c430eb2908b1533a8804fcb6b95c3de9) +set(CALCEPH_VERSION "3.5.1") +set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67) vcpkg_download_distfile(ARCHIVE URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz" @@ -10,7 +10,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES makefilevc.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/calceph/vcpkg.json b/ports/calceph/vcpkg.json index f67c5d1cca1fdf..1c5b7b196e9545 100755 --- a/ports/calceph/vcpkg.json +++ b/ports/calceph/vcpkg.json @@ -1,9 +1,9 @@ { "name": "calceph", - "version": "3.5.0", - "port-version": 2, + "version": "3.5.1", "description": "C library to access the binary planetary ephemeris files.", "homepage": "https://www.imcce.fr/inpop/calceph/", "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", + "license": "CECILL-2.1 OR CECILL-B OR CECILL-C", "supports": "!uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index f12e219c24f03d..64f91e73fd326a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1221,8 +1221,8 @@ "port-version": 1 }, "calceph": { - "baseline": "3.5.0", - "port-version": 2 + "baseline": "3.5.1", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", diff --git a/versions/c-/calceph.json b/versions/c-/calceph.json index 5c5cddde9983e9..8e60196c269ec3 100644 --- a/versions/c-/calceph.json +++ b/versions/c-/calceph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f9a949826498f0929b5745fff07fb9747b82fa", + "version": "3.5.1", + "port-version": 0 + }, { "git-tree": "f9919835108077ed1a077ef023b60903f52df42c", "version": "3.5.0",