[100087] trunk/dports/science
eborisch at macports.org
eborisch at macports.org
Tue Nov 27 06:19:32 PST 2012
Revision: 100087
https://trac.macports.org/changeset/100087
Author: eborisch at macports.org
Date: 2012-11-27 06:19:32 -0800 (Tue, 27 Nov 2012)
Log Message:
-----------
mpich: Enable mpich-devel subport (mpich v3.0rc1); Update download location.
mpich3: Set as replaced_by mpich-devel.
Modified Paths:
--------------
trunk/dports/science/mpich/Portfile
trunk/dports/science/mpich3/Portfile
Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile 2012-11-27 13:23:17 UTC (rev 100086)
+++ trunk/dports/science/mpich/Portfile 2012-11-27 14:19:32 UTC (rev 100087)
@@ -50,38 +50,39 @@
--with-thread-package=posix \
"F90FLAGS='' F90=''"
-conflicts mpich-devel
+subport mpich-devel {
+ set pkgname mpich
+ conflicts mpich
+ version 3.0rc1
-# Will be enabled with future commit disabling mpich3 port
-#
-#subport mpich-devel {
-# set pkgname mpich
-# conflicts mpich
-# version 3.0rc1
-#
-# long_description-append \
-# \n\nThe mpich-devel port follows the mpich 3.x line, and is\
-# the successor to the mpich2 package. Starting with the\
-# major release in November 2012, the project is renamed\
-# back to MPICH (from MPICH2) with a version number of 3.0.
-#
-# checksums \
-# rmd160 f351263b455db2503f675ba5a8c11560098eecd2 \
-# sha256 5ff2599c0132b6ce9246925a790fa00a0a648c3049d858ade102512be509fe5f
-#
-# configure.args-delete --without-mpe
-#}
+ long_description-append \
+ \n\nThe mpich-devel port follows the mpich 3.x line, and is\
+ the successor to the mpich2 package. Starting with the\
+ major release in November 2012, the project is renamed\
+ back to MPICH (from MPICH2) with a version number of 3.0.
-master_sites ${homepage}files/tarballs/${version}/
+ checksums \
+ rmd160 f351263b455db2503f675ba5a8c11560098eecd2 \
+ sha256 5ff2599c0132b6ce9246925a790fa00a0a648c3049d858ade102512be509fe5f
+
+ configure.args-delete --without-mpe
+}
+
+if {${subport} == ${name}} {
+ conflicts mpich-devel
+}
+
+master_sites ${homepage}static/tarballs/${version}/
distname ${pkgname}-${version}
conflicts-append mpich2 \
- mpich2-devel
+ mpich2-devel \
+ lammpi \
+ openmpi
universal_variant no
depends_lib-append port:libxml2
-conflicts-append lammpi
platform darwin {
@@ -174,9 +175,7 @@
Use clang 3.1 from MacPorts
} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang {
depends_lib-append port:clang-3.1
- configure.compiler clang
- configure.cc ${prefix}/bin/clang-mp-3.1
- configure.cxx ${prefix}/bin/clang++-mp-3.1
+ configure.compiler macports-clang-3.1
}
variant gforker description {
Modified: trunk/dports/science/mpich3/Portfile
===================================================================
--- trunk/dports/science/mpich3/Portfile 2012-11-27 13:23:17 UTC (rev 100086)
+++ trunk/dports/science/mpich3/Portfile 2012-11-27 14:19:32 UTC (rev 100087)
@@ -6,7 +6,8 @@
name mpich3
set pkgname mpich
version 3.0rc1
-revision 0
+revision 1
+replaced_by mpich-devel
license BSD
categories science parallel net
@@ -34,152 +35,18 @@
release in November 2012, the project is renamed back to\
MPICH (from MPICH2) with a version number of 3.0.
homepage http://www.mpich.org/
-master_sites ${homepage}files/tarballs/${version}/
-distname ${pkgname}-${version}
-checksums \
- rmd160 f351263b455db2503f675ba5a8c11560098eecd2 \
- sha256 5ff2599c0132b6ce9246925a790fa00a0a648c3049d858ade102512be509fe5f
+distfiles
+livecheck.type none
+
# Enable at some point in the future as needed
subport mpich3-devel {
# Currently mpich3-devel == mpich3
conflicts mpich3
}
-
-conflicts-append mpich2 \
- mpich2-devel
-
-universal_variant no
-
-depends_lib-append port:libxml2
-conflicts-append lammpi
-
-configure.args --disable-dependency-tracking \
- --disable-f77 \
- --disable-fc \
- --disable-silent-rules \
- --enable-base-cache \
- --enable-cache \
- --enable-cxx \
- --enable-fast=O2 \
- --enable-shared \
- --enable-smpcoll \
- --includedir=${prefix}/include/${pkgname} \
- --with-device=ch3:nemesis \
- --with-pm=hydra \
- --with-thread-package=posix \
- "F90FLAGS='' F90=''" \
- MPICHLIB_CPPFLAGS=-I${prefix}/include
-
-platform darwin {
- configure.args-append --enable-timer-type=mach_absolute_time
+pre-configure {
+ ui_error "Please do not install this port since it has been replaced by 'mpich-devel'."
+ return -code error
}
-# We're making compiler wrappers here... don't default to -O2 for wrappers.
-# Actual library code is compiled with -O2 via --enable-fast=O2 configure arg
-configure.cflags-delete -O2
-configure.cxxflags-delete -O2
-configure.fflags-delete -O2
-configure.fcflags-delete -O2
-configure.cppflags-delete -I${prefix}/include
-
-# As MPICH creates compiler wrappers, there are lots of
-# variants for what compiler the user would like to wrap.
-
-variant gcc47 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc47 port
-} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang clang31 {
- depends_lib-append port:gcc47
- configure.compiler macports-gcc-4.7
-}
-
-variant gcc46 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46 port
-} conflicts gcc43 gcc44 gcc45 gcc47 llvm clang clang31 {
- depends_lib-append port:gcc46
- configure.compiler macports-gcc-4.6
-}
-
-variant gcc45 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45 port
-} conflicts gcc43 gcc44 gcc46 gcc47 llvm clang clang31 {
- depends_lib-append port:gcc45
- configure.compiler macports-gcc-4.5
-}
-
-variant gcc44 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44 port
-} conflicts gcc43 gcc45 gcc46 gcc47 llvm clang clang31 {
- depends_lib-append port:gcc44
- configure.compiler macports-gcc-4.4
-}
-
-variant gcc43 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43 port
-} conflicts gcc44 gcc45 gcc46 gcc47 llvm clang clang31 {
- depends_lib-append port:gcc43
- configure.compiler macports-gcc-4.3
-}
-
-if {[ variant_isset gcc43 ] ||
- [ variant_isset gcc44 ] ||
- [ variant_isset gcc45 ] ||
- [ variant_isset gcc46 ] ||
- [ variant_isset gcc47 ]} {
- configure.args-append --enable-f77 --enable-fc
- configure.args-delete --disable-f77 --disable-fc
-}
-
-variant llvm description {
- Use Apple-supplied llvm-gcc
-} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang clang31 {
- configure.compiler llvm-gcc-4.2
-}
-
-# Apple clang version 4.1 currently segfaults (Xcode 4.5.1)
-# See https://trac.macports.org/ticket/36654#comment:9
-if {[vercmp ${xcodeversion} 4.5.1] >= 0} {
- compiler.blacklist clang
- # Keeping variant so all the conflict lines don't balk and so upgrades
- # of +clang are not moved to llvm without warning.
- variant clang description {
- !!THIS CLANG VERSION BREAKS. UNUSABLE VARIANT HERE AS PLACEHOLDER ONLY!!
- } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
- ui_error \
- "This version of clang segfaults. Please select a different compiler."
- return -code error "Unsupported clang version. Try +clang31 or +llvm ?"
- }
-} else {
- variant clang description {
- Use Apple-supplied clang
- } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
- configure.compiler clang
- }
-}
-
-variant clang31 description {
- Use clang 3.1 from MacPorts
-} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang {
- depends_lib-append port:clang-3.1
- configure.compiler clang
- configure.cc ${prefix}/bin/clang-mp-3.1
- configure.cxx ${prefix}/bin/clang++-mp-3.1
-}
-
-variant gforker description {
- Use gforker process manager instead of the default hydra
-} {
- configure.args-append --with-pm=gforker
- configure.args-delete --with-pm=hydra
-}
-
-variant tuned description {Build with more optimizations)} {
- configure.args-delete --enable-fast=O2
- configure.args-append --enable-fast=all \
- MPICHLIB_CFLAGS='-fomit-frame-pointer -O2'
-}
-
-livecheck.type regex
-livecheck.regex ${pkgname}-(\[0-9.pbrc\]+)${extract.suffix}
-livecheck.url ${homepage}downloads/index.php?s=downloads
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121127/c674b2cd/attachment.html>
More information about the macports-changes
mailing list