[68906] trunk/dports
jmr at macports.org
jmr at macports.org
Thu Jun 17 11:17:41 PDT 2010
Revision: 68906
http://trac.macports.org/changeset/68906
Author: jmr at macports.org
Date: 2010-06-17 11:17:40 -0700 (Thu, 17 Jun 2010)
Log Message:
-----------
add gcc44 variants to multiple ports; where gcc43 was default, change to gcc44 (#20103)
Modified Paths:
--------------
trunk/dports/audio/ardour2/Portfile
trunk/dports/games/snoopy/Portfile
trunk/dports/graphics/pgplot/Portfile
trunk/dports/lang/adaptor/Portfile
trunk/dports/math/R/Portfile
trunk/dports/math/atlas/Portfile
trunk/dports/math/octave/Portfile
trunk/dports/math/shogun/Portfile
trunk/dports/net/lam/Portfile
trunk/dports/python/py-scipy/Portfile
trunk/dports/python/py25-numpy/Portfile
trunk/dports/python/py25-pymc/Portfile
trunk/dports/python/py25-pynifti/Portfile
trunk/dports/python/py25-scipy/Portfile
trunk/dports/python/py26-logilab-hmm/Portfile
trunk/dports/python/py26-ngl/Portfile
trunk/dports/python/py26-nio/Portfile
trunk/dports/python/py26-numpy/Portfile
trunk/dports/python/py26-pymc/Portfile
trunk/dports/python/py26-pynifti/Portfile
trunk/dports/python/py26-scipy/Portfile
trunk/dports/science/emos/Portfile
trunk/dports/science/eo/Portfile
trunk/dports/science/grib_api/Portfile
trunk/dports/science/hdf4/Portfile
trunk/dports/science/hdf5/Portfile
trunk/dports/science/libnc-dap/Portfile
trunk/dports/science/magicspp/Portfile
trunk/dports/science/miriad/Portfile
trunk/dports/science/molden/Portfile
trunk/dports/science/mpich2/Portfile
trunk/dports/science/ncarg/Portfile
trunk/dports/science/netcdf/Portfile
trunk/dports/science/netcdf-devel/Portfile
trunk/dports/science/openmpi/Portfile
trunk/dports/science/plplot/Portfile
trunk/dports/science/xmedcon/Portfile
Modified: trunk/dports/audio/ardour2/Portfile
===================================================================
--- trunk/dports/audio/ardour2/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/audio/ardour2/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -33,8 +33,7 @@
sha1 ac3c589b2355211b8ea12f1fba656e66b3007bb4 \
rmd160 6dcb714f8e0a7d4fba497f96918a61fb67318bc7
-depends_build port:gcc43 \
- port:pkgconfig \
+depends_build port:pkgconfig \
port:scons
depends_lib port:jack \
@@ -59,16 +58,13 @@
reinplace "s%@MP_CPP@%${configure.cpp}%g" ${worksrcpath}/gtk2_ardour/SConscript
}
-configure.compiler macports-gcc-4.3
use_configure no
build.cmd scons
build.target
build.args PREFIX=${prefix} VST=0 AUBIO=1 FREESOUND=1 LV2=0
-build.env CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
destroot.cmd scons
-destroot.env CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
# Fix gettext bug on Leopard (and later?); see #19886
destroot.env-append VERSION_CONTROL=off
@@ -79,6 +75,24 @@
depends_lib-append port:slv2
}
+variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
+ depends_build-append port:gcc43
+ configure.compiler macports-gcc-4.3
+ build.env CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
+ destroot.env CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
+}
+
+variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
+ depends_build-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ build.env CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
+ destroot.env CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex "current release: ardour (\\d+(?:\\.\\d+)*)"
Modified: trunk/dports/games/snoopy/Portfile
===================================================================
--- trunk/dports/games/snoopy/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/games/snoopy/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -19,8 +19,7 @@
sha1 4199712f30ca4e60e81f1212c8d06278954d3416 \
rmd160 f8aa6b528f6ee455128dcf235a19feccb3573011
-depends_lib port:gcc43 \
- port:dsniff \
+depends_lib port:dsniff \
port:gettext \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:libgeoip \
@@ -31,8 +30,20 @@
patchfiles patch-brain.c.diff
}
-configure.compiler macports-gcc-4.3
+variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
+ depends_lib-append port:gcc44
+ configure.compiler macports-gcc-4.4
+}
+variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
+ depends_lib-append port:gcc43
+ configure.compiler macports-gcc-4.3
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]?C=M&O=D
livecheck.regex ${name}-(\[0-9.\]+)\\.tar
Modified: trunk/dports/graphics/pgplot/Portfile
===================================================================
--- trunk/dports/graphics/pgplot/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/graphics/pgplot/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -31,12 +31,10 @@
sha1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 \
rmd160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1
-patchfiles-append patch-makemake.diff patch-drivers.list.patch patch-proccom.c.diff
-depends_lib-append port:libpng port:zlib port:g95
-depends_build-append bin:perl:perl5
+patchfiles patch-makemake.diff patch-drivers.list.patch patch-proccom.c.diff
+depends_lib port:libpng port:zlib port:xorg-libX11
+depends_build bin:perl:perl5 port:pkgconfig
-configure.fc ${prefix}/bin/g95
-
# Tell the compiler not to treat backslash characters as C-style escape sequences.
configure.fcflags-append -fno-backslash
@@ -198,11 +196,9 @@
universal_variant no
-variant no_x11 {}
-
-if {![variant_isset no_x11]} {
- depends_lib-append port:xorg-libX11
- depends_build-append port:pkgconfig
+variant no_x11 {
+ depends_lib-delete port:xorg-libX11
+ depends_build-delete port:pkgconfig
}
variant aquaterm description {install driver for aquaterm} {
@@ -213,24 +209,30 @@
}
}
-variant gcc42 description {build with gfortran from gcc42 instead of g95} conflicts gcc43 gcc44 {
- depends_lib-delete port:g95
+variant gcc42 description {build with gfortran from gcc42} conflicts gcc43 gcc44 g95 {
depends_lib-append port:gcc42
configure.fc ${prefix}/bin/gfortran-mp-4.2
}
-variant gcc43 description {build with gfortran from gcc43 instead of g95} conflicts gcc42 gcc44 {
- depends_lib-delete port:g95
+variant gcc43 description {build with gfortran from gcc43} conflicts gcc42 gcc44 g95 {
depends_lib-append port:gcc43
configure.fc ${prefix}/bin/gfortran-mp-4.3
}
-variant gcc44 description {build with gfortran from gcc44 instead of g95} conflicts gcc42 gcc43 {
- depends_lib-delete port:g95
+variant gcc44 description {build with gfortran from gcc44} conflicts gcc42 gcc43 g95 {
depends_lib-append port:gcc44
configure.fc ${prefix}/bin/gfortran-mp-4.4
}
+variant g95 description {build with g95} conflicts gcc42 gcc43 gcc44 {
+ depends_lib-append port:g95
+ configure.fc ${prefix}/bin/g95
+}
+
+if {![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
variant docs description {Create and install docs} {
depends_build-append bin:pdflatex:texlive
Modified: trunk/dports/lang/adaptor/Portfile
===================================================================
--- trunk/dports/lang/adaptor/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/lang/adaptor/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -21,9 +21,7 @@
sha1 6bbcb22e32afbc26a1f3f59ef963a8213c377180 \
rmd160 97cb37a397f68bae98853b11413b867b3d400efa
-depends_lib port:gcc43 port:openmpi port:libtool
-configure.f77 ${prefix}/bin/gfortran-mp-4.3
-configure.f90 ${prefix}/bin/gfortran-mp-4.3
+depends_lib port:openmpi port:libtool
configure.env F77_OPT=-O3 F77_MP="" THR_LIB=-lpthread \
F77_OPENMP=-fopenmp THR_LIB=-lpthread \
MPI_INC="-I${prefix}/include -I${prefix}/include/openmpi" \
@@ -62,8 +60,19 @@
destroot.destdir PREFIX=${destroot}${prefix}/lib/${name}
-variant g95 description {build with g95} {
- depends_lib-delete port:gcc43
+variant gcc43 conflicts g95 gcc44 {build with gfortran 4.3} {
+ depends_lib-append port:gcc43
+ configure.f77 ${prefix}/bin/gfortran-mp-4.3
+ configure.f90 ${prefix}/bin/gfortran-mp-4.3
+}
+
+variant gcc44 conflicts g95 gcc43 {build with gfortran 4.4} {
+ depends_lib-append port:gcc44
+ configure.f77 ${prefix}/bin/gfortran-mp-4.4
+ configure.f90 ${prefix}/bin/gfortran-mp-4.4
+}
+
+variant g95 conflicts gcc43 gcc44 description {build with g95} {
depends_lib-append port:g95
configure.f77 ${prefix}/bin/g95
configure.f90 ${prefix}/bin/g95
@@ -72,3 +81,6 @@
}
+if {![variant_isset gcc43] && ![variant_isset g95]} {
+ default_variants +gcc44
+}
Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/math/R/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -59,7 +59,7 @@
}
if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44]} {
- default_variants +gcc43
+ default_variants +gcc44
}
post-extract {
Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/math/atlas/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -48,14 +48,16 @@
build.target build
build.dir ${workpath}/${name}-${version}/build
-variant gcc43 conflicts gcc42 conflicts universal description {build using macports-gcc-4.3} {}
-variant gcc42 conflicts gcc43 conflicts universal description {build using macports-gcc-4.2} {}
+variant gcc44 conflicts gcc42 gcc43 conflicts universal description {build using macports-gcc-4.4} {}
+variant gcc43 conflicts gcc42 gcc44 conflicts universal description {build using macports-gcc-4.3} {}
+variant gcc42 conflicts gcc43 gcc44 conflicts universal description {build using macports-gcc-4.2} {}
if { [variant_isset gcc42] } {
set gccversion 4.2
} elseif { [variant_isset gcc43] } {
set gccversion 4.3
} else {
+ default_variants +gcc44
set gccversion 4.4
}
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/math/octave/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -94,7 +94,7 @@
}
if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95] } {
- default_variants +gcc43
+ default_variants +gcc44
}
patchfiles patch-lo-specfun.cc.diff patch-configure-no_x11.diff
Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/math/shogun/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -32,8 +32,7 @@
worksrcdir ${name}-${version}/src
depends_build port:bzip2 \
- port:gsed \
- port:gcc43
+ port:gsed
depends_lib port:swig-python \
port:atlas \
@@ -47,16 +46,11 @@
--install-path=${prefix} \
--includes=${prefix}/include \
--destdir=${destroot} \
- --cc=${prefix}/bin/gcc-mp-4.3 \
- --cxx=${prefix}/bin/g++-mp-4.3 \
--includes=${python_prefix}/include/python2.6 \
--python=${python_prefix}/bin/python2.6 \
--pydir=${python_prefix}/lib/python2.6/site-packages \
--disable-doxygen
-configure.cc ${prefix}/bin/gcc-mp-4.3
-configure.compiler macports-gcc-4.3
-
pre-fetch {
if {[ regexp {^[2-8]} os.version]} {
return -code error "Shogun is only supported on leopard or above"
@@ -138,6 +132,26 @@
# configure.args-delete --disable-doxygen
# }
+variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
+ depends_build-append port:gcc43
+ configure.cc ${prefix}/bin/gcc-mp-4.3
+ configure.compiler macports-gcc-4.3
+ configure.args-append --cc=${prefix}/bin/gcc-mp-4.3 \
+ --cxx=${prefix}/bin/g++-mp-4.3
+}
+
+variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
+ depends_build-append port:gcc44
+ configure.cc ${prefix}/bin/gcc-mp-4.4
+ configure.compiler macports-gcc-4.4
+ configure.args-append --cc=${prefix}/bin/gcc-mp-4.4 \
+ --cxx=${prefix}/bin/g++-mp-4.4
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
pre-extract {
# Before doing anything, verify the correct swig bindings are present for
# our variants
Modified: trunk/dports/net/lam/Portfile
===================================================================
--- trunk/dports/net/lam/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/net/lam/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -34,19 +34,25 @@
destroot.args docdir=${prefix}/share/doc/lam
-variant gcc42 description {enable Fortran support with GCC 4.2 } conflicts gcc43 g95 {
+variant gcc42 description {enable Fortran support with GCC 4.2} conflicts gcc43 gcc44 g95 {
depends_lib port:gcc42
configure.args-delete --without-fc
configure.args-append --with-fc=${prefix}/bin/gfortran-mp-4.2
}
-variant gcc43 description {enable Fortran support with GCC 4.3 } conflicts gcc42 g95 {
+variant gcc43 description {enable Fortran support with GCC 4.3} conflicts gcc42 gcc44 g95 {
depends_lib port:gcc43
configure.args-delete --without-fc
configure.args-append --with-fc=${prefix}/bin/gfortran-mp-4.3
}
-variant g95 description {enable Fortran support with G95 } conflicts gcc42 gcc43 {
+variant gcc44 description {enable Fortran support with GCC 4.4} conflicts gcc42 gcc43 g95 {
+ depends_lib port:gcc44
+ configure.args-delete --without-fc
+ configure.args-append --with-fc=${prefix}/bin/gfortran-mp-4.4
+}
+
+variant g95 description {enable Fortran support with G95} conflicts gcc42 gcc43 gcc44 {
depends_lib port:g95
configure.args-delete --without-fc
configure.args-append --with-fc=${prefix}/bin/g95
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py-scipy/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -32,20 +32,27 @@
reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
}
-variant gcc42 conflicts gcc43 description "Use gfortran-mp-4.2 as fortran compiler" {
+variant gcc42 conflicts gcc43 gcc44 description "Use gfortran-mp-4.2 as fortran compiler" {
depends_lib-append port:gcc42
set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
build.cmd-append ${fc_options}
destroot.cmd-append ${fc_options}
}
-variant gcc43 conflicts gcc42 description "Use gfortran-mp-4.3 as fortran compiler" {
+variant gcc43 conflicts gcc42 gcc44 description "Use gfortran-mp-4.3 as fortran compiler" {
depends_lib-append port:gcc43
set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
build.cmd-append ${fc_options}
destroot.cmd-append ${fc_options}
}
-if { ![variant_isset gcc42] && ![variant_isset gcc43] } {
- default_variants +gcc43
+variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
+ depends_lib-append port:gcc44
+ set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
+ build.cmd-append ${fc_options}
+ destroot.cmd-append ${fc_options}
}
+
+if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
+ default_variants +gcc44
+}
Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py25-numpy/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -26,22 +26,13 @@
depends_lib-append port:fftw-3 \
port:py25-nose \
- port:atlas \
- port:gcc43
+ port:atlas
-if {![variant_isset no_gcc43]} {
- configure.compiler macports-gcc-4.3
-}
-
-build.env-append CC="${prefix}/bin/gcc-mp-4.3" \
- CXX="${prefix}/bin/g++-mp-4.3" \
- ATLAS=${prefix}/lib \
+build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
-destroot.env-append CC="${prefix}/bin/gcc-mp-4.3" \
- CXX="${prefix}/bin/g++-mp-4.3" \
- ATLAS=${prefix}/lib \
+destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
@@ -55,15 +46,30 @@
}
}
-variant no_gcc43 description {Do not use the gcc43 compiler (disables fortran code)} {
- depends_lib-delete port:gcc43
- build.env-delete CC="${prefix}/bin/gcc-mp-4.3" \
+variant gcc43 conflicts gcc44 description {Use the gcc43 compiler (enables fortran code)} {
+ depends_lib-append port:gcc43
+ configure.compiler macports-gcc-4.3
+ build.env-append CC="${prefix}/bin/gcc-mp-4.3" \
CXX="${prefix}/bin/g++-mp-4.3"
- destroot.env-delete CC="${prefix}/bin/gcc-mp-4.3" \
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.3" \
CXX="${prefix}/bin/g++-mp-4.3"
}
+variant gcc44 conflicts gcc43 description {Use the gcc44 compiler (enables fortran code)} {
+ depends_lib-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ build.env-append CC="${prefix}/bin/gcc-mp-4.4" \
+ CXX="${prefix}/bin/g++-mp-4.4"
+
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.4" \
+ CXX="${prefix}/bin/g++-mp-4.4"
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
variant no_atlas description {Do not use the macports atlas libs} {
depends_lib-delete port:atlas
build.env-delete ATLAS=${prefix}/lib \
Modified: trunk/dports/python/py25-pymc/Portfile
===================================================================
--- trunk/dports/python/py25-pymc/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py25-pymc/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -31,26 +31,32 @@
patchfiles-append patch-pymc-gibbsit.f.diff
depends_lib-append port:py25-numpy
-variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 g95 {
+variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 g95 {
depends_lib-append port:gcc42
set fc ${prefix}/bin/gfortran-mp-4.2
build.env-append F77=${fc} F90=${fc}
}
-variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 g95 {
+variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 g95 {
depends_lib-append port:gcc43
set fc ${prefix}/bin/gfortran-mp-4.3
build.env-append F77=${fc} F90=${fc}
}
-variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 {
+variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 g95 {
+ depends_lib-append port:gcc44
+ set fc ${prefix}/bin/gfortran-mp-4.4
+ build.env-append F77=${fc} F90=${fc}
+}
+
+variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 {
depends_lib-append port:g95
set fc ${prefix}/bin/g95
build.env-append F77=${fc} F90=${fc}
}
-if {![variant_isset gcc42] && ![variant_isset g95]} {
- default_variants +gcc43
+if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset g95]} {
+ default_variants +gcc44
}
livecheck.regex <a href=\"http://pymc.googlecode.com/files/pymc-(\[\\d\.\]+)${extract.suffix}
Modified: trunk/dports/python/py25-pynifti/Portfile
===================================================================
--- trunk/dports/python/py25-pynifti/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py25-pynifti/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -23,10 +23,7 @@
port:nifticlib \
port:swig-python
-depends_build port:gcc43
-
build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
-configure.compiler macports-gcc-4.3
distfiles pynifti_${version}${extract.suffix}
worksrcdir pynifti-${version}
@@ -44,5 +41,20 @@
error "python variant of swig required"
}
}
+
+variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
+ depends_build-append port:gcc43
+ configure.compiler macports-gcc-4.3
+}
+
+variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
+ depends_build-append port:gcc44
+ configure.compiler macports-gcc-4.4
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
livecheck.url http://sourceforge.net/export/rss2_projfiles.php?project=niftilib
livecheck.regex {pynifti_([0-9.]+).tar.gz}
Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py25-scipy/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -90,7 +90,7 @@
}
if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
- default_variants +gcc43
+ default_variants +gcc44
}
livecheck.type regex
Modified: trunk/dports/python/py26-logilab-hmm/Portfile
===================================================================
--- trunk/dports/python/py26-logilab-hmm/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-logilab-hmm/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -55,7 +55,7 @@
}
if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
- default_variants +gcc43
+ default_variants +gcc44
}
post-destroot {
Modified: trunk/dports/python/py26-ngl/Portfile
===================================================================
--- trunk/dports/python/py26-ngl/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-ngl/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -38,29 +38,36 @@
depends_lib-append port:py26-nio
-configure.compiler macports-gcc-4.3
build.env PNG_PREFIX=${prefix} \
ZLIB_PREFIX=${prefix} \
- CC=${configure.cc} \
- F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc43 \
NCARG_ROOT=${prefix}
destroot.env NCARG_ROOT=${prefix}
-if {![variant_isset g95] && ![variant_isset universal]} {
- default_variants +gcc43
+if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset universal]} {
+ default_variants +gcc44
}
-variant gcc43 conflicts g95 description {link to libraries build with gfortran} {
+variant gcc43 conflicts g95 gcc44 universal description {link to libraries build with gfortran 4.3} {
depends_build-append port:gcc43
+ configure.compiler macports-gcc-4.3
build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc43
+ F2CLIBS_PREFIX=${prefix}/lib/gcc43 \
+ CC=${configure.cc}
}
-variant g95 conflicts gcc43 description {link to libraries build with g95} {
+variant gcc44 conflicts g95 gcc43 universal description {link to libraries build with gfortran 4.4} {
+ depends_build-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ build.env-append F2CLIBS=gfortran \
+ F2CLIBS_PREFIX=${prefix}/lib/gcc44 \
+ CC=${configure.cc}
+}
+
+variant g95 conflicts gcc43 gcc44 universal description {link to libraries build with g95} {
depends_build-append port:g95
build.env-append F2CLIBS=f95 \
- F2CLIBS_PREFIX=${prefix}/lib
+ F2CLIBS_PREFIX=${prefix}/lib \
+ CC=${configure.cc}
}
livecheck.type regex
Modified: trunk/dports/python/py26-nio/Portfile
===================================================================
--- trunk/dports/python/py26-nio/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-nio/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -37,30 +37,40 @@
reinplace "s|__init__(obj)|__init__()|" ${worksrcpath}/Nio.py
}
-depends_build port:gcc43
depends_lib-append port:ncarg \
port:py26-numpy
-configure.compiler macports-gcc-4.3
build.env-append HAS_GRIB2=1 GRIB2_PREFIX=${prefix} \
HAS_HDFEOS=1 HDFEOS_PREFIX=${prefix} \
HAS_NETCDF4=1 NETCDF4_PREFIX=${prefix} \
- CC=${configure.cc} \
NCARG_ROOT=${prefix}
destroot.env NCARG_ROOT=${prefix}
-if {![variant_isset g95] && ![variant_isset universal]} {
- default_variants +gcc43
+if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset universal]} {
+ default_variants +gcc44
}
-variant gcc43 conflicts g95 description {link to libraries build with gfortran} {
+variant gcc43 conflicts g95 gcc44 universal description {link to libraries build with gfortran 4.3} {
+ depends_build-append port:gcc43
+ configure.compiler macports-gcc-4.3
build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc43
+ F2CLIBS_PREFIX=${prefix}/lib/gcc43 \
+ CC=${configure.cc}
}
-variant g95 conflicts gcc43 description {link to libraries build with g95} {
+variant gcc44 conflicts g95 gcc43 universal description {link to libraries build with gfortran 4.4} {
+ depends_build-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ build.env-append F2CLIBS=gfortran \
+ F2CLIBS_PREFIX=${prefix}/lib/gcc44 \
+ CC=${configure.cc}
+}
+
+variant g95 conflicts gcc43 gcc44 universal description {link to libraries build with g95} {
+ depends_build-append port:g95
build.env-append F2CLIBS=f95 \
- F2CLIBS_PREFIX=${prefix}/lib
+ F2CLIBS_PREFIX=${prefix}/lib \
+ CC=${configure.cc}
}
livecheck.type regex
Modified: trunk/dports/python/py26-numpy/Portfile
===================================================================
--- trunk/dports/python/py26-numpy/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-numpy/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -28,22 +28,13 @@
depends_lib-append port:fftw-3 \
port:py26-nose \
- port:atlas \
- port:gcc43
+ port:atlas
-if {![variant_isset no_gcc43]} {
- configure.compiler macports-gcc-4.3
-}
-
-build.env-append CC="${prefix}/bin/gcc-mp-4.3" \
- CXX="${prefix}/bin/g++-mp-4.3" \
- ATLAS=${prefix}/lib \
+build.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
-destroot.env-append CC="${prefix}/bin/gcc-mp-4.3" \
- CXX="${prefix}/bin/g++-mp-4.3" \
- ATLAS=${prefix}/lib \
+destroot.env-append ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
BLAS=${prefix}/lib
@@ -51,15 +42,30 @@
reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" ${worksrcpath}/numpy/f2py/setup.py
}
-variant no_gcc43 description {Do not use the gcc43 compiler (disables fortran code)} {
- depends_lib-delete port:gcc43
- build.env-delete CC="${prefix}/bin/gcc-mp-4.3" \
+variant gcc43 conflicts gcc44 description {Use the gcc43 compiler (enables fortran code)} {
+ depends_lib-append port:gcc43
+ configure.compiler macports-gcc-4.3
+ build.env-append CC="${prefix}/bin/gcc-mp-4.3" \
CXX="${prefix}/bin/g++-mp-4.3"
- destroot.env-delete CC="${prefix}/bin/gcc-mp-4.3" \
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.3" \
CXX="${prefix}/bin/g++-mp-4.3"
}
+variant gcc44 conflicts gcc43 description {Use the gcc44 compiler (enables fortran code)} {
+ depends_lib-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ build.env-append CC="${prefix}/bin/gcc-mp-4.4" \
+ CXX="${prefix}/bin/g++-mp-4.4"
+
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.4" \
+ CXX="${prefix}/bin/g++-mp-4.4"
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
variant no_atlas description {Do not use the macports atlas libs} {
build.env-delete ATLAS=${prefix}/lib \
LAPACK=${prefix}/lib \
Modified: trunk/dports/python/py26-pymc/Portfile
===================================================================
--- trunk/dports/python/py26-pymc/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-pymc/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -31,26 +31,32 @@
patchfiles-append patch-pymc-gibbsit.f.diff
depends_lib-append port:py26-numpy
-variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 g95 {
+variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 g95 {
depends_lib-append port:gcc42
set fc ${prefix}/bin/gfortran-mp-4.2
build.env-append F77=${fc} F90=${fc}
}
-variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 g95 {
+variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 g95 {
depends_lib-append port:gcc43
set fc ${prefix}/bin/gfortran-mp-4.3
build.env-append F77=${fc} F90=${fc}
}
-variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 {
+variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 g95 {
+ depends_lib-append port:gcc44
+ set fc ${prefix}/bin/gfortran-mp-4.4
+ build.env-append F77=${fc} F90=${fc}
+}
+
+variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 {
depends_lib-append port:g95
set fc ${prefix}/bin/g95
build.env-append F77=${fc} F90=${fc}
}
-if {![variant_isset gcc42] && ![variant_isset g95]} {
- default_variants +gcc43
+if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset g95]} {
+ default_variants +gcc44
}
livecheck.regex <a href=\"http://pymc.googlecode.com/files/pymc-(\[\\d\.\]+)${extract.suffix}
Modified: trunk/dports/python/py26-pynifti/Portfile
===================================================================
--- trunk/dports/python/py26-pynifti/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-pynifti/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -23,10 +23,7 @@
port:nifticlib \
port:swig-python
-depends_build port:gcc43
-
build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
-configure.compiler macports-gcc-4.3
distfiles pynifti_${version}${extract.suffix}
worksrcdir pynifti-${version}
@@ -44,5 +41,20 @@
error "python variant of swig required"
}
}
+
+variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
+ depends_build-append port:gcc43
+ configure.compiler macports-gcc-4.3
+}
+
+variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
+ depends_build-append port:gcc44
+ configure.compiler macports-gcc-4.4
+}
+
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
+
livecheck.url http://sourceforge.net/export/rss2_projfiles.php?project=niftilib
livecheck.regex {pynifti_([0-9.]+).tar.gz}
Modified: trunk/dports/python/py26-scipy/Portfile
===================================================================
--- trunk/dports/python/py26-scipy/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/python/py26-scipy/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -85,7 +85,7 @@
}
if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
- default_variants +gcc43
+ default_variants +gcc44
}
python.add_archflags no
Modified: trunk/dports/science/emos/Portfile
===================================================================
--- trunk/dports/science/emos/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/emos/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -89,12 +89,12 @@
}
use_parallel_build no
-#if {![variant_isset g95]} {
- default_variants +gcc43
-#}
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
universal_variant no
-variant gcc43 conflicts description {builds fortran interface with gfortran} {
+variant gcc43 conflicts gcc44 description {builds fortran interface with gfortran 4.3} {
depends_build-append port:gcc43
configure.args-delete --disable-fortran
configure.compiler macports-gcc-4.3
@@ -102,7 +102,15 @@
configure.cflags-append -DPOINTER_64 -DINTEGER_IS_INT
}
-#variant g95 conflicts gcc43 universal description {builds fortran interface with g95} {
+variant gcc44 conflicts gcc43 description {builds fortran interface with gfortran 4.4} {
+ depends_build-append port:gcc44
+ configure.args-delete --disable-fortran
+ configure.compiler macports-gcc-4.4
+ configure.fflags-append -fdefault-real-8 -fdefault-double-8 -fcray-pointer -fno-second-underscore -DPOINTER_64 -DINTEGER_IS_INT -Dlinux -Dgfortran
+ configure.cflags-append -DPOINTER_64 -DINTEGER_IS_INT
+}
+
+#variant g95 conflicts gcc43 gcc44 universal description {builds fortran interface with g95} {
# depends_build-append port:g95
# configure.args-delete --disable-fortran
# configure.fc ${prefix}/bin/g95
Modified: trunk/dports/science/eo/Portfile
===================================================================
--- trunk/dports/science/eo/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/eo/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -58,10 +58,18 @@
configure.args-delete --disable-tutorial
}
-variant gcc43 description "Use GCC 4.3 for compilation of EO - optimized for host machine" {
+variant gcc43 conflicts gcc44 description "Use GCC 4.3 for compilation of EO - optimized for host machine" {
depends_build-append port:gcc43
configure.cc gcc-mp-4.3
configure.cxx g++-mp-4.3
configure.cflags-append "-ftree-vectorize -march=native -O3"
configure.cxxflags-append "-ftree-vectorize -march=native -O3"
}
+
+variant gcc44 conflicts gcc43 description "Use GCC 4.4 for compilation of EO - optimized for host machine" {
+ depends_build-append port:gcc44
+ configure.cc gcc-mp-4.4
+ configure.cxx g++-mp-4.4
+ configure.cflags-append "-ftree-vectorize -march=native -O3"
+ configure.cxxflags-append "-ftree-vectorize -march=native -O3"
+}
Modified: trunk/dports/science/grib_api/Portfile
===================================================================
--- trunk/dports/science/grib_api/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/grib_api/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -54,14 +54,14 @@
}
}
-if {![variant_isset g95]} {
- default_variants +gcc43
+if {![variant_isset g95] && ![variant_isset gcc43]} {
+ default_variants +gcc44
}
variant emos conflicts g95 description {conduct test using emos} {
}
-variant gcc43 conflicts g95 description {builds fortran interface with gfortran} {
+variant gcc43 conflicts g95 gcc44 description {builds fortran interface with gfortran 4.3} {
depends_build-append port:gcc43 port:emos
configure.args-delete --disable-fortran
configure.compiler macports-gcc-4.3
@@ -70,7 +70,16 @@
--with-emos=-lemosR64
}
-variant g95 conflicts gcc43 emos universal description {builds fortran interface with g95} {
+variant gcc44 conflicts g95 gcc43 description {builds fortran interface with gfortran 4.4} {
+ depends_build-append port:gcc44 port:emos
+ configure.args-delete --disable-fortran
+ configure.compiler macports-gcc-4.4
+ configure.args-append --with-fortranlibdir=${prefix}/lib/gcc44 \
+ --with-fortranlibs=-lgfortran \
+ --with-emos=-lemosR64
+}
+
+variant g95 conflicts gcc43 gcc44 emos universal description {builds fortran interface with g95} {
depends_build-append port:g95
configure.args-delete --disable-fortran
configure.fc ${prefix}/bin/g95
Modified: trunk/dports/science/hdf4/Portfile
===================================================================
--- trunk/dports/science/hdf4/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/hdf4/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -44,18 +44,24 @@
}
}
-variant g95 conflicts gcc43 conflicts universal description {build with g95} {
+variant g95 conflicts gcc43 gcc44 universal description {build with g95} {
configure.args-delete --disable-fortran
depends_build-append port:g95
- configure.env-append F77=${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
}
-variant gcc43 conflicts g95 conflicts universal description {build with gfortran} {
+variant gcc43 conflicts g95 gcc44 universal description {build with gfortran 4.3} {
configure.args-delete --disable-fortran
depends_build-append port:gcc43
- configure.env-append F77=${prefix}/bin/gfortran-mp-4.3
+ configure.f77 ${prefix}/bin/gfortran-mp-4.3
}
+variant gcc44 conflicts g95 gcc43 universal description {build with gfortran 4.4} {
+ configure.args-delete --disable-fortran
+ depends_build-append port:gcc44
+ configure.f77 ${prefix}/bin/gfortran-mp-4.4
+}
+
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex {The latest Official Release of HDF is ([0-9]+\.[0-9]+r[0-9]+)}
Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/hdf5/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -47,7 +47,7 @@
configure.args-delete --disable-fortran
configure.args-append --enable-fortran
pre-fetch {
- if { ![variant_isset gcc43] && ![variant_isset gcc42] && ![variant_isset g95] } {
+ if { ![variant_isset gcc44] && ![variant_isset gcc43] && ![variant_isset gcc42] && ![variant_isset g95] } {
error "You must specify a compiler variant in order to build the Fortran interface"
}
}
@@ -65,31 +65,37 @@
}
-variant gcc42 conflicts g95 gcc43 description {Compile using GCC 4.2} {
+variant gcc42 conflicts g95 gcc43 gcc44 description {Compile using GCC 4.2} {
depends_lib-append port:gcc42
configure.compiler macports-gcc-4.2
}
-variant gcc43 conflicts g95 gcc42 description {Compile using GCC 4.3} {
+variant gcc43 conflicts g95 gcc42 gcc44 description {Compile using GCC 4.3} {
depends_lib-append port:gcc43
configure.compiler macports-gcc-4.3
configure.env-append LD=${prefix}/bin/g++-mp-4.3
}
-variant g95 requires fortran conflicts gcc42 gcc43 description {Use g95 Fortran compiler (unsupported)} {
+variant gcc44 conflicts g95 gcc42 gcc43 description {Compile using GCC 4.4} {
+ depends_lib-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ configure.env-append LD=${prefix}/bin/g++-mp-4.4
+}
+
+variant g95 requires fortran conflicts gcc42 gcc43 gcc44 description {Use g95 Fortran compiler (unsupported)} {
depends_lib-append port:g95
patchfiles-append patch-powerpc-apple.diff
configure.fc ${prefix}/bin/g95
}
-variant optimized description {Higher compiler optimization for host machine (esp. for gcc43)} {
+variant optimized description {Higher compiler optimization for host machine (esp. for gcc43/gcc44)} {
configure.cflags-delete -O2
configure.cxxflags-delete -O2
configure.fflags-delete -O2
configure.cflags-append -ftree-vectorize -O3
configure.cxxflags-append -ftree-vectorize -O3
configure.fflags-append -ftree-vectorize -O3
- if { [variant_isset gcc43] } {
+ if { [variant_isset gcc43] || [variant_isset gcc44] } {
configure.cflags-append -march=native
configure.cxxflags-append -march=native
configure.fflags-append -march=native
Modified: trunk/dports/science/libnc-dap/Portfile
===================================================================
--- trunk/dports/science/libnc-dap/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/libnc-dap/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -27,16 +27,21 @@
port:libdap \
port:libxml2
-if {![variant_isset g95]} {
- default_variants +gcc43
+if {![variant_isset g95] && ![variant_isset gcc43]} {
+ default_variants +gcc44
}
-variant gcc43 conflicts g95 description {Build using gcc43} {
+variant gcc43 conflicts g95 gcc44 description {Build using gcc43} {
depends_build-append port:gcc43
configure.fc ${prefix}/bin/gfortran-mp-4.3
}
-variant g95 conflicts gcc43 description {Build using g95} {
+variant gcc44 conflicts g95 gcc43 description {Build using gcc44} {
+ depends_build-append port:gcc44
+ configure.fc ${prefix}/bin/gfortran-mp-4.4
+}
+
+variant g95 conflicts gcc43 gcc44 description {Build using g95} {
depends_build-append port:g95
configure.fc ${prefix}/bin/g95
}
Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/magicspp/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -38,9 +38,9 @@
use_parallel_build no
universal_variant no
-#if {![variant_isset g95]} {
- default_variants +gcc43
-#}
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
patchfiles patch-src-Makefile.in.diff \
patch-configure.diff \
@@ -66,12 +66,17 @@
--with-emos-libraries=${prefix}/lib \
--with-gs-font-dir=${prefix}/share/ghostscript/fonts
-variant gcc43 conflicts description {for emos +gcc43} {
+variant gcc43 conflicts gcc44 description {for emos +gcc43} {
configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -L${prefix}/lib/gcc43 -lgfortran -lnetcdf_c++ -lnetcdf
configure.compiler macports-gcc-4.3
}
-#variant g95 conflicts gcc43 description {for emos +g95} {
+variant gcc44 conflicts gcc43 description {for emos +gcc44} {
+ configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -L${prefix}/lib/gcc44 -lgfortran -lnetcdf_c++ -lnetcdf
+ configure.compiler macports-gcc-4.4
+}
+
+#variant g95 conflicts gcc43 gcc44 description {for emos +g95} {
# configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -lf95 -lnetcdf_c++ -lnetcdf
# configure.f77 ${prefix}/bin/g95
#}
Modified: trunk/dports/science/miriad/Portfile
===================================================================
--- trunk/dports/science/miriad/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/miriad/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -37,9 +37,18 @@
# We need Fortran support, which the Apple version of GCC doesn't offer.
# So we force the use of a specified MacPorts-built GCC.
-set compilerport gcc43
-set compilerident macports-gcc-4.3
+variant gcc43 conflicts gcc44 description {build with gcc 4.3} {}
+variant gcc44 conflicts gcc43 description {build with gcc 4.4} {}
+if {[variant_isset gcc43]} {
+ set compilerport gcc43
+ set compilerident macports-gcc-4.3
+} else {
+ set compilerport gcc44
+ set compilerident macports-gcc-4.4
+ default_variants +gcc44
+}
+
universal_variant no
depends_build-append port:${compilerport}
Modified: trunk/dports/science/molden/Portfile
===================================================================
--- trunk/dports/science/molden/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/molden/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -84,7 +84,7 @@
}
if {![variant_isset gcc43] && ![variant_isset gcc44]} {
- default_variants +gcc43
+ default_variants +gcc44
}
variant opengl description "Install moldenogl OpenGL helper program" {
Modified: trunk/dports/science/mpich2/Portfile
===================================================================
--- trunk/dports/science/mpich2/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/mpich2/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -38,7 +38,7 @@
use_parallel_build no
-variant g95 description {Enable Fortran 77 and Fortran 90 bindings using g95} conflicts gcc42 gcc43 {
+variant g95 description {Enable Fortran 77 and Fortran 90 bindings using g95} conflicts gcc42 gcc43 gcc44 {
depends_lib-append port:g95
configure.f77 "${prefix}/bin/g95"
configure.fflags "-i4"
@@ -47,13 +47,19 @@
configure.args-append --enable-f77 --enable-f90
}
-variant gcc43 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43} conflicts g95 gcc42 {
+variant gcc44 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44} conflicts g95 gcc42 gcc43 {
+ depends_lib-append port:gcc44
+ configure.compiler macports-gcc-4.4
+ configure.args-append --enable-f77 --enable-f90
+}
+
+variant gcc43 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43} conflicts g95 gcc42 gcc44 {
depends_lib-append port:gcc43
configure.compiler macports-gcc-4.3
configure.args-append --enable-f77 --enable-f90
}
-variant gcc42 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42} conflicts g95 gcc43 {
+variant gcc42 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42} conflicts g95 gcc43 gcc44 {
depends_lib-append port:gcc42
configure.compiler macports-gcc-4.2
configure.args-append --enable-f77 --enable-f90
Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/ncarg/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -39,8 +39,7 @@
port:libxml2 \
port:xorg-libXaw \
lib:libXm:lesstif
-depends_build port:gcc43 \
- port:triangle
+depends_build port:triangle
use_parallel_build no
universal_variant no
@@ -63,10 +62,14 @@
if {[variant_isset g95]} {
reinplace "s|-lgfortran|-lf95|" ${worksrcpath}/config/${f}
reinplace "s| gfortran$| g95|" ${worksrcpath}/config/${f}
+ } elseif {[variant_isset gcc43]} {
+ reinplace "s|-lgfortran|-L${prefix}/lib/gcc43 -lgfortran|" \
+ ${worksrcpath}/config/${f}
+ reinplace "s| gfortran$| gfortran-mp-4.3|" ${worksrcpath}/config/${f}
} else {
- reinplace "s|-lgfortran|-L${prefix}/lib/gcc43 -lgfortran|" \
- ${worksrcpath}/config/${f}
- reinplace "s| gfortran$| gfortran-mp-4.3|" ${worksrcpath}/config/${f}
+ reinplace "s|-lgfortran|-L${prefix}/lib/gcc44 -lgfortran|" \
+ ${worksrcpath}/config/${f}
+ reinplace "s| gfortran$| gfortran-mp-4.4|" ${worksrcpath}/config/${f}
}
reinplace "s|gcc$|${configure.cc}|" ${worksrcpath}/config/${f}
reinplace "/CcOptions/d" ${worksrcpath}/config/${f}
@@ -129,11 +132,22 @@
build.target Build
-variant g95 description {compile with g95} {
- depends_build-delete port:gcc43
+variant g95 conflicts gcc43 gcc44 description {compile with g95} {
depends_build-append port:g95
}
+variant gcc43 conflicts gcc44 g95 description {compile with gcc 4.3} {
+ depends_build-append port:gcc43
+}
+
+variant gcc44 conflicts gcc43 g95 description {compile with gcc 4.4} {
+ depends_build-append port:gcc44
+}
+
+if {![variant_isset gcc43] && ![variant_isset g95]} {
+ default_variants +gcc44
+}
+
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex {Current Version:.* .*([0-9]+\.[0-9]+\.[0-9]+)}
Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/netcdf/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -52,14 +52,21 @@
depends_build bin:tex:texlive
-variant gcc43 description conflicts g95 description {Enable Fortran support with gfortran} {
+variant gcc43 conflicts g95 gcc44 description {Enable Fortran support with gfortran 4.3} {
depends_lib-append port:gcc43
configure.args-delete --disable-fortran-compiler-check --disable-f77 --disable-f90
configure.cppflags-append -DpgiFortran
configure.compiler macports-gcc-4.3
}
-variant g95 description conflicts gcc43 description {Enable Fortran support with g95} {
+variant gcc44 conflicts g95 gcc43 description {Enable Fortran support with gfortran 4.4} {
+ depends_lib-append port:gcc44
+ configure.args-delete --disable-fortran-compiler-check --disable-f77 --disable-f90
+ configure.cppflags-append -DpgiFortran
+ configure.compiler macports-gcc-4.4
+}
+
+variant g95 conflicts gcc43 gcc44 description {Enable Fortran support with g95} {
depends_lib-append port:g95
configure.args-delete --disable-fortran-compiler-check --disable-f77 --disable-f90
#-lfg95 required or the tests fail
Modified: trunk/dports/science/netcdf-devel/Portfile
===================================================================
--- trunk/dports/science/netcdf-devel/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/netcdf-devel/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -65,14 +65,21 @@
port:curl
depends_build bin:tex:texlive
-variant gcc43 description conflicts g95 description {Enable Fortran support with gfortran} {
+variant gcc43 conflicts g95 gcc44 description {Enable Fortran support with gfortran 4.3} {
depends_lib-append port:gcc43
configure.args-delete --disable-fortran-compiler-check --disable-f77 --disable-f90
configure.cppflags-append -DpgiFortran
configure.compiler macports-gcc-4.3
}
-variant g95 description conflicts gcc43 description {Enable Fortran support with g95} {
+variant gcc44 conflicts g95 gcc43 description {Enable Fortran support with gfortran 4.4} {
+ depends_lib-append port:gcc44
+ configure.args-delete --disable-fortran-compiler-check --disable-f77 --disable-f90
+ configure.cppflags-append -DpgiFortran
+ configure.compiler macports-gcc-4.4
+}
+
+variant g95 conflicts gcc43 gcc44 description {Enable Fortran support with g95} {
depends_lib-append port:g95
configure.args-delete --disable-fortran-compiler-check --disable-f77 --disable-f90
#-lfg95 required or the tests fail
Modified: trunk/dports/science/openmpi/Portfile
===================================================================
--- trunk/dports/science/openmpi/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/openmpi/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -110,7 +110,7 @@
# dependents like netcdf need some form of fortran
if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset g95]} {
- default_variants +gcc43
+ default_variants +gcc44
}
livecheck.type regex
Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/plplot/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -129,15 +129,20 @@
# variant gcw is deleted since it has been deprecated
# gd driver (gif, jpeg, png, svg) has been deprecated
-if {![variant_isset g95] && ![variant_isset universal]} {
- default_variants +gcc43
+if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset universal]} {
+ default_variants +gcc44
}
-variant gcc43 conflicts g95 conflicts universal description {Build using gcc43} {
+variant gcc43 conflicts g95 gcc44 universal description {Build using gcc43} {
depends_lib-append port:gcc43
configure.args-append -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.3\" \
-DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
}
-variant g95 conflicts gcc43 conflicts universal description {Build using g95} {
+variant gcc44 conflicts g95 gcc43 universal description {Build using gcc44} {
+ depends_lib-append port:gcc44
+ configure.args-append -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.4\" \
+ -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
+}
+variant g95 conflicts gcc43 gcc44 universal description {Build using g95} {
depends_lib-append port:g95
configure.args-append -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/g95\" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=\"\"
Modified: trunk/dports/science/xmedcon/Portfile
===================================================================
--- trunk/dports/science/xmedcon/Portfile 2010-06-17 16:49:53 UTC (rev 68905)
+++ trunk/dports/science/xmedcon/Portfile 2010-06-17 18:17:40 UTC (rev 68906)
@@ -25,9 +25,10 @@
--disable-gui \
--with-png-prefix=${prefix}
+if {![variant_isset gcc43]} {
+ default_variants +gcc44
+}
-default_variants +gcc43
-
variant gtk2 conflicts gtk1 description {Enable gtk2 gui front end} {
configure.args-delete --disable-gui
@@ -42,9 +43,14 @@
configure.args-append --enable-gtk1
}
-variant gcc43 description {Enable gcc43 compiler support} {
+variant gcc43 conflicts gcc44 description {Enable gcc43 compiler support} {
depends_lib-append port:gcc43
configure.compiler macports-gcc-4.3
}
+variant gcc44 conflicts gcc43 description {Enable gcc44 compiler support} {
+ depends_lib-append port:gcc44
+
+ configure.compiler macports-gcc-4.4
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100617/6f25f631/attachment-0001.html>
More information about the macports-changes
mailing list