- Upgrade to 1.3.2. Changelog at <http://www.mcs.anl.gov/research/projects/mpich2/about/index.php?s=news> - Set the license. Fix: Apply the following patch. Note: this implies a PORTREVISION bump of several dependencies, I'm going to send another patch for: - benchmarks/hpl - benchmarks/imb - benchmarks/mdtest - cad/scotch - math/blacs - math/blocksolve95 - math/mumps - math/parmetis - math/petsc - math/scalapack - math/sdpara - math/spooles - science/fvm - science/mbdyn - science/mpqc - science/ncs - science/pnetcdf How-To-Repeat: N/A
Responsible Changed From-To: freebsd-ports-bugs->thierry Submitter has GNATS access (via the GNATS Auto Assign Tool)
Actually, I'll commit the upgrade to 1.3.2 patchset #1 directly: --- mpich2.diff begins here --- diff -urN net/mpich2.orig/Makefile net/mpich2/Makefile --- net/mpich2.orig/Makefile 2010-12-16 19:27:53.000000000 +0100 +++ net/mpich2/Makefile 2011-02-16 19:38:10.000000000 +0100 @@ -6,10 +6,10 @@ # PORTNAME= mpich2 -PORTVERSION= 1.3 +DISTVERSION= 1.3.2p1 PORTEPOCH= 5 CATEGORIES= net parallel -MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/ +MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/ DIST_SUBDIR= mpich MAINTAINER= ports@FreeBSD.org @@ -28,6 +28,11 @@ # - WITH_RECV_TIMEOUT set a non-default MPIEXEC_RECV_TIMEOUT #----------------------------------------------------------------------- +LICENSE= MPICH +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_NAME= MPICH +LICENSE_FILE= ${WRKSRC}/COPYRIGHT + .if defined(MAINTAINER_MODE) WITH_RECV_TIMEOUT?= 100 .else @@ -62,7 +67,7 @@ SUB_FILES= pkg-message -VERSO= 2.0 +VERSO= 2.2 VERSOM= ${VERSO:R} PLIST_SUB= VER=${VERSO} VERM=${VERSOM} .if defined(WITHOUT_X11) @@ -174,14 +179,13 @@ ${WRKSRC}/${cnf} .endfor -post-configure: - ${REINPLACE_CMD} -e 's|$${exec_prefix}|${PREFIX}|g; \ - s|$${prefix}|${PREFIX}|g' \ - ${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc +pre-install: + @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bin + @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bin post-install: - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyc ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyo ${PREFIX}/bin @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist ${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/ if [ ! -e ${PREFIX}/etc/mpd.conf ]; then \ diff -urN net/mpich2.orig/distinfo net/mpich2/distinfo --- net/mpich2.orig/distinfo 2010-11-14 23:00:10.000000000 +0100 +++ net/mpich2/distinfo 2011-02-16 19:39:05.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (mpich/mpich2-1.3.tar.gz) = c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63 -SIZE (mpich/mpich2-1.3.tar.gz) = 19394388 +SHA256 (mpich/mpich2-1.3.2p1.tar.gz) = c55effee8f6345c071b01a9b8838c9c0ddfb56d3d205b6a498b6d688ee415958 +SIZE (mpich/mpich2-1.3.2p1.tar.gz) = 19492001 diff -urN net/mpich2.orig/files/patch-Makefile.in net/mpich2/files/patch-Makefile.in --- net/mpich2.orig/files/patch-Makefile.in 2009-10-09 21:42:20.000000000 +0200 +++ net/mpich2/files/patch-Makefile.in 2011-02-02 22:51:39.000000000 +0100 @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2009-10-07 19:18:28.000000000 +0200 -+++ Makefile.in 2009-10-09 21:41:59.000000000 +0200 -@@ -195,61 +195,61 @@ +--- Makefile.in.orig 2011-01-31 19:23:28.000000000 +0100 ++++ Makefile.in 2011-02-02 22:51:16.000000000 +0100 +@@ -127,61 +127,61 @@ install: install-preamble FORCE_TARGET if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi if [ ! -d ${DESTDIR}${datarootdir} ] ; then $(MKDIR_P) ${DESTDIR}${datarootdir} ; fi @@ -12,8 +12,8 @@ if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi ${MAKE} install-local - $(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h - $(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a + $(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h + $(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a - if [ ! -d ${DESTDIR}${docdir} ] ; then $(MKDIR_P) ${DESTDIR}${docdir} ; fi - @if test -d $(srcdir)/www && cd $(srcdir)/www ; then \ - for name in * ; do \ @@ -108,21 +108,21 @@ +%%PORTDOCS%% fi ; \ +%%PORTDOCS%% done ; \ +%%PORTDOCS%% fi - if [ -s src/mpi/romio/include/mpiof.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpiof.h ${DESTDIR}${includedir}/mpiof.h ; fi - if [ -s src/mpi/romio/include/mpio.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpio.h ${DESTDIR}${includedir}/mpio.h ; fi - if [ -s lib/lib${MPIFLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPIFLIBNAME}.a ${DESTDIR}${libdir}/lib${MPIFLIBNAME}.a ; fi -@@ -263,10 +263,10 @@ - if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi - if [ -s lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}f90.@SHLIB_EXT@ ; fi - if [ -s lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ; fi -- if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi -- if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi -- if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi -- if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi -+%%PORTDOCS%% if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi -+%%PORTDOCS%% if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi -+%%PORTDOCS%% if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi -+%%PORTDOCS%% if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi + if [ -s src/mpi/romio/include/mpiof.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpiof.h ${DESTDIR}${includedir}/mpiof.h ; fi + if [ -s src/mpi/romio/include/mpio.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpio.h ${DESTDIR}${includedir}/mpio.h ; fi + if [ -s lib/lib${MPIFLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPIFLIBNAME}.a ${DESTDIR}${libdir}/lib${MPIFLIBNAME}.a ; fi +@@ -195,10 +195,10 @@ + if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi + if [ -s lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}f90.@SHLIB_EXT@ ; fi + if [ -s lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) -version-info $(ABIVERSION) --mode=install --clink="@CXX_SHL@" lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ; fi +- if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi +- if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi +- if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi +- if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi ++%%PORTDOCS%% if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi ++%%PORTDOCS%% if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi ++%%PORTDOCS%% if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi ++%%PORTDOCS%% if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi (cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install) (cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install) (cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install) diff -urN net/mpich2.orig/pkg-plist net/mpich2/pkg-plist --- net/mpich2.orig/pkg-plist 2010-10-23 17:46:39.000000000 +0200 +++ net/mpich2/pkg-plist 2011-02-06 18:22:44.000000000 +0100 @@ -98,10 +98,6 @@ %%JAVA%%bin/slog2navigator %%JAVA%%bin/slog2print %%JAVA%%bin/slog2updater -bin/smtpd.pyc -bin/smtpd.pyo -bin/smtpd2.6.pyc -bin/smtpd2.6.pyo etc/mpe_callstack_ldflags.conf etc/mpe_f77env.conf etc/mpe_graphics.conf @@ -777,5 +773,8 @@ %%JAVA%%@dirrm lib/trace_rlog @dirrm include/primitives @cwd %%LOCALBASE%% -libdata/pkgconfig/mpich2-ch3.pc +libdata/pkgconfig/mpich2-c.pc +libdata/pkgconfig/mpich2-cxx.pc +libdata/pkgconfig/mpich2-f77.pc +libdata/pkgconfig/mpich2-f90.pc @comment libdata/pkgconfig/openpa.pc --- mpich2.diff ends here --- -- Th. Thomas.
thierry 2011-02-26 09:56:41 UTC FreeBSD ports repository Modified files: net/mpich2 Makefile distinfo pkg-plist net/mpich2/files patch-Makefile.in Log: Upgrade to 1.3.2p1. Changelog at <http://www.mcs.anl.gov/research/projects/mpich2/about/index.php?s=news> PR: ports/154714 Revision Changes Path 1.92 +13 -9 ports/net/mpich2/Makefile 1.43 +2 -2 ports/net/mpich2/distinfo 1.4 +20 -20 ports/net/mpich2/files/patch-Makefile.in 1.41 +4 -5 ports/net/mpich2/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->suspended To be committed after the ports thaw.
State Changed From-To: suspended->closed Committed.