Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Sep 2018 18:00:25 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480425 - in head: benchmarks/imb benchmarks/mdtest biology/phyml math/parmetis
Message-ID:  <201809221800.w8MI0PEZ050027@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sat Sep 22 18:00:24 2018
New Revision: 480425
URL: https://svnweb.freebsd.org/changeset/ports/480425

Log:
  Change 4 ports from net/mpich2 to net/mpich
  
  mpich2 is the obsolete version 2.x, mpich is at the current version 3.x
  
  Ports:
  biology/phyml benchmarks/mdtest benchmarks/imb math/parmetis

Modified:
  head/benchmarks/imb/Makefile
  head/benchmarks/mdtest/Makefile
  head/biology/phyml/Makefile
  head/math/parmetis/Makefile

Modified: head/benchmarks/imb/Makefile
==============================================================================
--- head/benchmarks/imb/Makefile	Sat Sep 22 17:40:41 2018	(r480424)
+++ head/benchmarks/imb/Makefile	Sat Sep 22 18:00:24 2018	(r480425)
@@ -3,7 +3,7 @@
 
 PORTNAME=	imb
 PORTVERSION=	3.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	benchmarks parallel
 MASTER_SITES=	LOCAL/itetcu \
 		http://cache-www.intel.com/cd/00/00/32/71/
@@ -34,8 +34,8 @@ CHECK_RESULTS_CFLAGS=	-DCHECK
 OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_MAKE_ENV=	MPI_HOME=${LOCALBASE}/mpi/openmpi
-OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich2
-OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich2
+OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich
+OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich
 OPENMPI_MAKE_ENV_OFF=	MPI_HOME=${LOCALBASE}
 
 do-install:

Modified: head/benchmarks/mdtest/Makefile
==============================================================================
--- head/benchmarks/mdtest/Makefile	Sat Sep 22 17:40:41 2018	(r480424)
+++ head/benchmarks/mdtest/Makefile	Sat Sep 22 18:00:24 2018	(r480425)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mdtest
 PORTVERSION=	1.9.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	benchmarks
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20latest/${PORTNAME}-${PORTVERSION}
 
@@ -27,8 +27,8 @@ OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/m
 OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_VARS=			MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc
 
-OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich2
-OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich2
+OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich
+OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich
 OPENMPI_VARS_OFF=		MPICC=${LOCALBASE}/bin/mpicc
 
 do-build:

Modified: head/biology/phyml/Makefile
==============================================================================
--- head/biology/phyml/Makefile	Sat Sep 22 17:40:41 2018	(r480424)
+++ head/biology/phyml/Makefile	Sat Sep 22 18:00:24 2018	(r480425)
@@ -4,6 +4,7 @@
 PORTNAME=	phyml
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.20180621
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
 
@@ -27,10 +28,11 @@ PLIST_FILES=	bin/phyml${BIN_SUFFIX}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_RADIO=		MPI
-OPTIONS_RADIO_MPI=	MPICH2 OPENMPI
+OPTIONS_RADIO_MPI=	MPICH OPENMPI
 
-MPICH2_LIB_DEPENDS=	libmpich.so:net/mpich2
-MPICH2_MAKE_ARGS=	CC="${LOCALBASE}/bin/mpicc"
+MPICH_DESC=		Parallel processing support via MPICH
+MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
+MPICH_MAKE_ARGS=	CC="${LOCALBASE}/bin/mpicc"
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 OPENMPI_MAKE_ARGS=	CC="${LOCALBASE}/mpi/openmpi/bin/mpicc"
 

Modified: head/math/parmetis/Makefile
==============================================================================
--- head/math/parmetis/Makefile	Sat Sep 22 17:40:41 2018	(r480424)
+++ head/math/parmetis/Makefile	Sat Sep 22 18:00:24 2018	(r480425)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ParMetis
 PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
@@ -17,14 +17,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	auto-accept
 
 OPTIONS_DEFINE=	OPENMPI DOCS
-OPENMPI_DESC=	Use openmpi instead of mpich2
+OPENMPI_DESC=	Use openmpi instead of mpich
 
 OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
 OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_VARS=			MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
 				MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx
-OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich2
-OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich2
+OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich
+OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich
 OPENMPI_VARS_OFF=		MPICC=${LOCALBASE}/bin/mpicc \
 				MPICXX=${LOCALBASE}/bin/mpicxx
 
@@ -50,8 +50,6 @@ post-patch:
 		's|IDXTYPEWIDTH 32|IDXTYPEWIDTH 64|' \
 		${WRKSRC}/metis/include/metis.h
 .endif
-
-post-patch-OPENMPI-on:
 	@${REINPLACE_CMD} -e \
 		'/target_link_libraries(.* parmetis)/s/\(parmetis\)/& -lexecinfo/' \
 		${WRKSRC}/programs/CMakeLists.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809221800.w8MI0PEZ050027>