View | Details | Raw Unified | Return to bug 151867 | Differences between
and this patch

Collapse All | Expand All

(-)net/mpich2/Makefile (-23 / +13 lines)
Lines 6-24 Link Here
6
#
6
#
7
7
8
PORTNAME=	mpich2
8
PORTNAME=	mpich2
9
DISTVERSION=	1.2.1p1
9
PORTVERSION=	1.3
10
PORTEPOCH=	5
10
PORTEPOCH=	5
11
CATEGORIES=	net parallel
11
CATEGORIES=	net parallel
12
MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
12
MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/
13
DIST_SUBDIR=	mpich
13
DIST_SUBDIR=	mpich
14
#PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/mpich2-patch/
15
#PATCHFILES=
16
14
17
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
18
COMMENT=	A portable implementation of MPI-1 and MPI-2
16
COMMENT=	A portable implementation of MPI-1 and MPI-2
19
17
18
BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
20
LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
19
LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
21
#BUILD_DEPENDS=	doctext:${PORTSDIR}/textproc/sowing
20
RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
22
21
23
#-----------------------------------------------------------------------
22
#-----------------------------------------------------------------------
24
# You may define these options:
23
# You may define these options:
Lines 40-46 Link Here
40
USE_GNOME=	pkgconfig
39
USE_GNOME=	pkgconfig
41
40
42
GNU_CONFIGURE=	yes
41
GNU_CONFIGURE=	yes
43
CONFIGURE_ARGS=	--enable-romio --enable-sharedlibs=gcc	\
42
CONFIGURE_ARGS=	--enable-romio --enable-shared	\
44
		--docdir=${DOCSDIR}
43
		--docdir=${DOCSDIR}
45
CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include"	\
44
CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include"	\
46
		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"			\
45
		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}"			\
Lines 56-70 Link Here
56
CONFLICTS=	lam-7.* mpiexec-0.*
55
CONFLICTS=	lam-7.* mpiexec-0.*
57
56
58
USE_FORTRAN=	yes
57
USE_FORTRAN=	yes
59
F90FLAGS+=	${FFLAGS}
58
FCFLAGS+=	${FFLAGS}
60
CONFIGURE_ENV+=	F90="${FC}" F90FLAGS="${F90FLAGS}"
59
CONFIGURE_ENV+=	FC="${FC}" FCFLAGS="${FCFLAGS}"
61
60
62
USE_LDCONFIG=	yes
61
USE_LDCONFIG=	yes
63
62
64
SUB_FILES=	pkg-message
63
SUB_FILES=	pkg-message
65
64
66
VERSO=		1.2
65
VERSO=		2.0
67
PLIST_SUB=	VER=${VERSO}
66
VERSOM=		${VERSO:R}
67
PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
68
.if defined(WITHOUT_X11)
68
.if defined(WITHOUT_X11)
69
CONFIGURE_ARGS+=	--disable-graphics
69
CONFIGURE_ARGS+=	--disable-graphics
70
WITHOUT_JAVA=	yes
70
WITHOUT_JAVA=	yes
Lines 95-102 Link Here
95
PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
95
PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
96
.endif
96
.endif
97
97
98
LIBSSO=		fmpich mpich mpichcxx mpichf90
99
100
THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
98
THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
101
		test/mpi/threads/pt2pt/Makefile.in		\
99
		test/mpi/threads/pt2pt/Makefile.in		\
102
		src/mpe2/src/logging/configure			\
100
		src/mpe2/src/logging/configure			\
Lines 107-115 Link Here
107
		src/mpe2/src/graphics/configure
105
		src/mpe2/src/graphics/configure
108
DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
106
DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
109
		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
107
		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
110
CONFPFX2FIX1=	man/man1/mpd.1 src/pm/mpd/mpd.py
108
CONFPFX2FIX1=	src/pm/mpd/mpd.py
111
CONFPFX2FIX2=	README doc/installguide/install.tex.vin		\
109
CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
112
		src/pm/mpd/mpdlib.py src/pm/mpd/mpdroot.c
110
		src/pm/mpd/mpdroot.c
