Attachment #201214 for bug #234105

Lines 1-2 Link Here

(-)meep/distinfo (-2 / +3 lines)
1	SHA256 (meep-1.2.1.tar.gz) = f1f0683e5688d231f7dd1863939677148fc27a6744c03510e030c85d6c518ea5	1	TIMESTAMP = 1546837838
2	SIZE (meep-1.2.1.tar.gz) = 731272	2	SHA256 (NanoComp-meep-1.7.0-v1.7.0_GH0.tar.gz) = a5af8c28da2626a0987a6fd4aa97f4fcc5695cf17f9ee2247caa90208efaa8bf
		3	SIZE (NanoComp-meep-1.7.0-v1.7.0_GH0.tar.gz) = 10182150

Lines 1-11 Link Here

(-)meep/files/patch-configure (-11 lines)
1	--- configure.orig 2012-07-20 08:29:15.000000000 +0700
2	+++ configure 2013-04-18 23:46:39.000000000 +0700
3	@@ -25552,7 +25552,7 @@
4	ACTIVATE_READLINE="$ractivate"
5	else
6	ractivate="(use-modules (ice-9 readline)) (activate-readline)"
7	- if guile -c "$ractivate" >& /dev/null; then
8	+ if guile -c "$ractivate" > /dev/null 2>&1; then
9	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ice-9 readline" >&5
10	$as_echo "ice-9 readline" >&6; }
11	ACTIVATE_READLINE="$ractivate"

Line 0 Link Here

(-)meep/files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig 2019-01-10 16:38:54.385108000 +0700
	2	+++ configure.ac 2019-01-10 16:39:38.222413000 +0700
	3	@@ -314,7 +314,7 @@
	4	ACTIVATE_READLINE="$ractivate"
	5	else
	6	ractivate="(use-modules (ice-9 readline)) (activate-readline)"
	7	- if guile -c "$ractivate" >& /dev/null; then
	8	+ if guile -c "$ractivate" 2>&1 /dev/null; then
	9	AC_MSG_RESULT(ice-9 readline)
	10	ACTIVATE_READLINE="$ractivate"
	11	else

Lines 1-15 Link Here

(-)meep/files/patch-libctl_Makefile.in (-15 lines)
1	--- libctl/Makefile.in.orig 2010-04-30 10:14:01.000000000 +0700
2	+++ libctl/Makefile.in 2010-04-30 10:11:18.000000000 +0700
3	@@ -717,10 +717,10 @@
4	(echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; grep -h friend $(LIBHDRS) \| sed 's/^ friend \+[A-Za-z_0-9:<>]\+[ ]\+$[A-Za-z_0-9:]$ (.*$$/%ignore \1;/' \| grep "%ignore" \| sort -u;) > $@
5
6	meep_enum_renames.i: $(LIBHDRS)
7	- (echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; for f in $(LIBHDRS); do egrep "^enum" $$f \| sed 's/enum \+$[A-Za-z_0-9:]\+$.$$/\1/g' \| while read enum; do cat $$f \| tr -d '\n' \| sed 's/.enum \+'$${enum}' {$[^}]$}./\1/g' \| sed 's/= [0-9]\+//g' \|tr -d ' \t' \| tr ',' '\n' \| sed 's/^.*$$/'"%rename(meep_$${enum}_\0) meep::\0;/g"; echo; done; done;) > $@
8	+ (echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; for f in $(LIBHDRS); do egrep "^enum" $$f \| gsed 's/enum \+$[A-Za-z_0-9:]\+$.$$/\1/g' \| while read enum; do cat $$f \| tr -d '\n' \| gsed 's/.enum \+'$${enum}' {$[^}]$}./\1/g' \| gsed 's/= [0-9]\+//g' \|tr -d ' \t' \| tr ',' '\n' \| gsed 's/^.*$$/'"%rename(meep_$${enum}_\0) meep::\0;/g"; echo; done; done;) > $@
9
10	meep-enums.scm: meep_enum_renames.i
11	- (sed 's/%rename($[A-Za-z0-9_]$) $[A-Za-z0-9:_]$;$$/(define \2 (\1))/' meep_enum_renames.i \| sed 's/[A-Za-z0-9:_]:://g' \| sed 's/_/-/g' \| sed 's,//,;,'; echo "(define Centered Dielectric)") > $@
12	+ (gsed 's/%rename($[A-Za-z0-9_]$) $[A-Za-z0-9:_]$;$$/(define \2 (\1))/' meep_enum_renames.i \| gsed 's/[A-Za-z0-9:_]:://g' \| sed 's/_/-/g' \| sed 's,//,;,'; echo "(define Centered Dielectric)") > $@
13
14	##############################################################################
15

