git: 8abbc2f99de2 - main - misc/ompl: Fix duplicate target "post-patch-PLANNERARENA-off"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 14 Jun 2026 07:43:01 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8abbc2f99de26a28094860598f6a9273f826d4cc
commit 8abbc2f99de26a28094860598f6a9273f826d4cc
Author: Trond Endrestøl <Trond.Endrestol@ximalas.info>
AuthorDate: 2026-06-14 07:39:31 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-06-14 07:41:58 +0000
misc/ompl: Fix duplicate target "post-patch-PLANNERARENA-off"
The .for loop iterated over all options except DEMOS, which included
PLANNERARENA. This generated a post-patch-PLANNERARENA-off target that
conflicted with the explicit one defined after the loop.
Fix by:
- Exempting PLANNERARENA from the .for loop
- Adding the missing PLANNERARENA option variables (DESC, BUILD_DEPENDS,
RUN_DEPENDS) that were previously removed
PR: 295634
Approved by: yuri (maintainer, timeout 2 weeks)
---
misc/ompl/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/misc/ompl/Makefile b/misc/ompl/Makefile
index da3e91dcc2da..514c8607c188 100644
--- a/misc/ompl/Makefile
+++ b/misc/ompl/Makefile
@@ -31,6 +31,10 @@ DEMOS_CMAKE_ON= OMPL_BUILD_DEMOS
FLANN_DESC= Use FLANN for nearest neighbor queries
FLANN_LIB_DEPENDS= libflann.so:math/flann
+PLANNERARENA_DESC= Install plannerarena (depends on R)
+PLANNERARENA_BUILD_DEPENDS= Rscript:math/R
+PLANNERARENA_RUN_DEPENDS= Rscript:math/R
+
SPOT_DESC= Use 'Spot' for creating finite automata from LTL formulae
SPOT_USES= compiler:c++14-lang
SPOT_LIB_DEPENDS= libspot.so:math/spot
@@ -38,7 +42,7 @@ SPOT_LIB_DEPENDS= libspot.so:math/spot
TRIANGLE_DESC= Create triangular decompositions of 2D polygons
TRIANGLE_LIB_DEPENDS= libtriangle.so:math/triangle
-.for o in ${OPTIONS_DEFINE:NDEMOS}
+.for o in ${OPTIONS_DEFINE:NDEMOS:NPLANNERARENA}
post-patch-${o}-off:
@${REINPLACE_CMD} 's|find_package(${o}|#&|i' ${WRKSRC}/CMakeModules/OMPLDependencies.cmake
.endfor