113
111
114
.include <bsd.port.pre.mk>
112
.include <bsd.port.pre.mk>
115
113
Lines 182-195 Link Here
182
		${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc
180
		${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc
183
181
184
post-install:
182
post-install:
185
.for lib in ${LIBSSO}
186
	${MV} ${PREFIX}/lib/lib${lib}.so.1.2 ${PREFIX}/lib/lib${lib}.so.1
187
	${LN} -sf ${PREFIX}/lib/lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so
188
	${LN} -sf ${PREFIX}/lib/lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so.1.2
189
.endfor
190
.if !defined(NOPORTDOCS)
191
	${RM} ${MANPREFIX}/man/man1/mpd.1.bak
192
.endif
193
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin
183
	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin
194
	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin
184
	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin
195
	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
185
	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
(-)net/mpich2/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (mpich/mpich2-1.2.1p1.tar.gz) = fa7e8dc7c5fb60395ab26c5b239321ca
1
MD5 (mpich/mpich2-1.3.tar.gz) = d19865b6244845198c29fc553a6bb8ad
2
SHA256 (mpich/mpich2-1.2.1p1.tar.gz) = a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
2
SHA256 (mpich/mpich2-1.3.tar.gz) = c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63
3
SIZE (mpich/mpich2-1.2.1p1.tar.gz) = 18014859
3
SIZE (mpich/mpich2-1.3.tar.gz) = 19394388
(-)net/mpich2/files/manpages (-17 lines)
Lines 1-22 Link Here
1
MAN1= \
1
MAN1= \
2
MPI.1 \
2
MPI.1 \
3
Zeroconf.1 \
4
mpd.1 \
5
mpdallexit.1 \
6
mpdboot.1 \
7
mpdcheck.1 \
8
mpdchkpyver.1 \
9
mpdcleanup.1 \
10
mpdexit.1 \
11
mpdgdbdrv.1 \
12
mpdhelp.1 \
13
mpdkilljob.1 \
14
mpdlib.1 \
15
mpdlistjobs.1 \
16
mpdman.1 \
17
mpdringtest.1 \
18
mpdsigjob.1 \
19
mpdtrace.1 \
20
mpicc.1 \
3
mpicc.1 \
21
mpicxx.1 \
4
mpicxx.1 \
22
mpiexec.1 \
5
mpiexec.1 \
(-)net/mpich2/pkg-plist (-4 / +12 lines)
Lines 1-3 Link Here
1
bin/bt2line
1
bin/check_callstack
2
bin/check_callstack
2
@comment SLOG-2 tools are not installed if NOPORTDOCS is set
3
@comment SLOG-2 tools are not installed if NOPORTDOCS is set
3
%%JAVA%%bin/clog2TOslog2
4
%%JAVA%%bin/clog2TOslog2
Lines 167-173 Link Here
167
lib/libampe.a
168
lib/libampe.a
168
lib/libfmpich.a
169
lib/libfmpich.a
169
lib/libfmpich.so
170
lib/libfmpich.so
170
lib/libfmpich.so.1
171
lib/libfmpich.so.%%VERM%%
171
lib/libfmpich.so.%%VER%%
172
lib/libfmpich.so.%%VER%%
172
lib/liblmpe.a
173
lib/liblmpe.a
173
lib/libmpe.a
174
lib/libmpe.a
Lines 178-194 Link Here
178
lib/libmpe_null.a
179
lib/libmpe_null.a
179
lib/libmpich.a
180
lib/libmpich.a
180
lib/libmpich.so
181
lib/libmpich.so
181
lib/libmpich.so.1
182
lib/libmpich.so.%%VERM%%
182
lib/libmpich.so.%%VER%%
183
lib/libmpich.so.%%VER%%
183
lib/libmpichcxx.a
184
lib/libmpichcxx.a
184
lib/libmpichcxx.so
185
lib/libmpichcxx.so
185
lib/libmpichcxx.so.1
186
lib/libmpichcxx.so.%%VERM%%
186
lib/libmpichcxx.so.%%VER%%
187
lib/libmpichcxx.so.%%VER%%
187
lib/libmpichf90.a
188
lib/libmpichf90.a
188
lib/libmpichf90.so
189
lib/libmpichf90.so
189
lib/libmpichf90.so.1
190
lib/libmpichf90.so.%%VERM%%
190
lib/libmpichf90.so.%%VER%%
191
lib/libmpichf90.so.%%VER%%
192
lib/libmpl.a
193
lib/libmpl.la
194
lib/libmpl.so
195
lib/libmpl.so.1
191
lib/libopa.a
196
lib/libopa.a
197
lib/libopa.la
198
lib/libopa.so
199
lib/libopa.so.1
192
lib/libtmpe.a
200
lib/libtmpe.a
193
%%JAVA%%lib/logconvertor.jar
201
%%JAVA%%lib/logconvertor.jar
194
lib/mpe_prof.o
202
lib/mpe_prof.o

Return to bug 151867