Date: Tue, 26 May 2026 10:02:54 +0200 From: "Herbert J. Skuhra" <herbert@gojira.at> To: "Yuri Victorovich" <yuri@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: =?UTF-8?Q?Re:_git:_e4d33f5e0d5e_-_main_-_misc/ompl:_update_1.6.0_=E2=86=92?= =?UTF-8?Q?_2.0.0?= Message-ID: <f356eace-ea7d-4490-a96b-4288ba186d49@app.fastmail.com> In-Reply-To: <34b123e7-ce4f-4661-85e3-c2858b945081@app.fastmail.com> References: <6a14a88b.1851a.3744b11c@gitrepo.freebsd.org> <34b123e7-ce4f-4661-85e3-c2858b945081@app.fastmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, 26 May 2026, at 09:42, Herbert J. Skuhra wrote: > Hi Yuri, > > On Mon, 25 May 2026, at 21:52, Yuri Victorovich wrote: >> The branch main has been updated by yuri: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=e4d33f5e0d5e29716148800eaa9062e7e5bfc685 >> >> commit e4d33f5e0d5e29716148800eaa9062e7e5bfc685 >> Author: Yuri Victorovich <yuri@FreeBSD.org> >> AuthorDate: 2026-05-25 18:53:08 +0000 >> Commit: Yuri Victorovich <yuri@FreeBSD.org> >> CommitDate: 2026-05-25 19:52:41 +0000 >> >> misc/ompl: update 1.6.0 → 2.0.0 >> --- >> misc/ompl/Makefile | 38 +++--- >> misc/ompl/distinfo | 6 +- >> misc/ompl/files/patch-CMakeLists.txt | 8 +- >> .../patch-CMakeModules_CompilerSettings.cmake | 17 --- >> misc/ompl/pkg-plist | 149 +++++++++++++++++---- >> 5 files changed, 148 insertions(+), 70 deletions(-) > > I think this commit has two issues: > > 1. PLANNERARENA_DESC was removed/is missing. Are > PLANNERARENA_(BUILD_DEPENDS|RUN_DEPENDS) no longer needed? > > 2. make index complains about: > make[4]: /usr/ports/misc/ompl/Makefile:50: warning: duplicate script > for target "post-patch-PLANNERARENA-off" ignored > make[4]: Makefile:43: warning: using previous script for > "post-patch-PLANNERARENA-off" defined here > > Is the attached patch OK? Right patch attached. Sorry. [-- Attachment #2 --] diff --git a/misc/ompl/Makefile b/misc/ompl/Makefile index da3e91dcc2da..aa4647a72766 100644 --- a/misc/ompl/Makefile +++ b/misc/ompl/Makefile @@ -41,12 +41,12 @@ TRIANGLE_LIB_DEPENDS= libtriangle.so:math/triangle .for o in ${OPTIONS_DEFINE:NDEMOS} post-patch-${o}-off: @${REINPLACE_CMD} 's|find_package(${o}|#&|i' ${WRKSRC}/CMakeModules/OMPLDependencies.cmake + .if ${o} == PLANNERARENA + @${REINPLACE_CMD} 's|find_program(R_EXEC|#&|' ${WRKSRC}/CMakeModules/OMPLDependencies.cmake + .fi .endfor post-patch-DEMOS-on: @${REINPLACE_CMD} 's|#add_subdirectory(demos)|add_subdirectory(demos)|' ${WRKSRC}/CMakeLists.txt -post-patch-PLANNERARENA-off: - @${REINPLACE_CMD} 's|find_program(R_EXEC|#&|' ${WRKSRC}/CMakeModules/OMPLDependencies.cmake - .include <bsd.port.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f356eace-ea7d-4490-a96b-4288ba186d49>