Index: science/mpb/Makefile =================================================================== --- science/mpb/Makefile +++ science/mpb/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= mpb -PORTVERSION= 1.5 -PORTREVISION= 15 +DISTVERSION= 1.11.1 CATEGORIES= science -MASTER_SITES= http://ab-initio.mit.edu/mpb/ +MASTER_SITES= https://github.com/NanoComp/mpb/releases/download/v${DISTVERSION}/ MAINTAINER= rhurlin@FreeBSD.org COMMENT= MIT Photonic-Bands @@ -13,41 +12,39 @@ LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libfftw.so:math/fftw \ - libhdf5.so:science/hdf5 \ - libctl.so:science/libctl \ - libguile-2.2.so:lang/guile2 +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 -OPTIONS_DEFINE= ATLAS NLOPT -ATLAS_DESC= Use math/atlas instead of math/lapack -NLOPT_DESC= Use math/nlopt (check also in science/libctl) - -USES= fortran libtool pkgconfig +USES= fortran libtool pkgconfig readline GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes - +USE_GCC= 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 -NLOPT_LIB_DEPENDS= libnlopt.so:math/nlopt +MAKE_JOBS_UNSAFE= yes -.include +OPTIONS_DEFINE= ATLAS NLOPT OPENMP +OPTIONS_DEFAULT= NLOPT -.if ${PORT_OPTIONS:MATLAS} -LIB_DEPENDS+= libatlas.so:math/atlas -CONFIGURE_ARGS+= --with-lapack=-lalapack -.else -LIB_DEPENDS+= libblas.so:math/blas \ - liblapack.so:math/lapack -CONFIGURE_ARGS+= --with-lapack=-llapack -.endif +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) -post-patch: - @${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 -lpthread |g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} \ - -e '/INSTALL/s/$$(prefix)/$$(DESTDIR)$$(prefix)/' \ - -e '/INSTALL/s/$$(mandir)/$$(DESTDIR)$$(mandir)/' \ - ${WRKSRC}/mpb/Makefile.in ${WRKSRC}/utils/Makefile.in +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: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && \ + ${COPYTREE_SHARE} "*.ctl *.scm" ${STAGEDIR}${EXAMPLESDIR}) .include Index: science/mpb/distinfo =================================================================== --- science/mpb/distinfo +++ science/mpb/distinfo @@ -1,2 +1,3 @@ -SHA256 (mpb-1.5.tar.gz) = 3deafe79185eb9eb8a8fe97d9fe51624221f51c1cf4baff4b4a7242c51130bd7 -SIZE (mpb-1.5.tar.gz) = 1056327 +TIMESTAMP = 1603732678 +SHA256 (mpb-1.11.1.tar.gz) = dc55b081c56079727dac92d309f8e4ea84ca6eea9122ec24b7955f8c258608e1 +SIZE (mpb-1.11.1.tar.gz) = 636154 Index: science/mpb/pkg-descr =================================================================== --- science/mpb/pkg-descr +++ science/mpb/pkg-descr @@ -11,4 +11,4 @@ (For example, it can solve for the modes of waveguides with arbitrary cross- sections.) -WWW: http://ab-initio.mit.edu/mpb/ +WWW: https://mpb.readthedocs.io/en/latest/ Index: science/mpb/pkg-plist =================================================================== --- science/mpb/pkg-plist +++ science/mpb/pkg-plist @@ -6,8 +6,23 @@ include/mpb/matrices.h include/mpb/maxwell.h include/mpb/scalar.h +include/mpb/verbosity.h lib/libmpb.a man/man1/mpb-data.1.gz man/man1/mpb-split.1.gz man/man1/mpb.1.gz +%%EXAMPLESDIR%%/bragg-sine.ctl +%%EXAMPLESDIR%%/bragg.ctl +%%EXAMPLESDIR%%/check.ctl +%%EXAMPLESDIR%%/diamond.ctl +%%EXAMPLESDIR%%/dos.scm +%%EXAMPLESDIR%%/hole-slab.ctl +%%EXAMPLESDIR%%/honey-rods.ctl +%%EXAMPLESDIR%%/line-defect.ctl +%%EXAMPLESDIR%%/sq-rods.ctl +%%EXAMPLESDIR%%/strip.ctl +%%EXAMPLESDIR%%/tri-holes.ctl +%%EXAMPLESDIR%%/tri-rods.ctl +%%EXAMPLESDIR%%/tutorial.ctl +%%EXAMPLESDIR%%/wavevector.scm %%DATADIR%%/mpb.scm