Index: head/archivers/par2cmdline-tbb/Makefile =================================================================== --- head/archivers/par2cmdline-tbb/Makefile (revision 427104) +++ head/archivers/par2cmdline-tbb/Makefile (revision 427105) @@ -1,35 +1,35 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= par2cmdline-tbb PORTVERSION= 20100203 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= archivers MASTER_SITES= http://chuchusoft.com/par2_tbb/ DISTNAME= par2cmdline-0.4-tbb-${PORTVERSION} MAINTAINER= martymac@FreeBSD.org COMMENT= Tools for using Parity v2 Archive files (tbb version) LICENSE= GPLv2 LIB_DEPENDS= libtbb.so:devel/tbb ONLY_FOR_ARCHS= i386 amd64 ia64 GNU_CONFIGURE= yes USES= autoreconf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread PORTDOCS= README CONFLICTS= par2cmdline-[0-9]* PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify OPTIONS_DEFINE= DOCS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/cad/opencascade/Makefile =================================================================== --- head/cad/opencascade/Makefile (revision 427104) +++ head/cad/opencascade/Makefile (revision 427105) @@ -1,145 +1,145 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= opencascade PORTVERSION= 6.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry MAINTAINER= thierry@FreeBSD.org COMMENT= Open CASCADE Technology, 3D modeling & numerical simulation LICENSE= OCTPL LICENSE_NAME= LGPL21 with exception LICENSE_FILE= ${WRKSRC}/OCCT_LGPL_EXCEPTION.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libtbb.so:devel/tbb \ libvtksys-${VTKVER}.so:math/vtk6 RUN_DEPENDS= bash:shells/bash # Check ${WRKSRC}/dox/overview/Overview.md # and ${WRKSRC}/dox/dev_guides/building USES= alias:10 bison cmake compiler:c++11-lib dos2unix gmake \ shebangfix tk tar:tgz USE_XORG= xmu DOS2UNIX_FILES= adm/templates/* SHEBANG_FILES= adm/templates/env.sh.in adm/templates/draw.sh \ adm/templates/custom.sh.in adm/templates/custom.sh.main \ adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in \ gendoc codeblocks.sh VTKVER= 6.2 OPTIONS_DEFINE= VIS DOCS VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps) OPTIONS_DEFAULT=VIS OPTIONS_SUB= yes REINPLACE_ARGS= -i "" CFLAGS+= -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} LDFLAGS+= -L${LOCALBASE}/lib -L${TCL_LIBDIR} -L${TK_LIBDIR} CMAKE_ARGS+= -D3RDPARTY_TCL_INCLUDE_DIR=${TCL_INCLUDEDIR} \ -D3RDPARTY_TCL_LIBRARY=${TCL_LIBDIR} \ -D3RDPARTY_TBB_DIR=${LOCALBASE} \ -D3RDPARTY_TBB_LIBRARY_DIR=${LOCALBASE}/lib \ -DINSTALL_DIR=${OCCROOT}/ -DUSE_TBB:BOOL=ON \ -D3RDPARTY_TBBMALLOC_LIBRARY=${LOCALBASE}/lib/libtbbmalloc.so \ -D3RDPARTY_TBB_LIBRARY=${LOCALBASE}/lib/libtbb.so \ -D3RDPARTY_TBBMALLOC_LIBRARY_DIR=${LOCALBASE}/lib \ -DUSE_VTK:BOOL=ON -D3RDPARTY_VTK_DIR=${LOCALBASE} \ -D3RDPARTY_VTK_INCLUDE_DIR=${LOCALBASE}/include/vtk-${VTKVER} \ -D3RDPARTY_VTK_LIBRARY_DIR=${LOCALBASE}/lib/vtk-${VTKVER} USE_LDCONFIG= yes LOCCROOT= OpenCAS OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON VIS_CMAKE_OFF= -DUSE_FREEIMAGE:BOOL=OFF -DUSE_GL2PS:BOOL=OFF \ -DUSE_FREETYPE:BOOL=OFF VIS_USE= GL=glu VIS_LIB_DEPENDS= libftgl.so:graphics/ftgl \ libfreetype.so:print/freetype2 \ libgl2ps.so:print/gl2ps \ libfreeimageplus.so:graphics/freeimage VIS_CMAKE_ON= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} \ -D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE} \ -D3RDPARTY_GL2PS_DIR=${LOCALBASE} DOCS_USE= TEX=latex:build DOCS_BUILD_DEPENDS= bash:shells/bash \ doxygen:devel/doxygen \ dot:graphics/graphviz \ inkscape:graphics/inkscape DOCS_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax .include .if ${ARCH} == "i386" BITS= 32 .else BITS= 64 .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: to build OpenCascade, you should have at least" @${ECHO_MSG} "2.6 Gb of free disk space in build area!" @${ECHO_MSG} pre-configure: ${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc .for mod in TKDraw TKViewerTest ${REINPLACE_CMD} -e 's|tcl8.6|tcl${TCL_VER:C|\.||}|;s|tk8.6|tk${TK_VER:C|\.||}|' \ ${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt .endfor .for mod in TKIVtk TKIVtkDraw ${REINPLACE_CMD} -E 's/(vtk[[:alnum:]]+)\-6.1/\1\-${VTKVER}/' \ ${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt .endfor .for es in env.sh adm/templates/env.sh.in ${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es} .endfor post-build-DOCS-on: (cd ${WRKSRC} && ./gendoc -overview) post-install: ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE \ ${STAGEDIR}${PREFIX}/bin/ (cd ${STAGEDIR}${PREFIX}/bin && \ ${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE) ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/lib*.so \ ${STAGEDIR}${PREFIX}/lib/ (cd ${STAGEDIR}${PREFIX}/lib \ && for l in lib*.so; do \ ${MV} $${l} $${l}.0; \ ${LN} -sf $${l}.0 $${l}; \ ${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/$${l}; \ done) ${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE (cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE) ${RM} -r ${STAGEDIR}${OCCROOT}/inc ${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc (cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT}) post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${RMDIR} ${STAGEDIR}${DOCSDIR}/latex .if defined(MAINTAINER_MODE) regression-test: install ${MKDIR} /tmp/testOCC bash -c "\ cd ${OCCROOT} && . ${OCCROOT}/env.sh && \ CSF_TestScriptsPath=${OCCROOT}/tests \ CSF_TestDataPath=${OCCROOT}/data \ DRAWEXE -f ${FILESDIR}/regtest " .endif .include Index: head/devel/tbb/Makefile =================================================================== --- head/devel/tbb/Makefile (revision 427104) +++ head/devel/tbb/Makefile (revision 427105) @@ -1,67 +1,67 @@ # Created by: Arun Sharma # $FreeBSD$ PORTNAME= tbb PORTVERSION= 2017.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \ LOCAL/martymac DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20160916oss_src MAINTAINER= martymac@FreeBSD.org COMMENT= Library that provides thread building blocks LICENSE= GPLv2 SUB_FILES= tbb.pc SUB_LIST= prefix="${PREFIX}" \ name="${PORTNAME}" \ description="${COMMENT}" \ version="${PORTVERSION}" OPTIONS_DEFINE= DOCS PORTDOCS= * ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= has not been ported to this platform USE_LDCONFIG= yes USES= compiler gmake tar:tgz ALL_TARGET= default WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//} .include post-extract: .if ${CC} != ${COMPILER_TYPE} @${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC}.inc .endif @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ post-patch: @${REINPLACE_CMD} \ -e '/^CONLY =/s/^CONLY =.*/CONLY = ${CC}/' \ -e '/^CPLUS =/s/^CPLUS =.*/CPLUS = ${CXX}/' \ ${WRKSRC}/build/FreeBSD.${CC}.inc do-install: cd ${WRKSRC}; \ ${INSTALL_LIB} build/FreeBSD*release/libtbb.so \ - ${STAGEDIR}${PREFIX}/lib/libtbb.so.4; \ - ${LN} -sf libtbb.so.4 \ + ${STAGEDIR}${PREFIX}/lib/libtbb.so.2; \ + ${LN} -sf libtbb.so.2 \ ${STAGEDIR}${PREFIX}/lib/libtbb.so; \ ${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \ - ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.4; \ - ${LN} -sf libtbbmalloc.so.4 \ + ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.2; \ + ${LN} -sf libtbbmalloc.so.2 \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so; \ ${MKDIR} ${STAGEDIR}${PREFIX}/include/tbb/; \ cd include/tbb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/tbb/ ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} post-install: ${INSTALL_DATA} ${WRKDIR}/tbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: head/devel/tbb/pkg-plist =================================================================== --- head/devel/tbb/pkg-plist (revision 427104) +++ head/devel/tbb/pkg-plist (revision 427105) @@ -1,109 +1,109 @@ include/tbb/aggregator.h include/tbb/aligned_space.h include/tbb/atomic.h include/tbb/blocked_range.h include/tbb/blocked_range2d.h include/tbb/blocked_range3d.h include/tbb/cache_aligned_allocator.h include/tbb/combinable.h include/tbb/compat/condition_variable include/tbb/compat/ppl.h include/tbb/compat/thread include/tbb/compat/tuple include/tbb/concurrent_hash_map.h include/tbb/concurrent_lru_cache.h include/tbb/concurrent_priority_queue.h include/tbb/concurrent_queue.h include/tbb/concurrent_unordered_map.h include/tbb/concurrent_unordered_set.h include/tbb/concurrent_vector.h include/tbb/critical_section.h include/tbb/enumerable_thread_specific.h include/tbb/flow_graph.h include/tbb/flow_graph_abstractions.h include/tbb/flow_graph_opencl_node.h include/tbb/global_control.h include/tbb/index.html include/tbb/internal/_aggregator_impl.h include/tbb/internal/_concurrent_queue_impl.h include/tbb/internal/_concurrent_unordered_impl.h include/tbb/internal/_flow_graph_async_msg_impl.h include/tbb/internal/_flow_graph_impl.h include/tbb/internal/_flow_graph_indexer_impl.h include/tbb/internal/_flow_graph_item_buffer_impl.h include/tbb/internal/_flow_graph_join_impl.h include/tbb/internal/_flow_graph_node_impl.h include/tbb/internal/_flow_graph_streaming_node.h include/tbb/internal/_flow_graph_tagged_buffer_impl.h include/tbb/internal/_flow_graph_trace_impl.h include/tbb/internal/_flow_graph_types_impl.h include/tbb/internal/_mutex_padding.h include/tbb/internal/_range_iterator.h include/tbb/internal/_tbb_hash_compare_impl.h include/tbb/internal/_tbb_strings.h include/tbb/internal/_tbb_windef.h include/tbb/internal/_template_helpers.h include/tbb/internal/_x86_eliding_mutex_impl.h include/tbb/internal/_x86_rtm_rw_mutex_impl.h include/tbb/machine/gcc_armv7.h include/tbb/machine/gcc_generic.h include/tbb/machine/gcc_ia32_common.h include/tbb/machine/gcc_itsx.h include/tbb/machine/ibm_aix51.h include/tbb/machine/icc_generic.h include/tbb/machine/linux_common.h include/tbb/machine/linux_ia32.h include/tbb/machine/linux_ia64.h include/tbb/machine/linux_intel64.h include/tbb/machine/mac_ppc.h include/tbb/machine/macos_common.h include/tbb/machine/mic_common.h include/tbb/machine/msvc_armv7.h include/tbb/machine/msvc_ia32_common.h include/tbb/machine/sunos_sparc.h include/tbb/machine/windows_api.h include/tbb/machine/windows_ia32.h include/tbb/machine/windows_intel64.h include/tbb/machine/xbox360_ppc.h include/tbb/memory_pool.h include/tbb/mutex.h include/tbb/null_mutex.h include/tbb/null_rw_mutex.h include/tbb/parallel_do.h include/tbb/parallel_for.h include/tbb/parallel_for_each.h include/tbb/parallel_invoke.h include/tbb/parallel_reduce.h include/tbb/parallel_scan.h include/tbb/parallel_sort.h include/tbb/parallel_while.h include/tbb/partitioner.h include/tbb/pipeline.h include/tbb/queuing_mutex.h include/tbb/queuing_rw_mutex.h include/tbb/reader_writer_lock.h include/tbb/recursive_mutex.h include/tbb/runtime_loader.h include/tbb/scalable_allocator.h include/tbb/spin_mutex.h include/tbb/spin_rw_mutex.h include/tbb/task.h include/tbb/task_arena.h include/tbb/task_group.h include/tbb/task_scheduler_init.h include/tbb/task_scheduler_observer.h include/tbb/tbb.h include/tbb/tbb_allocator.h include/tbb/tbb_config.h include/tbb/tbb_exception.h include/tbb/tbb_machine.h include/tbb/tbb_profiling.h include/tbb/tbb_stddef.h include/tbb/tbb_thread.h include/tbb/tbbmalloc_proxy.h include/tbb/tick_count.h lib/libtbb.so -lib/libtbb.so.4 +lib/libtbb.so.2 lib/libtbbmalloc.so -lib/libtbbmalloc.so.4 +lib/libtbbmalloc.so.2 libdata/pkgconfig/tbb.pc Index: head/graphics/opencv2/Makefile =================================================================== --- head/graphics/opencv2/Makefile (revision 427104) +++ head/graphics/opencv2/Makefile (revision 427105) @@ -1,218 +1,218 @@ # Created by: Marc Abramowitz (http://marc.abramowitz.info) # $FreeBSD$ PORTNAME?= opencv PORTVERSION= 2.4.13.1 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= graphics PKGNAMESUFFIX?= 2 MAINTAINER= ports@FreeBSD.org COMMENT= Open Source Computer Vision library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes PORTSCOUT= limit:^2\. CONFLICTS_INSTALL= ${PKGBASE:S/${PORTNAME}2/${PORTNAME}/} USES= cmake pkgconfig USE_LDCONFIG= yes NOT_FOR_ARCHS= sparc64 NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64 DATADIR= ${PREFIX}/share/OpenCV PLIST_SUB+= VERSION=${DISTVERSION:R} CMAKE_ARGS+= -DWITH_CUDA:BOOL=Off \ -DWITH_PVAPI:BOOL=Off \ -DWITH_UNICAP:BOOL=Off \ -DBUILD_TESTS:BOOL=Off \ -DBUILD_DOCS:BOOL=Off \ -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD} SUB_FILES= FindOpenCVCore.cmake SUB_LIST= OCV_VERSION=${DISTVERSION:R} OCV_CORE_MODS= core imgproc OCV_MODS= calib3d contrib features2d flann gpu \ highgui legacy ml ocl objdetect photo \ stitching superres ts video videostab OCV_NONFREE_MODS= nonfree OCV_JAVA_MODS= java OCV_PYTHON_MODS= python OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL OPTIONS_GROUP= IMAGE PERFORMANCE SIMD VIDEO OPTIONS_GROUP_IMAGE= JASPER JPEG OPENEXR PNG TIFF OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB OPTIONS_GROUP_SIMD= ${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}} OPTIONS_GROUP_SIMD_amd64= ${OPTIONS_GROUP_SIMD_i386} OPTIONS_GROUP_SIMD_armv6= NEON VFPV3 OPTIONS_GROUP_SIMD_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2 OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER GSTREAMER0 V4L XINE OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GTK2 QT4 OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L ${MACHINE_CPU:tu} OPTIONS_SUB= yes .if defined(OCV_CORE) OPTIONS_EXCLUDE= DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ OPENGL PNG TIFF FFMPEG GSTREAMER GSTREAMER0 V4L XINE .endif DC1394_DESC= IEEE 1394 camera support DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 DC1394_CMAKE_BOOL= WITH_1394 EIGEN3_DESC= Eigen 3 support EIGEN3_BUILD_DEPENDS= ${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3 EIGEN3_CMAKE_BOOL= WITH_EIGEN . if !defined(OCV_SLAVE) EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES INSTALL_C_EXAMPLES . endif EXAMPLES_PORTEXAMPLES= * FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG GSTREAMER0_DESC= ${GSTREAMER_DESC} 0.10 GSTREAMER0_USE= GSTREAMER=yes GSTREAMER0_CMAKE_BOOL= WITH_GSTREAMER_0_10 GSTREAMER_USE= GSTREAMER1=yes GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER GTK2_USE= GNOME=gtk20 GTK2_CMAKE_BOOL= WITH_GTK JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JASPER_CMAKE_BOOL= WITH_JASPER JPEG_USES= jpeg JPEG_CMAKE_BOOL= WITH_JPEG NONFREE_CMAKE_BOOL= BUILD_opencv_nonfree OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR OPENEXR_CMAKE_BOOL= WITH_OPENEXR OPENGL_LIB_DEPENDS= ${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,} OPENGL_USE= ${PORT_OPTIONS:MQT4:S,$,=opengl,} OPENGL_CMAKE_BOOL= WITH_OPENGL PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL= WITH_PNG QT4_USE= QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib QT4_CMAKE_ON= -DWITH_QT:STRING="4" QT4_CMAKE_OFF= -DWITH_QT:BOOL=false .for _simd in ${OPTIONS_GROUP_SIMD} ${_simd}_DESC= ${MMX_DESC:S/MMX/${_simd}/} ${_simd}_CMAKE_BOOL= ENABLE_${_simd} .endfor TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_CMAKE_BOOL= WITH_TBB TBB_CMAKE_ON= -DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include" TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CMAKE_BOOL= WITH_TIFF V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CMAKE_BOOL= WITH_V4L V4L_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" XINE_LIB_DEPENDS= libxine.so:multimedia/libxine XINE_CMAKE_BOOL= WITH_XINE IMAGE_DESC= Image format support NONFREE_DESC= Build functionality that has possible limitations of use PERFORMANCE_DESC= Performance enhancing libraries TBB_DESC= TBB support .if defined(OCV_CORE) . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor .elif defined(OCV_PYTHON) LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv2 BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} USES+= python:2.7 CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On . for module in apps java stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor INSTALL_WRKSRC= ${WRKSRC}/modules/python .elif defined(OCV_JAVA) BUILD_DEPENDS+= ant:devel/apache-ant LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv2 USES+= python:build USE_JAVA= yes CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On . for module in apps python stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" INSTALL_WRKSRC= ${WRKSRC}/modules/java .else LIB_DEPENDS+= libopencv_core.so:graphics/opencv2-core . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off . endfor .endif post-patch: @${MKDIR} ${CONFIGURE_WRKSRC} @${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \ ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake @${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \ -e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \ ${WRKSRC}/CMakeLists.txt @${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} {} \; .if defined(OCV_CORE) @${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \ ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake @${REINPLACE_CMD} -e 's|Name:.*|Name: OpenCV-core|' \ ${WRKSRC}/cmake/templates/opencv-XXX.pc.in .endif .if defined(OCV_SLAVE) @${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \ ${WRKSRC}/CMakeLists.txt .endif post-install: .if !defined(OCV_SLAVE) (cd ${STAGEDIR}${PREFIX} && \ ${RM} -r include/opencv2/core include/opencv2/imgproc \ lib/libopencv_core* lib/libopencv_imgproc*) .endif .if defined(OCV_CORE) ${RM} -r ${STAGEDIR}${PREFIX}/include/opencv ${RM} -r ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules ${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${STAGEDIR}${PREFIX}/share/cmake/Modules .endif .if defined(OCV_PYTHON) (cd ${STAGEDIR}${PREFIX} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||} && \ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||}) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/samples/python2 && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python2 .endif .if defined(OCV_JAVA) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/samples/java && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java .endif .include Index: head/math/saga/Makefile =================================================================== --- head/math/saga/Makefile (revision 427104) +++ head/math/saga/Makefile (revision 427105) @@ -1,116 +1,116 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= swig3.0:devel/swig30 LIB_DEPENDS= libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ liblas.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ libopencv_ml.so:graphics/opencv2 \ libopencv_core.so:graphics/opencv2-core \ libproj.so:graphics/proj \ libtbb.so:devel/tbb \ libtiff.so:graphics/tiff RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_CXXSTD= c++11 USE_WX= 3.0+ USES= autoreconf libtool localbase compiler:gcc-c++11-lib \ iconv:wchar_t dos2unix python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL OPENMP VIGRA NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -pthread PGSQL_CONFIGURE_OFF= --with-postgresql=no PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra .include SUB_FILES= pkg-message post-extract: @${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure.ac \ ${WRKSRC}/src/saga_core/saga_api/Makefile.am \ ${WRKSRC}/src/saga_core/saga_cmd/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gdi/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gui/Makefile.am \ ${WRKSRC}/src/modules/garden/garden_3d_viewer/Makefile.am \ ${WRKSRC}/src/modules/garden/garden_webservices/Makefile.am \ ${WRKSRC}/src/modules/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/modules/io/io_shapes/Makefile.am \ ${WRKSRC}/src/modules/io/io_virtual/Makefile.am \ ${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/modules/tin/tin_viewer/Makefile.am \ ${WRKSRC}/src/modules/statistics/statistics_kriging/Makefile.am @${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \ ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am post-patch: .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ ${WRKSRC}/src/saga_core/saga_api/api_core.h .endif @${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION:C/\./-/g}|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp post-configure: @${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_contrib|' \ ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile post-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) ${MKDIR} ${STAGEDIR}${DATADIR}/scripting (cd ${WRKSRC}/src/scripting && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripting) @${RM} -R ${STAGEDIR}${DATADIR}/scripting/toolchains ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include