Index: head/math/octomap/Makefile =================================================================== --- head/math/octomap/Makefile (revision 485504) +++ head/math/octomap/Makefile (revision 485505) @@ -1,28 +1,27 @@ # $FreeBSD$ PORTNAME= octomap DISTVERSIONPREFIX= v -DISTVERSION= v1.6.5-158 -DISTVERSIONSUFFIX= -g23cb13f +DISTVERSION= 1.9.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Efficient probabilistic 3D mapping framework based on octrees LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/octomap/LICENSE.txt LICENSE_FILE_GPLv2= ${WRKSRC}/octovis/LICENSE.txt BUILD_DEPENDS= libQGLViewer>0:graphics/libQGLViewer # otherwise it doesn't build, see https://github.com/OctoMap/octomap/issues/225 USES= cmake:outsource localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= OctoMap USE_LDCONFIG= yes # Viewer is broken: https://github.com/OctoMap/octomap/issues/224, and libQGLViewer detection is broken: https://github.com/OctoMap/octomap/issues/225 #CMAKE_ON= OCTOVIS_QT5 CMAKE_ARGS= -DQGLVIEWER_BASE_DIR:PATH=${LOCALBASE}/include/QGLViewer #-DQGLViewer_LIBRARY_DIR_OTHER:PATH=${LOCALBASE}/lib .include Index: head/math/octomap/distinfo =================================================================== --- head/math/octomap/distinfo (revision 485504) +++ head/math/octomap/distinfo (revision 485505) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542694534 -SHA256 (OctoMap-octomap-vv1.6.5-158-g23cb13f_GH0.tar.gz) = ff6f654b492b672b1a7ec39ccba4e29e1bdf215c318e388a22a3c78ab2fa34c7 -SIZE (OctoMap-octomap-vv1.6.5-158-g23cb13f_GH0.tar.gz) = 1682523 +TIMESTAMP = 1542791562 +SHA256 (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd +SIZE (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 1682421 Index: head/math/octomap/files/patch-octomap_src_CMakeLists.txt =================================================================== --- head/math/octomap/files/patch-octomap_src_CMakeLists.txt (revision 485504) +++ head/math/octomap/files/patch-octomap_src_CMakeLists.txt (revision 485505) @@ -1,33 +1,31 @@ ---- octomap/src/CMakeLists.txt.orig 2018-11-20 06:33:58 UTC +--- octomap/src/CMakeLists.txt.orig 2017-04-28 19:49:53 UTC +++ octomap/src/CMakeLists.txt -@@ -16,9 +16,9 @@ set_target_properties( octomap PROPERTIE +@@ -16,8 +16,8 @@ set_target_properties( octomap PROPERTIE VERSION ${OCTOMAP_VERSION} SOVERSION ${OCTOMAP_SOVERSION} ) -ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) -SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") --add_dependencies(octomap-static octomath-static) +#ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) +#SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") -+#add_dependencies(octomap-static octomath-static) TARGET_LINK_LIBRARIES(octomap octomath) -@@ -26,7 +26,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI +@@ -25,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") endif() -export(TARGETS octomap octomap-static +export(TARGETS octomap APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") ADD_SUBDIRECTORY( testing ) -@@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(intersection_examp +@@ -66,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_examp ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp) TARGET_LINK_LIBRARIES(octree2pointcloud octomap) -install(TARGETS octomap octomap-static +install(TARGETS octomap EXPORT octomap-targets INCLUDES DESTINATION include ${INSTALL_TARGETS_DEFAULT_ARGS}