svn commit: r478925 - in head: . science science/mpqc science/mpqc-mpich

[Yuri Victorovich]

Author: yuri
Date: Tue Sep  4 06:07:39 2018
New Revision: 478925
URL: https://svnweb.freebsd.org/changeset/ports/478925

Log:
  Remove science/mpqc-mpich: Enable MPI option in science/mpqc by default
  
  * MPICH option in science/mpqc is renamed to MPI, because MPI exists in many other
    ports and there's MPI_DESC predefined for it.
  * MPI option in science/mpqc is made default.

Deleted:
  head/science/mpqc-mpich/
Modified:
  head/MOVED
  head/science/Makefile
  head/science/mpqc/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Sep  4 03:01:22 2018	(r478924)
+++ head/MOVED	Tue Sep  4 06:07:39 2018	(r478925)
@@ -10514,3 +10514,4 @@ devel/renpy6|games/renpy6|2018-09-03|Moved to better c
 devel/rlvm|games/rlvm|2018-09-03|Moved to better category
 dns/openmdns|net/openmdns|2018-09-03|Moved to better category
 www/hs-activehs||2018-09-03|Has expired: Doesn't build with recent dependencies
+science/mpqc-mpich|science/mpqc|2018-09-03|MPI option is enabled by default in mpqc, no need for mpqc-mpich

Modified: head/science/Makefile
==============================================================================
--- head/science/Makefile	Tue Sep  4 03:01:22 2018	(r478924)
+++ head/science/Makefile	Tue Sep  4 06:07:39 2018	(r478925)
@@ -131,7 +131,6 @@
     SUBDIR += mol2ps
     SUBDIR += mpb
     SUBDIR += mpqc
-    SUBDIR += mpqc-mpich
     SUBDIR += multiwfn
     SUBDIR += ncs
     SUBDIR += netcdf

Modified: head/science/mpqc/Makefile
==============================================================================
--- head/science/mpqc/Makefile	Tue Sep  4 03:01:22 2018	(r478924)
+++ head/science/mpqc/Makefile	Tue Sep  4 06:07:39 2018	(r478925)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	37
+PORTREVISION=	38
 CATEGORIES=	science parallel
 MASTER_SITES=	SF
 
@@ -34,23 +34,22 @@ SHEBANG_FILES=	src/bin/mpqc/ccarunproc src/bin/mpqc/mp
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++98 # workaround https://github.com/ValeevGroup/mpqc/issues/57
 
-OPTIONS_DEFINE=		ATLAS DOXYGEN EXAMPLES ICC MPICH OPTIFLAGS
-OPTIONS_DEFAULT=	DOXYGEN
+OPTIONS_DEFINE=		ATLAS DOXYGEN EXAMPLES ICC MPI OPTIFLAGS
+OPTIONS_DEFAULT=	DOXYGEN MPI
 OPTIONS_SUB=		yes
 
 ICC_DESC=		Build with ICC compiler instead
 ATLAS_DESC=		Link with ATLAS instead of BLAS
-MPICH_DESC=		Parallel processing support via MPICH
 OPTIFLAGS_DESC=		Build with optimized flags
 
 ATLAS_USES=		blaslapack:atlas
 ATLAS_USES_OFF=		blaslapack:netlib
-DOXYGEN_CONFIGURE_ENABLE=doxygen-man
+DOXYGEN_CONFIGURE_ENABLE=	doxygen-man
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dot:graphics/graphviz
 ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:lang/icc
-MPICH_CONFIGURE_ENABLE=	parallel
-MPICH_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_CONFIGURE_ENABLE=	parallel
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 OPTIFLAGS_CFLAGS=	-ffast-math
 OPTIFLAGS_CXXFLAGS=	-ffast-math