Page MenuHomeFreeBSD
Files F161652046

D23020.diff
No OneTemporary
Actions

D23020.diff
View Options

Index: head/astro/siril/Makefile
===================================================================
--- head/astro/siril/Makefile
+++ head/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_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
Index: head/biology/abyss/Makefile
===================================================================
--- head/biology/abyss/Makefile
+++ head/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 @@
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
Index: head/biology/hhsuite/Makefile
===================================================================
--- head/biology/hhsuite/Makefile
+++ head/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_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
Index: head/biology/py-fastTSNE/Makefile
===================================================================
--- head/biology/py-fastTSNE/Makefile
+++ head/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 @@
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} \
Index: head/comms/wsjtx/Makefile
===================================================================
--- head/comms/wsjtx/Makefile
+++ head/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 @@
${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
Index: head/converters/pdf2djvu/Makefile
===================================================================
--- head/converters/pdf2djvu/Makefile
+++ head/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_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
Index: head/devel/R-cran-data.table/Makefile
===================================================================
--- head/devel/R-cran-data.table/Makefile
+++ head/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_DEFAULT= OPENMP
OPENMP_CONFIGURE_ENABLE= openmp
-OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
.include <bsd.port.mk>
Index: head/devel/dmlc-core/Makefile
===================================================================
--- head/devel/dmlc-core/Makefile
+++ head/devel/dmlc-core/Makefile
@@ -18,11 +18,4 @@
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>
Index: head/devel/py-numba/Makefile
===================================================================
--- head/devel/py-numba/Makefile
+++ head/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_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} \
Index: head/finance/quantlib/Makefile
===================================================================
--- head/finance/quantlib/Makefile
+++ head/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}
@@ -48,16 +49,6 @@
.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
Index: head/graphics/blender/Makefile
===================================================================
--- head/graphics/blender/Makefile
+++ head/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_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
Index: head/graphics/darktable/Makefile
===================================================================
--- head/graphics/darktable/Makefile
+++ head/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/}/
@@ -102,18 +102,6 @@
.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)
Index: head/graphics/ebsynth/Makefile
===================================================================
--- head/graphics/ebsynth/Makefile
+++ head/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 @@
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
Index: head/graphics/gmic/Makefile
===================================================================
--- head/graphics/gmic/Makefile
+++ head/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_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>
Index: head/graphics/gthumb/Makefile
===================================================================
--- head/graphics/gthumb/Makefile
+++ head/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 @@
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
Index: head/graphics/lightzone/Makefile
===================================================================
--- head/graphics/lightzone/Makefile
+++ head/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 @@
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
Index: head/graphics/mandelbulber/Makefile
===================================================================
--- head/graphics/mandelbulber/Makefile
+++ head/graphics/mandelbulber/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mandelbulber
DISTVERSION= 2.20
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= amdmi3@FreeBSD.org
@@ -36,8 +37,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||' \
Index: head/graphics/pcl-pointclouds/Makefile
===================================================================
--- head/graphics/pcl-pointclouds/Makefile
+++ head/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 @@
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_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'
Index: head/graphics/photoflare/Makefile
===================================================================
--- head/graphics/photoflare/Makefile
+++ head/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 @@
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_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>
Index: head/graphics/rawtherapee/Makefile
===================================================================
--- head/graphics/rawtherapee/Makefile
+++ head/graphics/rawtherapee/Makefile
@@ -126,9 +126,6 @@
.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
Index: head/graphics/tesseract/Makefile
===================================================================
--- head/graphics/tesseract/Makefile
+++ head/graphics/tesseract/Makefile
@@ -49,12 +49,6 @@
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-TOOLS-on:
@cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/math/R-cran-gower/Makefile
===================================================================
--- head/math/R-cran-gower/Makefile
+++ head/math/R-cran-gower/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gower
DISTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -15,7 +16,5 @@
OPTIONS_DEFINE= OPENMP
OPTIONS_DEFAULT= OPENMP
-
-OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
.include <bsd.port.mk>
Index: head/math/ambit/Makefile
===================================================================
--- head/math/ambit/Makefile
+++ head/math/ambit/Makefile
@@ -14,7 +14,6 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libhdf5.so:science/hdf5 \
- libomp.so:devel/openmp \
libopenblas.so:math/openblas \
libsz.so:science/szip
Index: head/math/blaze/Makefile
===================================================================
--- head/math/blaze/Makefile
+++ head/math/blaze/Makefile
@@ -13,11 +13,9 @@
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
Index: head/math/blazeiterative/Makefile
===================================================================
--- head/math/blazeiterative/Makefile
+++ head/math/blazeiterative/Makefile
@@ -12,8 +12,7 @@
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
Index: head/math/combblas/Makefile
===================================================================
--- head/math/combblas/Makefile
+++ head/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 @@
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
Index: head/math/csdp/Makefile
===================================================================
--- head/math/csdp/Makefile
+++ head/math/csdp/Makefile
@@ -31,14 +31,7 @@
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>
Index: head/math/darknet/Makefile
===================================================================
--- head/math/darknet/Makefile
+++ head/math/darknet/Makefile
@@ -4,6 +4,7 @@
DISTVERSIONPREFIX= darknet_yolo_v
DISTVERSION= 3-446
DISTVERSIONSUFFIX= -gf2fc239
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math # machine-learning
@@ -12,8 +13,6 @@
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/LICENSE
-
-LIB_DEPENDS= libomp.so:devel/openmp
USES= cmake compiler:c11
USE_GITHUB= yes
Index: head/math/dbcsr/Makefile
===================================================================
--- head/math/dbcsr/Makefile
+++ head/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_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
Index: head/math/ensmallen/Makefile
===================================================================
--- head/math/ensmallen/Makefile
+++ head/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 @@
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
Index: head/math/gretl/Makefile
===================================================================
--- head/math/gretl/Makefile
+++ head/math/gretl/Makefile
@@ -85,13 +85,6 @@
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 @@
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gretl-gtk2/*.so
@${RMDIR} ${STAGEDIR}${DATADIR}/doc
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/math/hipmcl/Makefile
===================================================================
--- head/math/hipmcl/Makefile
+++ head/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_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
Index: head/math/libnormaliz/Makefile
===================================================================
--- head/math/libnormaliz/Makefile
+++ head/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_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:
Index: head/math/libxsmm/Makefile
===================================================================
--- head/math/libxsmm/Makefile
+++ head/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_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
Index: head/math/lis/Makefile
===================================================================
--- head/math/lis/Makefile
+++ head/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_LIB_DEPENDS= libmpi.so:net/mpich
OPENMPI_CONFIGURE_ENABLE= omp
-OPENMPI_LIB_DEPENDS= libomp.so:devel/openmp
PORTEXAMPLES= *
Index: head/math/mkl-dnn/Makefile
===================================================================
--- head/math/mkl-dnn/Makefile
+++ head/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_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
Index: head/math/py-rpy2/Makefile
===================================================================
--- head/math/py-rpy2/Makefile
+++ head/math/py-rpy2/Makefile
@@ -36,10 +36,4 @@
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>
Index: head/math/py-yt/Makefile
===================================================================
--- head/math/py-yt/Makefile
+++ head/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_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} \
Index: head/math/saga/Makefile
===================================================================
--- head/math/saga/Makefile
+++ head/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 @@
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
Index: head/math/timbl/Makefile
===================================================================
--- head/math/timbl/Makefile
+++ head/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 @@
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
Index: head/misc/mxnet/Makefile
===================================================================
--- head/misc/mxnet/Makefile
+++ head/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 @@
${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
Index: head/misc/opennn/Makefile
===================================================================
--- head/misc/opennn/Makefile
+++ head/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_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}
Index: head/misc/urh/Makefile
===================================================================
--- head/misc/urh/Makefile
+++ head/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 @@
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}
Index: head/misc/xgboost/Makefile
===================================================================
--- head/misc/xgboost/Makefile
+++ head/misc/xgboost/Makefile
@@ -25,8 +25,6 @@
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)|'
Index: head/multimedia/libopenshot/Makefile
===================================================================
--- head/multimedia/libopenshot/Makefile
+++ head/multimedia/libopenshot/Makefile
@@ -50,8 +50,4 @@
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>
Index: head/net/aluminum/Makefile
===================================================================
--- head/net/aluminum/Makefile
+++ head/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 @@
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>
Index: head/science/abinit/Makefile
===================================================================
--- head/science/abinit/Makefile
+++ head/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 @@
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
Index: head/science/agrum/Makefile
===================================================================
--- head/science/agrum/Makefile
+++ head/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_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>
Index: head/science/chrono/Makefile
===================================================================
--- head/science/chrono/Makefile
+++ head/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 @@
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
Index: head/science/erkale/Makefile
===================================================================
--- head/science/erkale/Makefile
+++ head/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 @@
.else # parallel
CMAKE_ON+= USE_OPENMP
SUFFIX= _omp
-LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_DEFAULT}
.endif
OPTIONS_SINGLE= LINALG
@@ -60,13 +59,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:
Index: head/science/gabedit/Makefile
===================================================================
--- head/science/gabedit/Makefile
+++ head/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}
@@ -40,8 +40,6 @@
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
Index: head/science/gromacs/Makefile
===================================================================
--- head/science/gromacs/Makefile
+++ head/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 @@
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"
Index: head/science/lammps/Makefile
===================================================================
--- head/science/lammps/Makefile
+++ head/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 @@
.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:
Index: head/science/latte/Makefile
===================================================================
--- head/science/latte/Makefile
+++ head/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_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
Index: head/science/nest/Makefile
===================================================================
--- head/science/nest/Makefile
+++ head/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 @@
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
Index: head/science/openmx/Makefile
===================================================================
--- head/science/openmx/Makefile
+++ head/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 @@
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
Index: head/science/openmx/files/patch-makefile
===================================================================
--- head/science/openmx/files/patch-makefile
+++ head/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
Index: head/science/py-GPy/Makefile
===================================================================
--- head/science/py-GPy/Makefile
+++ head/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 @@
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
Index: head/science/py-PyFR/Makefile
===================================================================
--- head/science/py-PyFR/Makefile
+++ head/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 @@
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
Index: head/science/py-phono3py/Makefile
===================================================================
--- head/science/py-phono3py/Makefile
+++ head/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 @@
${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
Index: head/science/py-scikit-learn/Makefile
===================================================================
--- head/science/py-scikit-learn/Makefile
+++ head/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 @@
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
Index: head/science/qmcpack/Makefile
===================================================================
--- head/science/qmcpack/Makefile
+++ head/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 @@
libfftw3.so:math/fftw3 \
libhdf5.so:science/hdf5 \
libmpich.so:net/mpich \
- libomp.so:devel/openmp \
libopenblas.so:math/openblas \
libsz.so:science/szip
Index: head/textproc/libfolia/Makefile
===================================================================
--- head/textproc/libfolia/Makefile
+++ head/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 @@
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
Index: head/textproc/ucto/Makefile
===================================================================
--- head/textproc/ucto/Makefile
+++ head/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 @@
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

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 6, 3:14 PM (14 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34760424
Default Alt Text
D23020.diff (41 KB)

Event Timeline