diff options
64 files changed, 83 insertions, 226 deletions
diff --git a/astro/siril/Makefile b/astro/siril/Makefile index 7949164b2ca7..63112d3850ed 100644 --- a/astro/siril/Makefile +++ b/astro/siril/Makefile @@ -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 diff --git a/biology/abyss/Makefile b/biology/abyss/Makefile index aeb44e6bb3e8..5e23d28105b2 100644 --- a/biology/abyss/Makefile +++ b/biology/abyss/Makefile @@ -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:devel/boost-libs \ 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 diff --git a/biology/hhsuite/Makefile b/biology/hhsuite/Makefile index e2893c58d65f..1130bb4ced3c 100644 --- a/biology/hhsuite/Makefile +++ b/biology/hhsuite/Makefile @@ -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 diff --git a/biology/py-fastTSNE/Makefile b/biology/py-fastTSNE/Makefile index 8ba0ef155b22..1cb3bb986913 100644 --- a/biology/py-fastTSNE/Makefile +++ b/biology/py-fastTSNE/Makefile @@ -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} \ diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index 42d9bf1d8da7..4aa89ffcb526 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -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-asciidoctor \ ${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 diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 67cd3aff642a..94af2e1773ac 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -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 diff --git a/devel/R-cran-data.table/Makefile b/devel/R-cran-data.table/Makefile index 7ed486a353f7..f259190aba62 100644 --- a/devel/R-cran-data.table/Makefile +++ b/devel/R-cran-data.table/Makefile @@ -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> diff --git a/devel/dmlc-core/Makefile b/devel/dmlc-core/Makefile index 8393eb3f301f..476b3d952791 100644 --- a/devel/dmlc-core/Makefile +++ b/devel/dmlc-core/Makefile @@ -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> diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile index a4637feabfef..9179994e3205 100644 --- a/devel/py-numba/Makefile +++ b/devel/py-numba/Makefile @@ -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} \ diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile index dd06f470b46e..447413529bd4 100644 --- a/finance/quantlib/Makefile +++ b/finance/quantlib/Makefile @@ -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} @@ -49,16 +50,6 @@ CONFIGURE_ARGS+= --with-boost-lib=${LOCALBASE}/lib $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 .include <bsd.port.mk> diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 83573531c22d..7188290923c8 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -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 diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index c4ed03deb63e..c0514c33a119 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -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/}/ @@ -104,18 +104,6 @@ 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) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= diff --git a/graphics/ebsynth/Makefile b/graphics/ebsynth/Makefile index ba624e954171..d46d9c682899 100644 --- a/graphics/ebsynth/Makefile +++ b/graphics/ebsynth/Makefile @@ -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 Transfer 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 diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile index d5c44e1d1cf4..0dd7e9806257 100644 --- a/graphics/gmic/Makefile +++ b/graphics/gmic/Makefile @@ -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> diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index 13ce5935cccc..4df093fe28a6 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -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 diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile index e7099d125097..6085c8b6ad4b 100644 --- a/graphics/lightzone/Makefile +++ b/graphics/lightzone/Makefile @@ -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 diff --git a/graphics/mandelbulber/Makefile b/graphics/mandelbulber/Makefile index 312f99219fb1..ebbbefe91a84 100644 --- a/graphics/mandelbulber/Makefile +++ b/graphics/mandelbulber/Makefile @@ -3,6 +3,7 @@ PORTNAME= mandelbulber DISTVERSION= 2.20 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org @@ -37,8 +38,6 @@ 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||' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile index 34b9381254a2..28eb894efa7a 100644 --- a/graphics/pcl-pointclouds/Makefile +++ b/graphics/pcl-pointclouds/Makefile @@ -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 @@ -59,17 +60,6 @@ VTK_BROKEN= VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/i .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' diff --git a/graphics/photoflare/Makefile b/graphics/photoflare/Makefile index de5196f7db26..b6826b1bb3b1 100644 --- a/graphics/photoflare/Makefile +++ b/graphics/photoflare/Makefile @@ -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 image editor 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 buildtools_build linguisttools_bu 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> diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 62fb40baa0e8..a325bd1e9391 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -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 diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index ff9570c43aac..f8a73cc57bf0 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -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> diff --git a/math/R-cran-gower/Makefile b/math/R-cran-gower/Makefile index 706dd6417c41..368e11392300 100644 --- a/math/R-cran-gower/Makefile +++ b/math/R-cran-gower/Makefile @@ -3,6 +3,7 @@ PORTNAME= gower DISTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -16,6 +17,4 @@ USES= cran:auto-plist,compiles OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp - .include <bsd.port.mk> diff --git a/math/ambit/Makefile b/math/ambit/Makefile index f3baeefe8492..d5418bf87e2e 100644 --- a/math/ambit/Makefile +++ b/math/ambit/Makefile @@ -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 diff --git a/math/blaze/Makefile b/math/blaze/Makefile index e301b3494895..03c7bab48960 100644 --- a/math/blaze/Makefile +++ b/math/blaze/Makefile @@ -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 diff --git a/math/blazeiterative/Makefile b/math/blazeiterative/Makefile index 51fa98074fdc..36c5c732c621 100644 --- a/math/blazeiterative/Makefile +++ b/math/blazeiterative/Makefile @@ -12,8 +12,7 @@ COMMENT= Set of iterative linear system solvers for use with the Blaze library 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 diff --git a/math/combblas/Makefile b/math/combblas/Makefile index f740568c65f4..1374565d73f4 100644 --- a/math/combblas/Makefile +++ b/math/combblas/Makefile @@ -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 parallel graph library 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 diff --git a/math/csdp/Makefile b/math/csdp/Makefile index 94febd00a813..10116127e60d 100644 --- a/math/csdp/Makefile +++ b/math/csdp/Makefile @@ -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> diff --git a/math/darknet/Makefile b/math/darknet/Makefile index 68851bc3e83c..8c5fd617a17e 100644 --- a/math/darknet/Makefile +++ b/math/darknet/Makefile @@ -4,6 +4,7 @@ PORTNAME= darknet DISTVERSIONPREFIX= darknet_yolo_v DISTVERSION= 3-446 DISTVERSIONSUFFIX= -gf2fc239 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math # machine-learning @@ -13,8 +14,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 GH_ACCOUNT= AlexeyAB diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile index ba7e0d40f671..976e2caecb35 100644 --- a/math/dbcsr/Makefile +++ b/math/dbcsr/Makefile @@ -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 diff --git a/math/ensmallen/Makefile b/math/ensmallen/Makefile index 5c5de7110bdb..f66399e0dcc7 100644 --- a/math/ensmallen/Makefile +++ b/math/ensmallen/Makefile @@ -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 mathematical optimization 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 diff --git a/math/gretl/Makefile b/math/gretl/Makefile index ecdcd2c16d5a..51ce97d504cd 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -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> diff --git a/math/hipmcl/Makefile b/math/hipmcl/Makefile index ea93e9ff1eeb..78a2c55e64af 100644 --- a/math/hipmcl/Makefile +++ b/math/hipmcl/Makefile @@ -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 diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile index 10a460c9ea16..1a5ac8da60dc 100644 --- a/math/libnormaliz/Makefile +++ b/math/libnormaliz/Makefile @@ -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: diff --git a/math/libxsmm/Makefile b/math/libxsmm/Makefile index c830684725b1..c92fefe71b37 100644 --- a/math/libxsmm/Makefile +++ b/math/libxsmm/Makefile @@ -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 diff --git a/math/lis/Makefile b/math/lis/Makefile index baaabe8bef7b..981ba968541f 100644 --- a/math/lis/Makefile +++ b/math/lis/Makefile @@ -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= * diff --git a/math/mkl-dnn/Makefile b/math/mkl-dnn/Makefile index b0ed69236ded..9c5a36cd4f34 100644 --- a/math/mkl-dnn/Makefile +++ b/math/mkl-dnn/Makefile @@ -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 diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile index 55731ea92065..9457bb9893e9 100644 --- a/math/py-rpy2/Makefile +++ b/math/py-rpy2/Makefile @@ -36,10 +36,4 @@ PLIST_FILES= ${PYTHON_SITELIBDIR}/__pycache__/_rinterface_cffi_abi.cpython-${PYT 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> diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile index b4395ef6a827..74048bc18898 100644 --- a/math/py-yt/Makefile +++ b/math/py-yt/Makefile @@ -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} \ diff --git a/math/saga/Makefile b/math/saga/Makefile index 4193a028d12e..5cd5c3ce1ed5 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -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 i386) 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 diff --git a/math/timbl/Makefile b/math/timbl/Makefile index 638cdc9e7f0f..7fc1a82188e0 100644 --- a/math/timbl/Makefile +++ b/math/timbl/Makefile @@ -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 diff --git a/misc/mxnet/Makefile b/misc/mxnet/Makefile index 17b9758862b1..52a7ee823ddf 100644 --- a/misc/mxnet/Makefile +++ b/misc/mxnet/Makefile @@ -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 diff --git a/misc/opennn/Makefile b/misc/opennn/Makefile index 934ec27ed42a..f5754154cf89 100644 --- a/misc/opennn/Makefile +++ b/misc/opennn/Makefile @@ -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} diff --git a/misc/urh/Makefile b/misc/urh/Makefile index be21874981c2..bdd43bc66648 100644 --- a/misc/urh/Makefile +++ b/misc/urh/Makefile @@ -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 protocols like a boss 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} diff --git a/misc/xgboost/Makefile b/misc/xgboost/Makefile index 7ab425b5c8e3..b1e193f0947a 100644 --- a/misc/xgboost/Makefile +++ b/misc/xgboost/Makefile @@ -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)|' diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index 3cfcea1b4f19..e1059fd3c2bd 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -50,8 +50,4 @@ IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO 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> diff --git a/net/aluminum/Makefile b/net/aluminum/Makefile index 86ec8cdb5636..b7e40f7e3245 100644 --- a/net/aluminum/Makefile +++ b/net/aluminum/Makefile @@ -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> diff --git a/science/abinit/Makefile b/science/abinit/Makefile index 814e48f9d286..cbdcf3ff9b6f 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -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 diff --git a/science/agrum/Makefile b/science/agrum/Makefile index dfee58e62136..c764fc646dc4 100644 --- a/science/agrum/Makefile +++ b/science/agrum/Makefile @@ -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> diff --git a/science/chrono/Makefile b/science/chrono/Makefile index 7c668577a899..6a41074dd738 100644 --- a/science/chrono/Makefile +++ b/science/chrono/Makefile @@ -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 diff --git a/science/erkale/Makefile b/science/erkale/Makefile index 85e62897f858..a868cbbe10c1 100644 --- a/science/erkale/Makefile +++ b/science/erkale/Makefile @@ -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 @@ -61,13 +60,6 @@ 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} - .if ${FLAVOR} == parallel post-install: @${MV} ${STAGEDIR}${PREFIX}/include/erkale ${STAGEDIR}${PREFIX}/include/erkale${SUFFIX} diff --git a/science/gabedit/Makefile b/science/gabedit/Makefile index 042b0dd596f3..ac2ccb3a155f 100644 --- a/science/gabedit/Makefile +++ b/science/gabedit/Makefile @@ -2,7 +2,7 @@ PORTNAME= gabedit DISTVERSION= 2.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science #MASTER_SITES= http://prdownloads.sourceforge.net/${PORTNAME}/ # old SF-based source #DISTNAME= GabeditSrc${DISTVERSION:S/.//g} @@ -41,8 +41,6 @@ PLIST_FILES+= share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP -OPENMP_LIB_DEPENDS= libgomp.so:devel/openmp - post-patch: @${REINPLACE_CMD} 's|/usr/|${PREFIX}/|; s| -O2| ${CFLAGS}|; s|gcc|${CC}|' ${WRKSRC}/CONFIG diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index dc75b92b7a56..21e8f29fb53d 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -3,6 +3,7 @@ PORTNAME= gromacs DISTVERSION= 2020.1 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ @@ -53,7 +54,6 @@ OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENMP_CMAKE_ON= -DGMX_CXX11:BOOL=OFF OPENMP_CMAKE_OFF= -DGMX_OPENMP:BOOL=OFF -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp SIMD_CMAKE_OFF= -DGMX_SIMD:STRING="None" diff --git a/science/lammps/Makefile b/science/lammps/Makefile index 312e73f5e79c..0eef1956085a 100644 --- a/science/lammps/Makefile +++ b/science/lammps/Makefile @@ -2,6 +2,7 @@ PORTNAME= lammps PORTVERSION= ${GH_TAGNAME:C/(stable|patch)_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\4.\3.\2/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/} +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -61,9 +62,7 @@ PORTSCOUT= ignore:1 # due to a special version tagging scheme that this project .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENMP} -USES+= localbase CMAKE_ARGS+= -DBUILD_OMP:BOOL=true -LIB_DEPENDS+= libomp.so:devel/openmp .endif post-patch: diff --git a/science/latte/Makefile b/science/latte/Makefile index 75445cc95e69..2d7d60fb758c 100644 --- a/science/latte/Makefile +++ b/science/latte/Makefile @@ -3,7 +3,7 @@ PORTNAME= latte DISTVERSIONPREFIX= v DISTVERSION= 1.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -32,7 +32,6 @@ DBCSR_LIB_DEPENDS= libdbcsr.so:math/dbcsr DBCSR_BROKEN= see https://github.com/lanl/LATTE/issues/92 OPENMP_CMAKE_BOOL= OPENMP -OPENMP_LIB_DEPENDS= libomp.so:devel/openmp MPI_CMAKE_BOOL= DO_MPI MPI_LIB_DEPENDS= libmpi.so:net/openmpi diff --git a/science/nest/Makefile b/science/nest/Makefile index e9f27f1138de..9977278e18f5 100644 --- a/science/nest/Makefile +++ b/science/nest/Makefile @@ -3,6 +3,7 @@ PORTNAME= nest DISTVERSIONPREFIX= v DISTVERSION= 2.20.0 +PORTREVISION= 1 CATEGORIES= science biology # NEST is used in neuroscience MAINTAINER= yuri@FreeBSD.org @@ -14,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= https://github.com/nest/nest-simulator/issues/1205 LIB_DEPENDS= libgsl.so:math/gsl \ - libltdl.so:devel/libltdl \ - libomp.so:devel/openmp + libltdl.so:devel/libltdl USES= cmake compiler:c++11-lang ncurses pkgconfig readline USE_GITHUB= yes diff --git a/science/openmx/Makefile b/science/openmx/Makefile index 713c7a5232c7..612806700547 100644 --- a/science/openmx/Makefile +++ b/science/openmx/Makefile @@ -2,7 +2,7 @@ PORTNAME= openmx DISTVERSION= 3.8.5 # the 18June12 patch upgrades 3.8 -> 3.8.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science MASTER_SITES= http://www.openmx-square.org/ \ http://www.openmx-square.org/bugfixed/18June12/:patch @@ -23,8 +23,7 @@ BROKEN_i386= undefined reference to `__atomic_load', see bug#229605 and https:// LIB_DEPENDS= libblas.so:math/blas \ libfftw3.so:math/fftw3 \ liblapack.so:math/lapack \ - libmpich.so:net/mpich \ - libiomp5.so:devel/openmp + libmpich.so:net/mpich USES= dos2unix fortran gmake localbase:ldflags DOS2UNIX_FILES= openmx_common.h diff --git a/science/openmx/files/patch-makefile b/science/openmx/files/patch-makefile index f70af174a079..2a21aa3db1fe 100644 --- a/science/openmx/files/patch-makefile +++ b/science/openmx/files/patch-makefile @@ -9,7 +9,7 @@ -LIB= -L/opt/intel/mkl/lib -mkl=parallel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread -lifcore -lmpi -lmpi_f90 -lmpi_f77 +CC = mpicc $(CFLAGS) -fopenmp +FC = mpif90 $(FFLAGS) -fopenmp -+LIB= $(LDFLAGS) -lpthread -llapack -lblas -lgfortran -lfftw3 -liomp5 ++LIB= $(LDFLAGS) -lpthread -llapack -lblas -lgfortran -lfftw3 -lomp diff --git a/science/py-GPy/Makefile b/science/py-GPy/Makefile index 495ed6b30704..ab5a4ed4e664 100644 --- a/science/py-GPy/Makefile +++ b/science/py-GPy/Makefile @@ -2,6 +2,7 @@ PORTNAME= GPy DISTVERSION= 1.9.9 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,13 +16,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/lib/libomp.so:devel/openmp +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.16:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}paramz>=0.9.0:science/py-paramz@${PY_FLAVOR} \ - ${LOCALBASE}/lib/libomp.so:devel/openmp + ${PYTHON_PKGNAMEPREFIX}paramz>=0.9.0:science/py-paramz@${PY_FLAVOR} USES= localbase python:-3.6 USE_PYTHON= distutils autoplist diff --git a/science/py-PyFR/Makefile b/science/py-PyFR/Makefile index e0c3485d17fb..b9ef83a085cd 100644 --- a/science/py-PyFR/Makefile +++ b/science/py-PyFR/Makefile @@ -2,6 +2,7 @@ PORTNAME= PyFR DISTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= http://www.pyfr.org/download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,8 +33,7 @@ PARALLEL_DESC= Parallelization backends to install OPENCL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${PY_FLAVOR} \ clblas>0:math/clblas -OPENMP_RUN_DEPENDS= openmp>0:devel/openmp \ - libxsmm>0:math/libxsmm +OPENMP_RUN_DEPENDS= libxsmm>0:math/libxsmm pre-build: # patch in pre-build to make the patch less error-prone (it has %%LOCALBASE%%) @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/pyfr/backends/openmp/compiler.py diff --git a/science/py-phono3py/Makefile b/science/py-phono3py/Makefile index febec89d1ff7..d126cd5a4d58 100644 --- a/science/py-phono3py/Makefile +++ b/science/py-phono3py/Makefile @@ -2,7 +2,7 @@ PORTNAME= phono3py DISTVERSION= 1.13.3.27 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,14 +18,12 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonopy>=1.13.2:science/py-phonopy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${LOCALBASE}/include/lapacke.h:math/lapacke \ - openmp>0:devel/openmp + ${LOCALBASE}/include/lapacke.h:math/lapacke RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonopy>=1.13.2:science/py-phonopy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - openmp>0:devel/openmp + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} USES= blaslapack:openblas localbase python USE_PYTHON= distutils cython autoplist diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile index 3ca67b3e8611..73d7c1d636ef 100644 --- a/science/py-scikit-learn/Makefile +++ b/science/py-scikit-learn/Makefile @@ -3,6 +3,7 @@ PORTNAME= scikit-learn DISTVERSION= 0.22 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}joblib>=0.11.0:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.17.0:science/py-scipy@${PY_FLAVOR} -LIB_DEPENDS= libomp.so:devel/openmp RUN_DEPENDS:= ${BUILD_DEPENDS} USES= fortran python:3.5+ localbase diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile index 7fee8b9da918..3add2774d0b5 100644 --- a/science/qmcpack/Makefile +++ b/science/qmcpack/Makefile @@ -3,7 +3,7 @@ PORTNAME= qmcpack DISTVERSIONPREFIX= v DISTVERSION= 3.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -18,7 +18,6 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfftw3.so:math/fftw3 \ libhdf5.so:science/hdf5 \ libmpich.so:net/mpich \ - libomp.so:devel/openmp \ libopenblas.so:math/openblas \ libsz.so:science/szip diff --git a/textproc/libfolia/Makefile b/textproc/libfolia/Makefile index 54c4c1628edf..d972f8ae64df 100644 --- a/textproc/libfolia/Makefile +++ b/textproc/libfolia/Makefile @@ -3,7 +3,7 @@ PORTNAME= libfolia DISTVERSIONPREFIX= v DISTVERSION= 1.15 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive LIB_DEPENDS= libicui18n.so:devel/icu \ - libomp.so:devel/openmp \ libticcutils.so:devel/ticcutils USES= autoreconf compiler:c++11-lang gmake gnome libtool pkgconfig diff --git a/textproc/ucto/Makefile b/textproc/ucto/Makefile index 1c138dea395e..a61416fd4c67 100644 --- a/textproc/ucto/Makefile +++ b/textproc/ucto/Makefile @@ -3,7 +3,7 @@ PORTNAME= ucto DISTVERSIONPREFIX= v DISTVERSION= 0.14.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org @@ -17,7 +17,6 @@ BUILD_DEPENDS= autoconf-archive>0:devel/autoconf-archive \ LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat \ libfolia.so:textproc/libfolia \ libicuio.so:devel/icu \ - libomp.so:devel/openmp \ libticcutils.so:devel/ticcutils RUN_DEPENDS= uctodata>0:textproc/uctodata |