Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 May 2023 17:31:51 GMT
From:      Rainer Hurling <rhurlin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 244238e1a8dc - main - science/mpb: Additions and improvements
Message-ID:  <202305141731.34EHVphu082283@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=244238e1a8dc327a72c6f62f8055c3044dbb7442

commit 244238e1a8dc327a72c6f62f8055c3044dbb7442
Author:     Yuri Victorovich <yuri@freebsd.org>
AuthorDate: 2023-05-14 16:51:02 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2023-05-14 17:29:44 +0000

    science/mpb: Additions and improvements
    
    - Add shared library
    - Remove NLOPT option
    - Add test target
    - Pet portlint
    
    Contrary to the patch from the PR, USE_GCC=yes is kept, otherwise errors under CURRENT (with LLVM15).
    
    Co-authored-by: Rainer Hurling <rhurlin@FreeBSD.org>
    PR:             270105
---
 science/mpb/Makefile  | 22 +++++++++++++---------
 science/mpb/pkg-plist |  3 +++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 8b5c40079d91..d60348746508 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mpb
 DISTVERSION=	1.11.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	https://github.com/NanoComp/mpb/releases/download/v${DISTVERSION}/
 
@@ -11,34 +11,38 @@ WWW=		https://mpb.readthedocs.io/en/latest/
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:shells/bash
+# NLOPT should be enabled in science/libctl
 LIB_DEPENDS=	libctl.so:science/libctl \
 		libfftw3.so:math/fftw3 \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libguile-2.2.so:lang/guile2 \
-		libhdf5.so:science/hdf5
+		libhdf5.so:science/hdf5 \
+		libnlopt.so:math/nlopt
 
 USES=		fortran libtool pkgconfig readline
-GNU_CONFIGURE=	yes
 USE_GCC=	yes
+USE_LDCONFIG=	yes
 # Do not use --with-mpi, because it is not guaranted
 # that science/hdf5 also built with option PARALLEL
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared
 
 MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		ATLAS NLOPT OPENMP
-OPTIONS_DEFAULT=	NLOPT
+OPTIONS_DEFINE=		ATLAS OPENMP
 
 ATLAS_DESC=	Use math/atlas instead of math/openblas
-NLOPT_DESC=	Use math/nlopt (enable also in science/libctl)
 OPENMP_DESC=	Use OpenMP (enable also in math/fftw3)
 
 ATLAS_LIB_DEPENDS=	libatlas.so:math/atlas
 ATLAS_USES_OFF=		blaslapack:openblas
 ATLAS_CONFIGURE_ON=	--with-lapack=-lalapack
 ATLAS_CONFIGURE_OFF=	--with-blas=openblas --with-lapack=-lopenblas
-NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 OPENMP_CONFIGURE_ON=	--with-openmp
 
 post-install:
diff --git a/science/mpb/pkg-plist b/science/mpb/pkg-plist
index e878bec9ee8a..1eb019c61ec7 100644
--- a/science/mpb/pkg-plist
+++ b/science/mpb/pkg-plist
@@ -8,6 +8,9 @@ include/mpb/maxwell.h
 include/mpb/scalar.h
 include/mpb/verbosity.h
 lib/libmpb.a
+lib/libmpb.so
+lib/libmpb.so.1
+lib/libmpb.so.1.4.1
 man/man1/mpb-data.1.gz
 man/man1/mpb-split.1.gz
 man/man1/mpb.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305141731.34EHVphu082283>