Lines 1-10 Link Here

(-)meep/files/patch-src_mympi.hpp (-10 lines)
1	--- src/meep/mympi.hpp.orig 2009-12-26 13:03:30.000000000 +0600
2	+++ src/meep/mympi.hpp 2009-12-26 13:04:39.000000000 +0600
3	@@ -19,6 +19,7 @@
4	#define MEEP_MY_MPI_H
5
6	#include <complex>
7	+#include <stdio.h>
8	using namespace std;
9
10	namespace meep {




# $FreeBSD: head/science/meep/Makefile 487272 2018-12-12 01:35:33Z gerald $

PORTNAME=	meep
PORTVERSION=	1.7.0
PORTREVISION=	16
CATEGORIES=	science
MASTER_SITES=	http://ab-initio.mit.edu/meep/

MAINTAINER=	devel@stasyan.com
COMMENT=	FDTD simulation software to model electromagnetic systems

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYRIGHT

BUILD_DEPENDS=	harminv:science/harminv \
		gsed:textproc/gsed \
		swig3.0:${PORTSDIR}/devel/swig30
LIB_DEPENDS=	libfftw3.so:math/fftw3 \
		libblas.so:math/blas \
		libguile-2.0.so:lang/guile2 \

		libhdf5.so:science/hdf5 \
		liblapack.so:math/lapack
RUN_DEPENDS=	harminv:science/harminv
USE_GITHUB=	yes
GH_ACCOUNT=	NanoComp
GH_TAGNAME=	v${PORTVERSION}

USES=		fortran gettext iconv libtool pathfix pkgconfig autoreconf
GNU_CONFIGURE=	yes
USE_GCC=	yes
CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
LDFLAGS+=	-L${LOCALBASE}/lib
MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
CONFIGURE_ARGS+=	--enable-maintainer-mode

OPTIONS_RADIO=		MPI
OPTIONS_RADIO_MPI=	OPENMPI MPICH
OPTIONS_DEFAULT=	${OPTIONS_DEFAULT_${OPSYS}}
OPTIONS_DEFAULT_FreeBSD=	MPICH
OPENMPI_DESC=		MPI support (with OpenMPI)

MPICH_VARS=		CONFIGURE_ARGS+=--with-mpi
MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
MPICH_CONFIGURE_ENV=	MPICXX=${LOCALBASE}/bin/mpicc
MPICH_CFLAGS=		-I${LOCALBASE}/include
MPICH_LDFLAGS=		${LOCALBASE}/lib/libmpich.so

OPENMPI_VARS=		CONFIGURE_ARGS+=--with-mpi
OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:net/openmpi
OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
OPENMPI_CONFIGURE_ENV=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
OPENMPI_CFLAGS=		-I${LOCALBASE}/mpi/openmpi/include
OPENMPI_LDFLAGS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MMPICH} || ${PORT_OPTIONS:MOPENMPI}
CONFIGURE_ARGS+=	--with-mpi
PLIST_SUB+=		MPI="" NOMPI="@comment "
.else
CONFIGURE_ARGS+=	--without-mpi
PLIST_SUB+=		MPI="@comment " NOMPI=""
.endif

