From 08016c3ebb64127efa19af25ee55e6c4e67f0e37 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Sun, 14 Nov 2010 22:00:10 +0000 Subject: [PATCH] Upgrade to 1.3. Changelog at PR: ports/151867 Submitted by: /me --- net/mpich2/Makefile | 36 +++++++++++++----------------------- net/mpich2/distinfo | 5 ++--- net/mpich2/files/manpages | 17 ----------------- net/mpich2/pkg-plist | 16 ++++++++++++---- 4 files changed, 27 insertions(+), 47 deletions(-) diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile index c78b3f22ecaa..b04001ed8237 100644 --- a/net/mpich2/Makefile +++ b/net/mpich2/Makefile @@ -6,19 +6,18 @@ # PORTNAME= mpich2 -DISTVERSION= 1.2.1p1 +PORTVERSION= 1.3 PORTEPOCH= 5 CATEGORIES= net parallel -MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/ +MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/ DIST_SUBDIR= mpich -#PATCH_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/mpich2-patch/ -#PATCHFILES= MAINTAINER= ports@FreeBSD.org COMMENT= A portable implementation of MPI-1 and MPI-2 +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -#BUILD_DEPENDS= doctext:${PORTSDIR}/textproc/sowing +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash #----------------------------------------------------------------------- # You may define these options: @@ -40,7 +39,7 @@ USE_PERL5_BUILD=yes USE_GNOME= pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-romio --enable-sharedlibs=gcc \ +CONFIGURE_ARGS= --enable-romio --enable-shared \ --docdir=${DOCSDIR} CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}" \ @@ -56,15 +55,16 @@ MAKE_JOBS_UNSAFE= yes CONFLICTS= lam-7.* mpiexec-0.* USE_FORTRAN= yes -F90FLAGS+= ${FFLAGS} -CONFIGURE_ENV+= F90="${FC}" F90FLAGS="${F90FLAGS}" +FCFLAGS+= ${FFLAGS} +CONFIGURE_ENV+= FC="${FC}" FCFLAGS="${FCFLAGS}" USE_LDCONFIG= yes SUB_FILES= pkg-message -VERSO= 1.2 -PLIST_SUB= VER=${VERSO} +VERSO= 2.0 +VERSOM= ${VERSO:R} +PLIST_SUB= VER=${VERSO} VERM=${VERSOM} .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --disable-graphics WITHOUT_JAVA= yes @@ -95,8 +95,6 @@ CONFIGURE_ARGS+= --with-pmi=simple --with-pm=mpd PLIST_SUB+= PM_MPD="" PM_SMPD="@comment " .endif -LIBSSO= fmpich mpich mpichcxx mpichf90 - THREAD2FIX= configure test/mpi/threads/comm/Makefile.in \ test/mpi/threads/pt2pt/Makefile.in \ src/mpe2/src/logging/configure \ @@ -107,9 +105,9 @@ LOCALBASE2FIX= src/mpe2/src/slog2sdk/trace_rlog/configure \ src/mpe2/src/graphics/configure DOC2PATCH= Makefile.in src/mpe2/sbin/mpeinstall.in \ src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in -CONFPFX2FIX1= man/man1/mpd.1 src/pm/mpd/mpd.py -CONFPFX2FIX2= README doc/installguide/install.tex.vin \ - src/pm/mpd/mpdlib.py src/pm/mpd/mpdroot.c +CONFPFX2FIX1= src/pm/mpd/mpd.py +CONFPFX2FIX2= doc/installguide/install.tex.vin \ + src/pm/mpd/mpdroot.c .include @@ -182,14 +180,6 @@ post-configure: ${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc post-install: -.for lib in ${LIBSSO} - ${MV} ${PREFIX}/lib/lib${lib}.so.1.2 ${PREFIX}/lib/lib${lib}.so.1 - ${LN} -sf ${PREFIX}/lib/lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so - ${LN} -sf ${PREFIX}/lib/lib${lib}.so.1 ${PREFIX}/lib/lib${lib}.so.1.2 -.endfor -.if !defined(NOPORTDOCS) - ${RM} ${MANPREFIX}/man/man1/mpd.1.bak -.endif @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo index ffc87c8d72f8..f468cc34b76c 100644 --- a/net/mpich2/distinfo +++ b/net/mpich2/distinfo @@ -1,3 +1,2 @@ -MD5 (mpich/mpich2-1.2.1p1.tar.gz) = fa7e8dc7c5fb60395ab26c5b239321ca -SHA256 (mpich/mpich2-1.2.1p1.tar.gz) = a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964 -SIZE (mpich/mpich2-1.2.1p1.tar.gz) = 18014859 +SHA256 (mpich/mpich2-1.3.tar.gz) = c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63 +SIZE (mpich/mpich2-1.3.tar.gz) = 19394388 diff --git a/net/mpich2/files/manpages b/net/mpich2/files/manpages index 31dc6715569b..5696290d2f41 100644 --- a/net/mpich2/files/manpages +++ b/net/mpich2/files/manpages @@ -1,22 +1,5 @@ MAN1= \ MPI.1 \ -Zeroconf.1 \ -mpd.1 \ -mpdallexit.1 \ -mpdboot.1 \ -mpdcheck.1 \ -mpdchkpyver.1 \ -mpdcleanup.1 \ -mpdexit.1 \ -mpdgdbdrv.1 \ -mpdhelp.1 \ -mpdkilljob.1 \ -mpdlib.1 \ -mpdlistjobs.1 \ -mpdman.1 \ -mpdringtest.1 \ -mpdsigjob.1 \ -mpdtrace.1 \ mpicc.1 \ mpicxx.1 \ mpiexec.1 \ diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist index c8a987baf235..bb5410281ad7 100644 --- a/net/mpich2/pkg-plist +++ b/net/mpich2/pkg-plist @@ -1,3 +1,4 @@ +bin/bt2line bin/check_callstack @comment SLOG-2 tools are not installed if NOPORTDOCS is set %%JAVA%%bin/clog2TOslog2 @@ -167,7 +168,7 @@ include/primitives/opa_unsafe.h lib/libampe.a lib/libfmpich.a lib/libfmpich.so -lib/libfmpich.so.1 +lib/libfmpich.so.%%VERM%% lib/libfmpich.so.%%VER%% lib/liblmpe.a lib/libmpe.a @@ -178,17 +179,24 @@ lib/libmpe_nompi_null.a lib/libmpe_null.a lib/libmpich.a lib/libmpich.so -lib/libmpich.so.1 +lib/libmpich.so.%%VERM%% lib/libmpich.so.%%VER%% lib/libmpichcxx.a lib/libmpichcxx.so -lib/libmpichcxx.so.1 +lib/libmpichcxx.so.%%VERM%% lib/libmpichcxx.so.%%VER%% lib/libmpichf90.a lib/libmpichf90.so -lib/libmpichf90.so.1 +lib/libmpichf90.so.%%VERM%% lib/libmpichf90.so.%%VER%% +lib/libmpl.a +lib/libmpl.la +lib/libmpl.so +lib/libmpl.so.1 lib/libopa.a +lib/libopa.la +lib/libopa.so +lib/libopa.so.1 lib/libtmpe.a %%JAVA%%lib/logconvertor.jar lib/mpe_prof.o