On 2023/11/17 02:10, Theo Buehler wrote:
> This runs into various issues with boost 1.83. After I found myself
> pulling in the third upstream commit without success, I got tired of it
> and decided to use the HEAD commit. This builds & packages with both
> boost 1.80 and 1.83.
Tested with osrm-frontend on boost 1.80, works fine. OK
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/osrm-backend/Makefile,v
> diff -u -p -r1.13 Makefile
> --- Makefile 15 Nov 2023 16:57:22 -0000 1.13
> +++ Makefile 17 Nov 2023 00:57:26 -0000
> @@ -6,8 +6,8 @@ COMMENT = high-performance road network
>
> GH_ACCOUNT = Project-OSRM
> GH_PROJECT = osrm-backend
> -GH_TAGNAME = v5.27.1
> -REVISION = 0
> +GH_COMMIT = 31e31a63d062fb804f5f4695ed3036ca7a269ead
> +DISTNAME = osrm-backend-5.27.1pl0
>
> CATEGORIES = geo
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/geo/osrm-backend/distinfo,v
> diff -u -p -r1.3 distinfo
> --- distinfo 11 Jun 2023 07:55:46 -0000 1.3
> +++ distinfo 17 Nov 2023 00:58:43 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (osrm-backend-5.27.1.tar.gz) =
> UjkVgOD5JmPdeyHLzHuQZNZwRHDiYBvz7FxRcLRxYpo=
> -SIZE (osrm-backend-5.27.1.tar.gz) = 10979468
> +SHA256 (osrm-backend-5.27.1pl0-31e31a63.tar.gz) =
> 1BCHnp2wPyF7Eiz9AZvfVrOBCsyGortUCnyilOqK7ns=
> +SIZE (osrm-backend-5.27.1pl0-31e31a63.tar.gz) = 11087133
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/geo/osrm-backend/patches/patch-CMakeLists_txt,v
> diff -u -p -r1.4 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 11 Jun 2023 07:55:46 -0000 1.4
> +++ patches/patch-CMakeLists_txt 17 Nov 2023 00:57:26 -0000
> @@ -1,21 +1,12 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -389,7 +389,7 @@ if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER
> - set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,--gc-sections")
> - endif()
> - # Default linker optimization flags
> -- set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,-O1 -Wl,--hash-style=gnu
> -Wl,--sort-common")
> -+ set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,--sort-common")
> -
> - else()
> - message(STATUS "Using unknown linker, not setting linker optimizations")
> -@@ -419,7 +419,7 @@ if(APPLE)
> - endif()
> +@@ -274,7 +274,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
> + target_link_libraries(osrm-extract wsock32 ws2_32)
> endif()
>
> -if(UNIX AND NOT APPLE)
> +if(UNIX AND NOT APPLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
> - set(MAYBE_RT_LIBRARY -lrt)
> - endif()
> -
> + find_library(RT_LIB rt)
> + if (RT_LIB)
> + set(MAYBE_RT_LIBRARY -lrt)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/geo/osrm-backend/pkg/PLIST,v
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 24 Aug 2023 21:50:28 -0000 1.8
> +++ pkg/PLIST 17 Nov 2023 00:57:26 -0000
> @@ -1,6 +1,6 @@
> +@conflict flatbuffers-*
> @newgroup _osrm_routed:815
> @newuser _osrm_routed:815:815::OSRM Router:/var/empty:/sbin/nologin
> -@conflict flatbuffers-*
> @rcscript ${RCDIR}/osrm_routed
> @bin bin/osrm-components
> @bin bin/osrm-contract
> @@ -41,6 +41,7 @@ include/osrm/contractor_config.hpp
> include/osrm/coordinate.hpp
> include/osrm/customizer.hpp
> include/osrm/customizer_config.hpp
> +include/osrm/datasets.hpp
> include/osrm/engine/
> include/osrm/engine/api/
> include/osrm/engine/api/base_parameters.hpp
> @@ -104,6 +105,9 @@ include/osrm/util/typedefs.hpp
> @static-lib lib/libosrm_update.a
> lib/pkgconfig/libosrm.pc
> share/osrm/
> +share/osrm/data/
> +share/osrm/data/driving_side.geojson
> +share/osrm/data/maxheight.geojson
> share/osrm/profiles/
> share/osrm/profiles/bicycle.lua
> share/osrm/profiles/car.lua
>