.if ${PORT_OPTIONS:MMPICH2}
LIB_DEPENDS+=	libmpich.so:net/mpich2
CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/bin/mpicc
CFLAGS+=	-I${LOCALBASE}/include
.endif

.if ${PORT_OPTIONS:MOPENMPI}
BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:net/openmpi
RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
CFLAGS+=	-I${LOCALBASE}/mpi/openmpi/include
.endif

.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)meep/pkg-plist (-6 / +13 lines)
1	%%NOMPI%%bin/meep	1	bin/meep
2	%%MPI%%bin/meep-mpi
3	include/meep.hpp	2	include/meep.hpp
		3	include/meep/material_data.hpp
		4	include/meep/meepgeom.hpp
4	include/meep/mympi.hpp	5	include/meep/mympi.hpp
5	include/meep/vec.hpp	6	include/meep/vec.hpp
6	%%NOMPI%%lib/libmeep.a	7	lib/libmeep.a
7	%%MPI%%lib/libmeep_mpi.a	8	lib/libmeep.so
8	%%NOMPI%%libdata/pkgconfig/meep.pc	9	lib/libmeep.so.12
9	%%MPI%%libdata/pkgconfig/meep_mpi.pc	10	lib/libmeep.so.12.0.0
		11	lib/libmeepgeom.a
		12	lib/libmeepgeom.so
		13	lib/libmeepgeom.so.12
		14	lib/libmeepgeom.so.12.0.0
		15	libdata/pkgconfig/meep.pc
10	%%DATADIR%%/casimir.scm	16	%%DATADIR%%/casimir.scm
		17	%%DATADIR%%/materials.scm
11	%%DATADIR%%/meep-enums.scm	18	%%DATADIR%%/meep-enums.scm
12	%%DATADIR%%/meep.scm	19	%%DATADIR%%/meep.scm

Return to bug 234105

Lines 2-20 Link Here

(-)meep/Makefile (-23 / +26 lines)
2	# $FreeBSD: head/science/meep/Makefile 487272 2018-12-12 01:35:33Z gerald $	2	# $FreeBSD: head/science/meep/Makefile 487272 2018-12-12 01:35:33Z gerald $
3		3
4	PORTNAME= meep	4	PORTNAME= meep
5	PORTVERSION= 1.2.1	5	PORTVERSION= 1.7.0
6	PORTREVISION= 16
7	CATEGORIES= science	6	CATEGORIES= science
8	MASTER_SITES= http://ab-initio.mit.edu/meep/
9		7
10	MAINTAINER= devel@stasyan.com	8	MAINTAINER= devel@stasyan.com
11	COMMENT= FDTD simulation software to model electromagnetic systems	9	COMMENT= FDTD simulation software to model electromagnetic systems
12		10
13	LICENSE= GPLv2	11	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
15		13
16	BUILD_DEPENDS= harminv:science/harminv \	14	BUILD_DEPENDS= harminv:science/harminv \
17	gsed:textproc/gsed	15	gsed:textproc/gsed \
		16	swig3.0:${PORTSDIR}/devel/swig30
18	LIB_DEPENDS= libfftw3.so:math/fftw3 \	17	LIB_DEPENDS= libfftw3.so:math/fftw3 \
19	libblas.so:math/blas \	18	libblas.so:math/blas \
20	libguile-2.0.so:lang/guile2 \	19	libguile-2.0.so:lang/guile2 \
Lines 24-64 Link Here
24	libhdf5.so:science/hdf5 \	23	libhdf5.so:science/hdf5 \
25	liblapack.so:math/lapack	24	liblapack.so:math/lapack
26	RUN_DEPENDS= harminv:science/harminv	25	RUN_DEPENDS= harminv:science/harminv
		26	USE_GITHUB= yes
		27	GH_ACCOUNT= NanoComp
		28	GH_TAGNAME= v${PORTVERSION}
