Date: Sun, 8 Mar 2020 21:56:37 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528082 - in head: astro/siril biology/abyss biology/hhsuite biology/py-fastTSNE comms/wsjtx converters/pdf2djvu devel/R-cran-data.table devel/dmlc-core devel/py-numba finance/quantlib ... Message-ID: <202003082156.028LubKc046265@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Mar 8 21:56:36 2020 New Revision: 528082 URL: https://svnweb.freebsd.org/changeset/ports/528082 Log: Drop dependency on devel/openmp - Drop if devel/llvm* was used as a substitute Approved by: yuri, rene (earlier version) Differential Revision: https://reviews.freebsd.org/D23020 Modified: head/astro/siril/Makefile (contents, props changed) head/biology/abyss/Makefile (contents, props changed) head/biology/hhsuite/Makefile (contents, props changed) head/biology/py-fastTSNE/Makefile (contents, props changed) head/comms/wsjtx/Makefile (contents, props changed) head/converters/pdf2djvu/Makefile (contents, props changed) head/devel/R-cran-data.table/Makefile (contents, props changed) head/devel/dmlc-core/Makefile (contents, props changed) head/devel/py-numba/Makefile (contents, props changed) head/finance/quantlib/Makefile (contents, props changed) head/graphics/blender/Makefile (contents, props changed) head/graphics/darktable/Makefile (contents, props changed) head/graphics/ebsynth/Makefile (contents, props changed) head/graphics/gmic/Makefile (contents, props changed) head/graphics/gthumb/Makefile (contents, props changed) head/graphics/lightzone/Makefile (contents, props changed) head/graphics/mandelbulber/Makefile (contents, props changed) head/graphics/pcl-pointclouds/Makefile (contents, props changed) head/graphics/photoflare/Makefile (contents, props changed) head/graphics/rawtherapee/Makefile (contents, props changed) head/graphics/tesseract/Makefile (contents, props changed) head/math/R-cran-gower/Makefile (contents, props changed) head/math/ambit/Makefile (contents, props changed) head/math/blaze/Makefile (contents, props changed) head/math/blazeiterative/Makefile (contents, props changed) head/math/combblas/Makefile (contents, props changed) head/math/csdp/Makefile (contents, props changed) head/math/darknet/Makefile (contents, props changed) head/math/dbcsr/Makefile (contents, props changed) head/math/ensmallen/Makefile (contents, props changed) head/math/gretl/Makefile (contents, props changed) head/math/hipmcl/Makefile (contents, props changed) head/math/libnormaliz/Makefile (contents, props changed) head/math/libxsmm/Makefile (contents, props changed) head/math/lis/Makefile (contents, props changed) head/math/mkl-dnn/Makefile (contents, props changed) head/math/py-rpy2/Makefile (contents, props changed) head/math/py-yt/Makefile (contents, props changed) head/math/saga/Makefile (contents, props changed) head/math/timbl/Makefile (contents, props changed) head/misc/mxnet/Makefile (contents, props changed) head/misc/opennn/Makefile (contents, props changed) head/misc/urh/Makefile (contents, props changed) head/misc/xgboost/Makefile (contents, props changed) head/multimedia/libopenshot/Makefile (contents, props changed) head/net/aluminum/Makefile (contents, props changed) head/science/abinit/Makefile (contents, props changed) head/science/agrum/Makefile (contents, props changed) head/science/chrono/Makefile (contents, props changed) head/science/erkale/Makefile (contents, props changed) head/science/gabedit/Makefile (contents, props changed) head/science/gromacs/Makefile (contents, props changed) head/science/lammps/Makefile (contents, props changed) head/science/latte/Makefile (contents, props changed) head/science/nest/Makefile (contents, props changed) head/science/openmx/Makefile (contents, props changed) head/science/openmx/files/patch-makefile (contents, props changed) head/science/py-GPy/Makefile (contents, props changed) head/science/py-PyFR/Makefile (contents, props changed) head/science/py-phono3py/Makefile (contents, props changed) head/science/py-scikit-learn/Makefile (contents, props changed) head/science/qmcpack/Makefile (contents, props changed) head/textproc/libfolia/Makefile (contents, props changed) head/textproc/ucto/Makefile (contents, props changed) Modified: head/astro/siril/Makefile ============================================================================== --- head/astro/siril/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/astro/siril/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= siril DISTVERSION= 0.9.12 +PORTREVISION= 1 CATEGORIES= astro graphics MASTER_SITES= https://free-astro.org/download/ @@ -37,7 +38,6 @@ OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP OPENMP_CONFIGURE_ENABLE= openmp -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata ${STAGEDIR}${PREFIX}/share/mime/packages Modified: head/biology/abyss/Makefile ============================================================================== --- head/biology/abyss/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/biology/abyss/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= abyss DISTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org @@ -16,8 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp: ghc:lang/ghc \ pandoc:textproc/hs-pandoc # pandoc is required just for one man page: abyss-sealer LIB_DEPENDS= libffi.so:devel/libffi \ - libgmp.so:math/gmp \ - libomp.so:devel/openmp + libgmp.so:math/gmp RUN_DEPENDS= bash:shells/bash \ gmake:devel/gmake Modified: head/biology/hhsuite/Makefile ============================================================================== --- head/biology/hhsuite/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/biology/hhsuite/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,7 +3,7 @@ PORTNAME= hhsuite DISTVERSIONPREFIX= v DISTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology science MAINTAINER= yuri@FreeBSD.org @@ -13,7 +13,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= openmpi>0:net/openmpi -LIB_DEPENDS= libomp.so:devel/openmp RUN_DEPENDS= openmpi>0:net/openmpi USES= cmake compiler:c++11-lang perl5 python shebangfix Modified: head/biology/py-fastTSNE/Makefile ============================================================================== --- head/biology/py-fastTSNE/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/biology/py-fastTSNE/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= fastTSNE DISTVERSION= 0.2.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,8 +13,7 @@ COMMENT= Fast, parallel implementations of t-SNE LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} -LIB_DEPENDS= libfftw3.so:math/fftw3 \ - libomp.so:devel/openmp +LIB_DEPENDS= libfftw3.so:math/fftw3 RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}numba>=0.38.1:devel/py-numba@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ Modified: head/comms/wsjtx/Makefile ============================================================================== --- head/comms/wsjtx/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/comms/wsjtx/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= wsjtx DISTVERSION= 2.1.2 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} @@ -18,8 +19,7 @@ BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidocto ${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ - libxslt.so:textproc/libxslt \ - libomp.so:devel/openmp + libxslt.so:textproc/libxslt USES= cmake compiler:c++11-lib fortran gl \ makeinfo pkgconfig qt:5 tar:tgz Modified: head/converters/pdf2djvu/Makefile ============================================================================== --- head/converters/pdf2djvu/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/converters/pdf2djvu/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.9.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= converters MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/ @@ -44,7 +44,6 @@ NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime MULTITHREADING_CONFIGURE_ENABLE=openmp -MULTITHREADING_LIB_DEPENDS= libomp.so:devel/openmp XMP_CONFIGURE_ENABLE= xmp XMP_LIB_DEPENDS= libexiv2.so:graphics/exiv2 Modified: head/devel/R-cran-data.table/Makefile ============================================================================== --- head/devel/R-cran-data.table/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/devel/R-cran-data.table/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= data.table DISTVERSION= 1.12.8 +PORTREVISION= 1 CATEGORIES= devel DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -20,6 +21,5 @@ OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP OPENMP_CONFIGURE_ENABLE= openmp -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp .include <bsd.port.mk> Modified: head/devel/dmlc-core/Makefile ============================================================================== --- head/devel/dmlc-core/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/devel/dmlc-core/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -18,11 +18,4 @@ USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -.include <bsd.port.pre.mk> - -# XXX Drop after FreeBSD 12.0 EOL -.if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/omp.h) -LIB_DEPENDS+= libomp.so:devel/openmp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/py-numba/Makefile ============================================================================== --- head/devel/py-numba/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/devel/py-numba/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= numba DISTVERSION= 0.47.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,8 +15,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.11,1:math/py-numpy@${PY_FLAVOR} -LIB_DEPENDS= libomp.so:devel/openmp \ - libtbb.so:devel/tbb +LIB_DEPENDS= libtbb.so:devel/tbb RUN_DEPENDS= ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.31.0:devel/py-llvmlite@${PY_FLAVOR} py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \ Modified: head/finance/quantlib/Makefile ============================================================================== --- head/finance/quantlib/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/finance/quantlib/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= quantlib PORTVERSION= 1.17 +PORTREVISION= 1 CATEGORIES= finance math devel MASTER_SITES= https://dl.bintray.com/${PORTNAME}/releases/ DISTNAME= QuantLib-${PORTVERSION} @@ -48,16 +49,6 @@ CONFIGURE_ARGS+= --with-boost-lib=${LOCALBASE}/lib .for o in ${OPTIONS_DEFINE} $o_CONFIGURE_ENABLE= ${o:S/_/-/g:tl} .endfor - -# OPENMP_USES= compiler:openmp - XXX broken, insists on gcc, -# but boost is built with clang... -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp -OPENMP_CFLAGS= -I${LOCALBASE}/include -OPENMP_LDFLAGS= -L${LOCALBASE}/lib -# devel/openmp installs its own -lomp, which is cleaner. -# unfortunately, devel/llvm${COMPILER_VERSION} may install -# one too: -OPENMP_LDFLAGS+= -L${LOCALBASE}/llvm${COMPILER_VERSION}/lib CXXFLAGS_i386= -DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/blender/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= blender DISTVERSION= 2.82 +PORTREVISION= 1 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -135,7 +136,6 @@ OPENIMAGEDN_ONLY_FOR_ARCHS= amd64 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON= oidn only supports amd64 # openmp usually works on amd64 OPENMP_CMAKE_BOOL= WITH_OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/darktable/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,7 +3,7 @@ PORTNAME= darktable PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ @@ -102,18 +102,6 @@ WEBP_CMAKE_OFF= -DUSE_WEBP:BOOL=OFF .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \ -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN} -.endif - -# Base clang may not support OpenMP, use ports clang: -.if ${ARCH} == amd64 && ${CHOSEN_COMPILER_TYPE} == clang -LLVM_VER= ${LLVM_DEFAULT} -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} - -CPP= clang-cpp${LLVM_VER} -CC= clang${LLVM_VER} -CXX= clang++${LLVM_VER} - -LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_VER} .endif .if defined(WITH_DEBUG) Modified: head/graphics/ebsynth/Makefile ============================================================================== --- head/graphics/ebsynth/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/ebsynth/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= ebsynth PORTVERSION= 0.0.0.20190510 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= FreeBSD@ShaneWare.biz @@ -9,9 +10,7 @@ COMMENT= Example-based Image Synthesis and Style Trans LICENSE= PD -LIB_DEPENDS= libomp.so:devel/openmp - -USES= compiler:c++11-lang localbase +USES= compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= jamriska GH_TAGNAME= 2f5c97c0c21a Modified: head/graphics/gmic/Makefile ============================================================================== --- head/graphics/gmic/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/gmic/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= gmic DISTVERSION= 2.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -41,17 +41,9 @@ OPTIONS_DEFAULT= OPENMP X11 OPTIONS_SUB= yes OPENMP_CMAKE_BOOL= ENABLE_OPENMP -OPENMP_LIB_DEPENDS= libgomp.so:devel/openmp X11_CMAKE_BOOL= ENABLE_X X11_USES= xorg X11_USE= XORG=ice,sm,x11,xext -.include <bsd.port.pre.mk> - -# XXX Drop after FreeBSD 12.0 EOL -.if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/omp.h) -LIB_DEPENDS+= libomp.so:devel/openmp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/gthumb/Makefile ============================================================================== --- head/graphics/gthumb/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/gthumb/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -4,7 +4,7 @@ PORTNAME= gthumb PORTVERSION= 3.6.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -22,7 +22,6 @@ LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ liboauth.so:net/liboauth \ - libomp.so:devel/openmp \ libpng.so:graphics/png \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff Modified: head/graphics/lightzone/Makefile ============================================================================== --- head/graphics/lightzone/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/lightzone/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -4,7 +4,7 @@ PORTNAME= lightzone DISTVERSION= 4.1.8-3 DISTVERSIONSUFFIX= -g36e87773 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics java DIST_SUBDIR= ${PORTNAME} @@ -23,7 +23,6 @@ BUILD_DEPENDS= jhindexer:java/javahelp \ tidy:www/tidy-lib \ autoconf:devel/autoconf LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ - libomp.so:devel/openmp \ libtiff.so:graphics/tiff RUN_DEPENDS= jhindexer:java/javahelp Modified: head/graphics/mandelbulber/Makefile ============================================================================== --- head/graphics/mandelbulber/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/mandelbulber/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= mandelbulber DISTVERSION= 2.20 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org @@ -36,8 +37,6 @@ OPTIONS_DEFINE= OPENCL OPENMP DOCS OPTIONS_EXCLUDE= OPENMP # not properly supported yet OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl - -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp post-patch-OPENMP-off: @${REINPLACE_CMD} -e 's|-fopenmp||' \ Modified: head/graphics/pcl-pointclouds/Makefile ============================================================================== --- head/graphics/pcl-pointclouds/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/pcl-pointclouds/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= pcl DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= graphics math PKGNAMESUFFIX= -pointclouds @@ -23,7 +24,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libpcap.so:net/libpcap \ libtiff.so:graphics/tiff -USES= cmake compiler eigen:3 jpeg python xorg +USES= cmake compiler:c++14-lang eigen:3 jpeg python xorg LLD_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= PointCloudLibrary @@ -58,17 +59,6 @@ VTK_LIB_DEPENDS= libvtkCommonCore-8.1.so:math/vtk8 VTK_BROKEN= VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/issues/17444 .include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} == clang -# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 -# This should also be an port option, but PCL fails to build w/out OpenMP: https://github.com/PointCloudLibrary/pcl/issues/2638 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} -.else -USE_GCC= yes -.endif post-patch: # 10 doesn't have std::sqrt, switching to ::sqrt from math.h @${GREP} -rl std::sqrt ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|::std::sqrt|::sqrt|g ; s|std::sqrt|::sqrt|g' Modified: head/graphics/photoflare/Makefile ============================================================================== --- head/graphics/photoflare/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/photoflare/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= photoflare DISTVERSIONPREFIX= v DISTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -11,8 +12,7 @@ COMMENT= Quick, simple but powerful cross-platform ima LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \ - libomp.so:devel/openmp +LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick USES= compiler:c++17-lang desktop-file-utils gl qmake qt:5 localbase pkgconfig USE_GITHUB= yes @@ -20,6 +20,6 @@ USE_QT= core gui network printsupport widgets buildto USE_GL= gl CXXFLAGS+= `pkg-config --cflags GraphicsMagick++` -LDFLAGS+= `pkg-config --libs GraphicsMagick++` ${LOCALBASE}/lib/libomp.so +LDFLAGS+= `pkg-config --libs GraphicsMagick++` -lomp .include <bsd.port.mk> Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/rawtherapee/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -126,9 +126,6 @@ CMAKE_ARGS+= -DPROC_TARGET_NUMBER="2" .endif .if !empty(PORT_OPTIONS:MOPENMP) && !empty(OPTIONS_DEFINE:MOPENMP) -. if ${OSVERSION} < 1102507 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200506) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300050) -LIB_DEPENDS+= libomp.so:devel/openmp -. endif OPENMP_FLAGS= -lm -lomp LDFLAGS+= ${OPENMP_FLAGS} .endif Modified: head/graphics/tesseract/Makefile ============================================================================== --- head/graphics/tesseract/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/graphics/tesseract/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -49,12 +49,6 @@ TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \ libfontconfig.so:x11-fonts/fontconfig TOOLS_USE= GNOME=cairo,glib20,pango -.include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/omp.h) && ${PORT_OPTIONS:MOPENMP} -LIB_DEPENDS+= libomp.so:devel/openmp -.endif - post-patch: @${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure.ac @@ -68,4 +62,4 @@ post-install-DOCS-on: post-install-TOOLS-on: @cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/R-cran-gower/Makefile ============================================================================== --- head/math/R-cran-gower/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/R-cran-gower/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= gower DISTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -15,7 +16,5 @@ USES= cran:auto-plist,compiles OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP - -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp .include <bsd.port.mk> Modified: head/math/ambit/Makefile ============================================================================== --- head/math/ambit/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/ambit/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -14,7 +14,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libhdf5.so:science/hdf5 \ - libomp.so:devel/openmp \ libopenblas.so:math/openblas \ libsz.so:science/szip Modified: head/math/blaze/Makefile ============================================================================== --- head/math/blaze/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/blaze/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -13,11 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ - openblas>0:math/openblas \ - openmp>0:devel/openmp + openblas>0:math/openblas RUN_DEPENDS= boost-libs>0:devel/boost-libs \ - openblas>0:math/openblas \ - openmp>0:devel/openmp + openblas>0:math/openblas USES= cmake compiler:c++14-lang fortran localbase:ldflags NO_ARCH= yes Modified: head/math/blazeiterative/Makefile ============================================================================== --- head/math/blazeiterative/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/blazeiterative/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -12,8 +12,7 @@ COMMENT= Set of iterative linear system solvers for us BUILD_DEPENDS= blaze>0:math/blaze \ boost-libs>0:devel/boost-libs \ - openblas>0:math/openblas \ - openmp>0:devel/openmp + openblas>0:math/openblas RUN_DEPENDS= blaze>0:math/blaze USES= cmake compiler:c++14-lang fortran localbase:ldflags Modified: head/math/combblas/Makefile ============================================================================== --- head/math/combblas/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/combblas/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= CombBLAS DISTVERSION= 1.6.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= https://people.eecs.berkeley.edu/~aydin/${PORTNAME}_FILES/ DISTNAME= ${PORTNAME}_beta_${DISTVERSION:S/.//:S/./_/} @@ -13,8 +13,7 @@ COMMENT= Combinatorial BLAS library: an extensible par LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libmpi.so:net/mpich \ - libomp.so:devel/openmp +LIB_DEPENDS= libmpi.so:net/mpich RUN_DEPENDS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so.1:lang/gcc${GCC_DEFAULT} # because of the link flags induced by mpich USES= cmake compiler:c++14-lang localbase:ldflags tar:tgz Modified: head/math/csdp/Makefile ============================================================================== --- head/math/csdp/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/csdp/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -31,14 +31,7 @@ PLIST_FILES= bin/complement \ bin/rand_graph \ bin/theta -.include <bsd.port.pre.mk> - -# XXX Drop after FreeBSD 12.0 EOL -.if !exists(/usr/include/omp.h) -LIB_DEPENDS+= libomp.so:devel/openmp -.endif - post-stage: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/darknet/Makefile ============================================================================== --- head/math/darknet/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/darknet/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -4,6 +4,7 @@ PORTNAME= darknet DISTVERSIONPREFIX= darknet_yolo_v DISTVERSION= 3-446 DISTVERSIONSUFFIX= -gf2fc239 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math # machine-learning @@ -12,8 +13,6 @@ COMMENT= Open source neural networks in C LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE - -LIB_DEPENDS= libomp.so:devel/openmp USES= cmake compiler:c11 USE_GITHUB= yes Modified: head/math/dbcsr/Makefile ============================================================================== --- head/math/dbcsr/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/dbcsr/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,7 +3,7 @@ PORTNAME= dbcsr DISTVERSIONPREFIX= v DISTVERSION= 2.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -35,7 +35,6 @@ MPI_CMAKE_BOOL= USE_MPI MPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMP_CMAKE_BOOL= USE_OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp C_API_DESC= Build the C API library C_API_CMAKE_BOOL= WITH_C_API Modified: head/math/ensmallen/Makefile ============================================================================== --- head/math/ensmallen/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/ensmallen/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= ensmallen DISTVERSION= 2.11.4 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://ensmallen.org/files/ @@ -11,10 +12,8 @@ COMMENT= Flexible C++ library for efficient mathematic LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${LOCALBASE}/include/armadillo_bits/config.hpp:math/armadillo \ - openmp>0:devel/openmp -RUN_DEPENDS= ${LOCALBASE}/include/armadillo_bits/config.hpp:math/armadillo \ - openmp>0:devel/openmp +BUILD_DEPENDS= ${LOCALBASE}/include/armadillo_bits/config.hpp:math/armadillo +RUN_DEPENDS= ${LOCALBASE}/include/armadillo_bits/config.hpp:math/armadillo USES= cmake localbase CMAKE_OFF= BUILD_TESTS Modified: head/math/gretl/Makefile ============================================================================== --- head/math/gretl/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/gretl/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -85,13 +85,6 @@ CONFIGURE_ARGS+= --enable-sse2=yes CONFIGURE_ARGS+= --enable-sse2=no .endif -.include <bsd.port.pre.mk> - -# XXX Drop after FreeBSD 12.0 EOL -.if !exists(/usr/include/omp.h) -LIB_DEPENDS+= libomp.so:devel/openmp -.endif - post-patch: @${SED} -i '.orig' -E -e '/#include[[:blank:]]+<sys\/socket\.h>/\ {x; s/.*/#include <netinet\/in.h>/; H; x;}' \ @@ -108,4 +101,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gretl-gtk2/*.so @${RMDIR} ${STAGEDIR}${DATADIR}/doc -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/hipmcl/Makefile ============================================================================== --- head/math/hipmcl/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/hipmcl/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= HipMCL DISTVERSION= g20180814 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ @@ -13,8 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt LIB_DEPENDS= libCombBLAS.so:math/combblas \ - libmpi.so:net/mpich \ - libomp.so:devel/openmp + libmpi.so:net/mpich RUN_DEPENDS= ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so.1:lang/gcc${GCC_DEFAULT} # because of the link flags induced by mpich USES= cmake compiler:c++14-lang dos2unix localbase:ldflags Modified: head/math/libnormaliz/Makefile ============================================================================== --- head/math/libnormaliz/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/libnormaliz/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= libnormaliz DISTVERSIONPREFIX= v DISTVERSION= 3.8.4 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= salvadore@FreeBSD.org @@ -36,7 +37,6 @@ FLINT_DESC= Link with libflint.so FLINT_BUILD_DEPENDS= ${LOCALBASE}/lib/libflint.so:math/flint2 FLINT_CONFIGURE_WITH= flint FLINT_LDFLAGS= -lpthread -OPENMP_BUILD_DEPENDS= ${LOCALBASE}/lib/libomp.so:devel/openmp OPENMP_CONFIGURE_ENABLE= openmp do-install: Modified: head/math/libxsmm/Makefile ============================================================================== --- head/math/libxsmm/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/libxsmm/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= libxsmm DISTVERSION= 1.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math science MAINTAINER= yuri@FreeBSD.org @@ -15,7 +15,6 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= relies on hard-coded x86 code, and is only supported on 64-bit BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libomp.so:devel/openmp USES= fortran gmake localbase:ldflags python:build shebangfix SHEBANG_GLOB= *.sh Modified: head/math/lis/Makefile ============================================================================== --- head/math/lis/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/lis/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= lis DISTVERSION= 2.0.20 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://www.ssisc.org/lis/dl/ @@ -23,7 +24,6 @@ MPI_CONFIGURE_ENABLE= mpi MPI_LIB_DEPENDS= libmpi.so:net/mpich OPENMPI_CONFIGURE_ENABLE= omp -OPENMPI_LIB_DEPENDS= libomp.so:devel/openmp PORTEXAMPLES= * Modified: head/math/mkl-dnn/Makefile ============================================================================== --- head/math/mkl-dnn/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/mkl-dnn/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= mkl-dnn DISTVERSIONPREFIX= v DISTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= math # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -25,7 +26,6 @@ OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp OPENMP_BROKEN_OFF= still requires omp.h, see https://github.com/intel/mkl-dnn/issues/581 CXXFLAGS_amd64= -msse4.1 Modified: head/math/py-rpy2/Makefile ============================================================================== --- head/math/py-rpy2/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/py-rpy2/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -36,10 +36,4 @@ PLIST_FILES= ${PYTHON_SITELIBDIR}/__pycache__/_rinterf post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_rinterface_cffi_api.abi3.so -.include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/omp.h) -LIB_DEPENDS+= libomp.so:devel/openmp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/py-yt/Makefile ============================================================================== --- head/math/py-yt/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/py-yt/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= yt DISTVERSION= 3.5.1 +PORTREVISION= 1 CATEGORIES= math astro python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +15,6 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.txt BUILD_DEPENDS= ${PYNUMPY} -LIB_DEPENDS= libomp.so:devel/openmp RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=1.0:math/py-sympy@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/saga/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 7.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -56,10 +56,6 @@ OPENMP_DESC= Enable Multiprocessing (only amd64 and i3 VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp -OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm -# Use OpenMP from lang/llvm${LLVM_DEFAULT} -OPENMP_LDFLAGS+= -L${LOCALBASE}/llvm${LLVM_DEFAULT}/lib -lomp PGSQL_CONFIGURE_WITH= pg PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra Modified: head/math/timbl/Makefile ============================================================================== --- head/math/timbl/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/math/timbl/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -4,7 +4,7 @@ PORTNAME= timbl DISTVERSIONPREFIX= v DISTVERSION= 6.4.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -13,8 +13,7 @@ COMMENT= Tilburg Memory Based Learner LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libomp.so:devel/openmp \ - libticcutils.so:devel/ticcutils +LIB_DEPENDS= libticcutils.so:devel/ticcutils USES= autoreconf compiler:c++11-lang gmake gnome libtool \ pathfix pkgconfig Modified: head/misc/mxnet/Makefile ============================================================================== --- head/misc/mxnet/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/misc/mxnet/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,7 +3,7 @@ PORTNAME= mxnet DISTVERSION= 1.6.0 DISTVERSIONSUFFIX= .rc0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc # machine-learning PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -19,7 +19,6 @@ BUILD_DEPENDS= googletest>0:devel/googletest \ ${LOCALBASE}/include/dnnl.h:math/mkl-dnn LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ liblapack.so:math/lapack \ - libomp.so:devel/openmp \ libopenblas.so:math/openblas USES= cmake compiler:c++11-lang localbase:ldflags Modified: head/misc/opennn/Makefile ============================================================================== --- head/misc/opennn/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/misc/opennn/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= opennn DISTVERSION= 0.1-86 DISTVERSIONSUFFIX= -g449b346 +PORTREVISION= 1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -27,8 +28,6 @@ MPI_CMAKE_BOOL= __OPENNN_MPI__ MPI_BROKEN= https://github.com/Artelnics/OpenNN/issues/86 OPENMP_CMAKE_BOOL= __OPENNN_OMP__ -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp -OPENMP_USES= localbase:ldflags do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} && ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} Modified: head/misc/urh/Makefile ============================================================================== --- head/misc/urh/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/misc/urh/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= urh DISTVERSION= 2.8.3 +PORTREVISION= 1 CATEGORIES= misc hamradio python MASTER_SITES= CHEESESHOP @@ -11,7 +12,6 @@ COMMENT= Universal Radio Hacker: investigate wireless LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} -LIB_DEPENDS= libomp.so:devel/openmp RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} Modified: head/misc/xgboost/Makefile ============================================================================== --- head/misc/xgboost/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/misc/xgboost/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -25,8 +25,6 @@ LDFLAGS+= ${LOCALBASE}/lib/libdmlc.so -lexecinfo OPTIONS_DEFINE= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp -OPENMP_BROKEN= error: unsupported argument 'libomp -I/usr/local/include -L/usr/local/lib' to option 'fopenmp=' post-patch: # https://github.com/dmlc/rabit/issues/131 @${FIND} ${WRKSRC} -name "*.h" -o -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -i '' -e 's| _assert(| _xassert(|; s| _assert)| _xassert)|' Modified: head/multimedia/libopenshot/Makefile ============================================================================== --- head/multimedia/libopenshot/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/multimedia/libopenshot/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -50,8 +50,4 @@ IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Im LIBAV_DESC= ${FFMPEG_DESC:S/FFmpeg/Libav/} LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav -.if !exists(/usr/lib/libomp.so) -IGNORE= openmp of base system is required -.endif - .include <bsd.port.mk> Modified: head/net/aluminum/Makefile ============================================================================== --- head/net/aluminum/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/net/aluminum/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,6 +3,7 @@ PORTNAME= Aluminum DISTVERSIONPREFIX= v DISTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -18,14 +19,6 @@ USE_GITHUB= yes GH_ACCOUNT= LLNL USE_LDCONFIG= yes -CONFLICTS_BUILD= openmp # because OpenMP detection is broken in cmake even with port clang, see bug#234050 -LDFLAGS+= -lexecinfo \ - ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libomp.so # see above - -# OpenMP detection is broken with base clang, see bug#223678 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} +LDFLAGS+= -lexecinfo .include <bsd.port.mk> Modified: head/science/abinit/Makefile ============================================================================== --- head/science/abinit/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/science/abinit/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -3,7 +3,7 @@ PORTNAME= abinit DISTVERSION= 8.10.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MASTER_SITES= https://www.abinit.org/sites/default/files/packages/ @@ -34,7 +34,6 @@ OPTIONS_DEFAULT= OPENMP MPI OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -lomp -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp MPI_CONFIGURE_ENABLE= mpi MPI_VARS= FFLAGS+=-I${LOCALBASE}/include FCFLAGS+=-I${LOCALBASE}/include Modified: head/science/agrum/Makefile ============================================================================== --- head/science/agrum/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/science/agrum/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= agrum DISTVERSION= 0.16.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science math MAINTAINER= yuri@FreeBSD.org @@ -31,19 +31,9 @@ ODBC_USES= localbase:ldflags ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPENMP_CMAKE_BOOL= USE_OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/llvm${LLVM_DEFAULT} -OPENMP_LDFLAGS= ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libomp.so # XXX it still links to libomp.so from the openmp package when it is installed -OPENMP_CONFLICTS_BUILD= openmp PYTHON_CMAKE_BOOL= BUILD_PYTHON PYTHON_USES= python PYTHON_PLIST_SUB= PYTHON_VER_MAJ=${PYTHON_VER:R} - -# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -RUN_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} .include <bsd.port.mk> Modified: head/science/chrono/Makefile ============================================================================== --- head/science/chrono/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/science/chrono/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,6 +2,7 @@ PORTNAME= chrono DISTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= science devel PKGNAMESUFFIX= -physics-simulation-engine @@ -14,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= use of overloaded operator '[]' is ambiguous (with operand types 'chrono::quaternion' and 'int'): https://github.com/projectchrono/chrono/issues/158 BUILD_DEPENDS= openmpi>0:net/openmpi -LIB_DEPENDS= libomp.so:devel/openmp USES= cmake compiler:c++14-lang eigen:3 fortran USE_GITHUB= yes Modified: head/science/erkale/Makefile ============================================================================== --- head/science/erkale/Makefile Sun Mar 8 21:55:54 2020 (r528081) +++ head/science/erkale/Makefile Sun Mar 8 21:56:36 2020 (r528082) @@ -2,7 +2,7 @@ PORTNAME= erkale DISTVERSION= g20200110 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -44,7 +44,6 @@ CMAKE_OFF= USE_OPENMP .else # parallel CMAKE_ON+= USE_OPENMP SUFFIX= _omp -LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_DEFAULT} .endif OPTIONS_SINGLE= LINALG @@ -60,13 +59,6 @@ NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas OPENBLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblas OPENBLAS_LIB_DEPENDS= libopenblas.so:math/openblas - -# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 -# have the same compiler for both serial and parallel flavors so that performance numbers can be compared -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003082156.028LubKc046265>