[28515] trunk/dports/science
source_changes at macosforge.org
source_changes at macosforge.org
Sun Sep 2 14:43:01 PDT 2007
Revision: 28515
http://trac.macosforge.org/projects/macports/changeset/28515
Author: mww at macports.org
Date: 2007-09-02 14:43:01 -0700 (Sun, 02 Sep 2007)
Log Message:
-----------
remove configure.env as far as possible
Modified Paths:
--------------
trunk/dports/science/boinc/Portfile
trunk/dports/science/cdo/Portfile
trunk/dports/science/gdal/Portfile
trunk/dports/science/geos/Portfile
trunk/dports/science/gnucap/Portfile
trunk/dports/science/grads/Portfile
trunk/dports/science/gromacs/Portfile
trunk/dports/science/hdf5/Portfile
trunk/dports/science/libnc-dap/Portfile
trunk/dports/science/libstree/Portfile
trunk/dports/science/mpich/Portfile
trunk/dports/science/mpich2/Portfile
trunk/dports/science/nco/Portfile
trunk/dports/science/netcdf/Portfile
trunk/dports/science/openbabel/Portfile
trunk/dports/science/openmpi/Portfile
trunk/dports/science/tempo/Portfile
trunk/dports/science/udunits/Portfile
trunk/dports/science/xloops/Portfile
Modified: trunk/dports/science/boinc/Portfile
===================================================================
--- trunk/dports/science/boinc/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/boinc/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -19,13 +19,13 @@
--disable-server \
--bindir=${prefix}/libexec/${name}
-variant ppc750 { configure.env CFLAGS="-O2 -mcpu=750 -pipe" \
- CXXFLAGS="-02 -mcpu=750 -pipe"
+variant ppc750 { configure.cflags "-O2 -mcpu=750 -pipe"
+ configure.cxxflags "-02 -mcpu=750 -pipe"
configure.args-append --program-suffix=_ppc750
}
-variant ppc7450 { configure.env CFLAGS="-O3 -maltivec -fast -mcpu=7450" \
- CXXFLAGS="-O3 -maltivec -fast -mcpu=7450"
+variant ppc7450 { configure.cflags "-O3 -maltivec -fast -mcpu=7450"
+ configure.cxxflags "-O3 -maltivec -fast -mcpu=7450"
configure.args-append --program-suffix=_ppc7450
}
Modified: trunk/dports/science/cdo/Portfile
===================================================================
--- trunk/dports/science/cdo/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/cdo/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -1,4 +1,4 @@
-# $Id: Portfile 22919 2007-03-19 09:40:23Z takanori at macports.org $
+# $Id$
PortSystem 1.0
name cdo
version 1.0.8
@@ -16,7 +16,7 @@
There are more than 200 operators available.
depends_lib port:netcdf
-configure.env LDFLAGS="-flat_namespace -undefined suppress"
+configure.ldflags "-flat_namespace -undefined suppress"
configure.args --with-netcdf=${prefix} --disable-dependency-tracking
post-destroot {
Modified: trunk/dports/science/gdal/Portfile
===================================================================
--- trunk/dports/science/gdal/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/gdal/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -59,7 +59,7 @@
}
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
build.target
Modified: trunk/dports/science/geos/Portfile
===================================================================
--- trunk/dports/science/geos/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/geos/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -17,5 +17,5 @@
checksums md5 272132bfb64422915d0f748f5e26932b
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
Modified: trunk/dports/science/gnucap/Portfile
===================================================================
--- trunk/dports/science/gnucap/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/gnucap/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -21,8 +21,6 @@
patchfiles patch-Make2.g++
-#configure.env CCFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-
destroot {
xinstall -m 555 ${worksrcpath}/src/O/gnucap \
${destroot}${prefix}/bin
Modified: trunk/dports/science/grads/Portfile
===================================================================
--- trunk/dports/science/grads/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/grads/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -31,9 +31,9 @@
patchfiles patch-configure patch-grads.h patch-wgrib.c \
patch-bufrscan.c patch-gacfg.c
-configure.env CPPFLAGS="-I/usr/include -I${prefix}/include" \
- LDFLAGS="-L/usr/lib -L${prefix}/lib" \
- LIBS="-lwmf" SUPPLIBS=${prefix}
+configure.cppflags "-I/usr/include -I${prefix}/include"
+configure.ldflags "-L/usr/lib -L${prefix}/lib"
+configure.env LIBS="-lwmf" SUPPLIBS=${prefix}
configure.args --prefix=${prefix} --with-lats --with-x
pre-build {
Modified: trunk/dports/science/gromacs/Portfile
===================================================================
--- trunk/dports/science/gromacs/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/gromacs/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -23,9 +23,6 @@
depends_lib port:fftw-3-single
-configure.env LDFLAGS="-L${prefix}/lib" \
- CPPFLAGS="-I${prefix}/include"
-
configure.args --exec-prefix=${prefix}/lib/${name} \
--mandir=${prefix}/share/man
Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/hdf5/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -12,7 +12,6 @@
checksums md5 67187b3253b89f1f41756b7fd4396ecf
depends_lib port:zlib
configure.args --enable-cxx --with-zlib=${prefix}/lib
-configure.env CPPFLAGS=-I${prefix}/include
destroot.destdir prefix=${destroot}${prefix}
patchfiles patch-commence.in patch-c-commence.in
Modified: trunk/dports/science/libnc-dap/Portfile
===================================================================
--- trunk/dports/science/libnc-dap/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/libnc-dap/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -26,18 +26,18 @@
platform powerpc {
if {![variant_isset g95]} {
depends_lib-append port:gcc40
- configure.env-append FC=gfortran-mp-4.0
+ configure.fc ${prefix}/bin/gfortran-mp-4.0
}
}
platform i386 {
if {![variant_isset g95]} {
depends_lib-append port:gcc42
- configure.env-append FC=gfortran-mp-4.2
+ configure.fc ${prefix}/bin/gfortran-mp-4.2
}
}
variant g95 {
depends_lib-append port:g95
- configure.env-append FC=${prefix}/bin/g95
+ configure.fc ${prefix}/bin/g95
}
Modified: trunk/dports/science/libstree/Portfile
===================================================================
--- trunk/dports/science/libstree/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/libstree/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -25,6 +25,6 @@
}
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/mpich/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -46,6 +46,6 @@
}
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
Modified: trunk/dports/science/mpich2/Portfile
===================================================================
--- trunk/dports/science/mpich2/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/mpich2/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -28,13 +28,14 @@
--with-htmldir=${prefix}/share/doc/${name}
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
variant g95 {
depends_lib-append port:g95
- configure.env-append F77="$prefix/bin/g95" FFLAGS="-i4" \
- F90="$prefix/bin/g95" F90FLAGS="-i4"
+ configure.f77 "$prefix/bin/g95"
+ configure.env-append FFLAGS="-i4" F90FLAGS="-i4"
+ configure.f90 "$prefix/bin/g95"
configure.args-append --enable-f77 --enable-f90
}
Modified: trunk/dports/science/nco/Portfile
===================================================================
--- trunk/dports/science/nco/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/nco/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -35,8 +35,8 @@
patchfiles patch-configure
-configure.env MACOSX_DEPLOYMENT_TARGET=10.4 \
- CPPFLAGS=-I/usr/include/malloc
+configure.env MACOSX_DEPLOYMENT_TARGET=10.4
+configure.cppflags -I/usr/include/malloc
configure.args --disable-ncoxx --disable-dependency-tracking \
--mandir=${prefix}/share/man
Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/netcdf/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -25,9 +25,9 @@
checksums sha1 ff2d11d2708df08a2370999b19e2c277607afc06
use_bzip2 yes
-configure.env CPPFLAGS="-DNDEBUG -Df2cFortran" \
- CXXFLAGS="-O2 -fno-common" \
- CFLAGS="-O2 -fno-common"
+configure.cppflags "-DNDEBUG -Df2cFortran"
+configure.cxxflags "-O2 -fno-common"
+configure.cflags "-O2 -fno-common"
configure.args --enable-shared
test.run yes
@@ -42,6 +42,6 @@
variant g95 {
depends_lib port:g95
- configure.env-append FC=${prefix}/bin/g95 \
- FCFLAGS=-O2
+ configure.fc ${prefix}/bin/g95
+ configure.env-append FCFLAGS=-O2
}
Modified: trunk/dports/science/openbabel/Portfile
===================================================================
--- trunk/dports/science/openbabel/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/openbabel/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -30,6 +30,6 @@
}
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
Modified: trunk/dports/science/openmpi/Portfile
===================================================================
--- trunk/dports/science/openmpi/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/openmpi/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -47,13 +47,14 @@
}
platform darwin 8 {
- configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
+ configure.compiler gcc-4.0
}
variant fortran {
configure.args-delete --disable-f77 --disable-f90
configure.args-append --enable-f77 --enable-f90
- configure.env-append F77=gfortran-mp-4.2 FC=gfortran-mp-4.2
+ configure.f77 ${prefix}/bin/gfortran-mp-4.2
+ configure.fc ${prefix}/bin/gfortran-mp-4.2
# We need gfortran. Gcc41 doesn't seem to compile on Intel Mac, so we'll take
# gcc42. Too bad that the actual gfortran binary in gcc42 is called
# gfortran-mp-4.2, otherwise we could just say bin:gfortran:gcc42.
Modified: trunk/dports/science/tempo/Portfile
===================================================================
--- trunk/dports/science/tempo/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/tempo/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -25,7 +25,7 @@
patchfiles patch-tempo.c.diff
-configure.env CFLAGS="-I'${prefix}/include' -L'${prefix}/lib'"
+configure.cflags-append "-L'${prefix}/lib'"
configure.args --with-x
post-destroot { file mkdir ${destroot}${prefix}/share/doc/${name}
Modified: trunk/dports/science/udunits/Portfile
===================================================================
--- trunk/dports/science/udunits/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/udunits/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -24,10 +24,10 @@
worksrcdir ${distname}/src
depends_lib port:perl5.8
-configure.env CPPFLAGS="-DNDEBUG -Df2cFortran" \
- CC=/usr/bin/cc \
- CFLAGS="-O2 -fno-common" \
- MANDIR=${prefix}/share/man
+configure.cppflags "-DNDEBUG -Df2cFortran"
+configure.cc /usr/bin/cc
+configure.cflags "-O2 -fno-common"
+configure.env MANDIR=${prefix}/share/man
destroot.destdir DESTDIR=${destroot} \
prefix=${destroot}${prefix} exec_prefix=${destroot}${prefix} MANDIR=\\\${prefix}/share/man
@@ -38,6 +38,6 @@
variant g95 {
depends_build-append port:g95
- configure.env-append FC=${prefix}/bin/g95 \
- FFLAGS="-O2 -fno-common"
+ configure.fc ${prefix}/bin/g95
+ configure.env-append FFLAGS="-O2 -fno-common"
}
Modified: trunk/dports/science/xloops/Portfile
===================================================================
--- trunk/dports/science/xloops/Portfile 2007-09-02 21:39:44 UTC (rev 28514)
+++ trunk/dports/science/xloops/Portfile 2007-09-02 21:43:01 UTC (rev 28515)
@@ -45,8 +45,7 @@
platform darwin 7 {
depends_build port:gcc40
-
- configure.env-append CXX=g++-mp-4.0
+ configure.compiler macports-gcc-4.0
}
build.target { }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070902/44a311bd/attachment.html
More information about the macports-changes
mailing list