27		29
28	USES= fortran gettext gmake iconv libtool pathfix pkgconfig	30	USES= fortran gettext iconv libtool pathfix pkgconfig autoreconf
29	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
30	USE_GCC= yes	32	USE_GCC= yes
31	CPPFLAGS+= -I${LOCALBASE}/include	33	CPPFLAGS+= -I${LOCALBASE}/include -fPIC
32	LDFLAGS+= -L${LOCALBASE}/lib	34	LDFLAGS+= -L${LOCALBASE}/lib
33	MAKE_ARGS+= CC="${CC}" CXX="${CXX}"	35	MAKE_ARGS+= CC="${CC}" CXX="${CXX}"
		36	CONFIGURE_ARGS+= --enable-maintainer-mode
34		37
35	OPTIONS_RADIO= MPI	38	OPTIONS_RADIO= MPI
36	OPTIONS_RADIO_MPI= OPENMPI MPICH2	39	OPTIONS_RADIO_MPI= OPENMPI MPICH
37	OPTIONS_DEFAULT= ${OPTIONS_DEFAULT_${OPSYS}}	40	OPTIONS_DEFAULT= ${OPTIONS_DEFAULT_${OPSYS}}
38	OPTIONS_DEFAULT_FreeBSD= MPICH2	41	OPTIONS_DEFAULT_FreeBSD= MPICH
39	OPENMPI_DESC= MPI support (with OpenMPI)	42	OPENMPI_DESC= MPI support (with OpenMPI)
40		43
		44	MPICH_VARS= CONFIGURE_ARGS+=--with-mpi
		45	MPICH_LIB_DEPENDS= libmpich.so:net/mpich
		46	MPICH_CONFIGURE_ENV= MPICXX=${LOCALBASE}/bin/mpicc
		47	MPICH_CFLAGS= -I${LOCALBASE}/include
		48	MPICH_LDFLAGS= ${LOCALBASE}/lib/libmpich.so
		49
		50	OPENMPI_VARS= CONFIGURE_ARGS+=--with-mpi
		51	OPENMPI_BUILD_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpiCC:net/openmpi
		52	OPENMPI_RUN_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
		53	OPENMPI_CONFIGURE_ENV= MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
		54	OPENMPI_CFLAGS= -I${LOCALBASE}/mpi/openmpi/include
		55	OPENMPI_LDFLAGS= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so
		56
41	.include <bsd.port.pre.mk>	57	.include <bsd.port.pre.mk>
42		58
43	.if ${PORT_OPTIONS:MMPICH2} \|\| ${PORT_OPTIONS:MOPENMPI}	59	.if ${PORT_OPTIONS:MMPICH} \|\| ${PORT_OPTIONS:MOPENMPI}
44	CONFIGURE_ARGS+= --with-mpi
45	PLIST_SUB+= MPI="" NOMPI="@comment "	60	PLIST_SUB+= MPI="" NOMPI="@comment "
46	.else	61	.else
47	CONFIGURE_ARGS+= --without-mpi	62	CONFIGURE_ARGS+= --without-mpi
48	PLIST_SUB+= MPI="@comment " NOMPI=""	63	PLIST_SUB+= MPI="@comment " NOMPI=""
49	.endif	64	.endif
50		65
51	.if ${PORT_OPTIONS:MMPICH2}
52	LIB_DEPENDS+= libmpich.so:net/mpich2
53	CONFIGURE_ENV+= MPICXX=${LOCALBASE}/bin/mpicc
54	CFLAGS+= -I${LOCALBASE}/include
55	.endif
56
57	.if ${PORT_OPTIONS:MOPENMPI}
58	BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpiCC:net/openmpi
59	RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
60	CONFIGURE_ENV+= MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
61	CFLAGS+= -I${LOCALBASE}/mpi/openmpi/include
62	.endif
63		66
64	.include <bsd.port.post.mk>	67	.include <bsd.port.post.mk>