[28510] trunk/dports/math

source_changes at macosforge.org source_changes at macosforge.org
Sun Sep 2 14:18:40 PDT 2007


Revision: 28510
          http://trac.macosforge.org/projects/macports/changeset/28510
Author:   mww at macports.org
Date:     2007-09-02 14:18:39 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
replace configure.env as far as possible

Modified Paths:
--------------
    trunk/dports/math/GiNaC/Portfile
    trunk/dports/math/algae/Portfile
    trunk/dports/math/blitz/Portfile
    trunk/dports/math/cadabra/Portfile
    trunk/dports/math/fftw-3/Portfile
    trunk/dports/math/gnudatalanguage/Portfile
    trunk/dports/math/gnuplot/Portfile
    trunk/dports/math/gsl/Portfile
    trunk/dports/math/gunits/Portfile
    trunk/dports/math/muparser/Portfile
    trunk/dports/math/ntl/Portfile
    trunk/dports/math/octave/Portfile
    trunk/dports/math/octave-forge/Portfile
    trunk/dports/math/optpp/Portfile
    trunk/dports/math/orpie/Portfile
    trunk/dports/math/yacas/Portfile

Modified: trunk/dports/math/GiNaC/Portfile
===================================================================
--- trunk/dports/math/GiNaC/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/GiNaC/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -50,10 +50,8 @@
 		exit 1
 }
 
-platform darwin 8 {
-		configure.env	CPPFLAGS=-I${prefix}/include	\
-				LDFLAGS=-L${prefix}/lib
-}
+#platform darwin 8 {
+#}
 
 configure.args	--infodir=${prefix}/share/info
 

Modified: trunk/dports/math/algae/Portfile
===================================================================
--- trunk/dports/math/algae/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/algae/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -18,8 +18,9 @@
 depends_lib		port:gcc34
 
 configure.args	--mandir=\\\${prefix}/share/man
-configure.env	CPP=${prefix}/bin/cpp-dp-3.4 CC=${prefix}/bin/gcc-dp-3.4 \
-				F77=${prefix}/bin/g77-dp-3.4
+configure.cpp	${prefix}/bin/cpp-dp-3.4
+configure.cc	${prefix}/bin/gcc-dp-3.4
+configure.f77	${prefix}/bin/g77-dp-3.4
 
 destroot.destdir	prefix=${destroot}${prefix}
 post-destroot {

Modified: trunk/dports/math/blitz/Portfile
===================================================================
--- trunk/dports/math/blitz/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/blitz/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -23,6 +23,6 @@
 destroot.args	docdir=${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
 }
 

Modified: trunk/dports/math/cadabra/Portfile
===================================================================
--- trunk/dports/math/cadabra/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/cadabra/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -30,9 +30,6 @@
 		port:gmp	\
 		port:LiE
 
-configure.env	CPPFLAGS=-I${prefix}/include	\
-		LDFLAGS=-L${prefix}/lib
-
 post-build	{ cd ${worksrcpath}
 		  system "env CDB_LOG=1 ${build.cmd} advtest"
 		}

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/fftw-3/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -58,7 +58,7 @@
 }
 
 variant g95 conflicts fortran {
-	configure.env-append FC=g95
+	configure.fc	g95
 	depends_lib-append port:g95
 	configure.args-delete --disable-fortran
 	configure.args-append --enable-fortran

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/gnudatalanguage/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -1,4 +1,4 @@
-# $Id: Portfile 23185 2007-03-27 03:15:11Z jmpp at macports.org $
+# $Id$
 PortSystem 1.0
 name            gnudatalanguage
 version         0.9pre5
@@ -30,7 +30,8 @@
                 port:readline \
                 port:tiff 
 
-configure.env       FFLAGS=-O2 CPPFLAGS="-I${prefix}/include/python2.4"
+configure.env       FFLAGS=-O2
+configure.cppflags	"-I${prefix}/include/python2.4"
 configure.args      --with-plplotdir=${prefix} \
                     --with-ncursesdir=${prefix} \
                     --with-readlinedir=${prefix} \
@@ -73,7 +74,7 @@
 
 variant proj {
     depends_lib-append port:proj
-    configure.env-append CXX="g++ -DPJ_LIB__"
+    configure.cxx	"g++ -DPJ_LIB__"
     configure.args-append --with-libproj4=${prefix}
 }
 
@@ -82,10 +83,10 @@
 }
 variant gcc42 conflicts g95 description {Build using gcc42 (default)} {
     depends_build-append    port:gcc42
-    configure.env-append    F77=${prefix}/bin/gfortran-mp-4.2
+    configure.f77    ${prefix}/bin/gfortran-mp-4.2
 }
 variant g95 conflicts gcc42 description {Build using g95} {
     depends_build-append    port:g95
-    configure.env-append    F77=${prefix}/bin/g95
+    configure.f77	${prefix}/bin/g95
 }
 

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/gnuplot/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -45,11 +45,10 @@
 
 platform darwin {
 	depends_lib-append		lib:libaquaterm.1:aquaterm
-	configure.env-append	CFLAGS='-DDEFAULTTERM=\\"aqua\\"'
+	configure.cflags-append	'-DDEFAULTTERM=\\"aqua\\"'
 }
 
-configure.env	LDFLAGS="-L${prefix}/lib" \
-				CPPFLAGS="-I${prefix}/include -no-cpp-precomp"
+configure.cppflags-append	"-no-cpp-precomp"
 configure.args	--with-readline=gnu --with-gd --with-png --with-pdf --with-x \
 				--enable-datastrings --enable-histograms \
 				--infodir='\${prefix}/share/info' \

Modified: trunk/dports/math/gsl/Portfile
===================================================================
--- trunk/dports/math/gsl/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/gsl/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -25,13 +25,11 @@
 # Lower optimization level (-O1) is required to avoid code generation
 # bugs in Apple's gcc 3.3 and earlier.
 platform darwin 6 7 {
-		configure.env	CFLAGS="-O1"
+		configure.cflags-append "-O1"
 }
 
 platform darwin 8 {
-		configure.env-append    CC=/usr/bin/gcc-4.0	\
-					CPP=/usr/bin/cpp-4.0	\
-					CXX=/usr/bin/g++-4.0
+		configure.compiler	gcc-4.0
 }
 
 configure.args	--mandir=${prefix}/share/man \

Modified: trunk/dports/math/gunits/Portfile
===================================================================
--- trunk/dports/math/gunits/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/gunits/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -22,8 +22,6 @@
 configure.args   --program-prefix=g \
                  --mandir=\\\${prefix}/share/man \
                  --infodir=\\\${prefix}/share/info
-configure.env    CPPFLAGS="-I${prefix}/include" \
-                 LDFLAGS="-L${prefix}/lib"
 destroot.destdir prefix=${destroot}${prefix}
 
 depends_lib      port:ncurses \

Modified: trunk/dports/math/muparser/Portfile
===================================================================
--- trunk/dports/math/muparser/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/muparser/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -21,6 +21,6 @@
 worksrcdir		muParser
 
 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/math/ntl/Portfile
===================================================================
--- trunk/dports/math/ntl/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/ntl/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -18,9 +18,6 @@
 
 depends_build   bin:perl:perl5.8
 
-configure.env   LDFLAGS="-L${prefix}/lib" \
-                CPPFLAGS="-I${prefix}/include"
-
 test.run        no
 
 configure.pre_args      "PREFIX=${prefix} DOCDIR=${prefix}/share/doc"

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/octave/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -38,10 +38,8 @@
 		port:glpk			\
 		port:gnuplot
 
-configure.env   CFLAGS="-O2"		\
-		CXXFLAGS="-O2"		\
-		LDFLAGS="-L${prefix}/lib" \
-		CPPFLAGS="-I${prefix}/include"
+configure.cflags	"-O2"
+configure.cxxflags	"-O2"
 
 configure.args	--enable-shared	\
 		--enable-dl	\
@@ -69,16 +67,14 @@
 platform powerpc {
 	if {![variant_isset g95]} {
 		depends_lib-append	port:gcc40
-		configure.env-append	F77="gfortran-mp-4.0"
+		configure.f77	"${prefix}/bin/gfortran-mp-4.0"
 	}
 }
 
 platform i386 {
 	if {![variant_isset g95]} {
 		depends_lib-append	port:gcc42
-		configure.env-append	F77="gfortran-mp-4.2"
-		configure.env-append	CC="gcc-mp-4.2"
-		configure.env-append	CXX="g++-mp-4.2"
+		configure.compiler	macports-gcc-4.2
 	}
 }
 
@@ -95,5 +91,6 @@
 
 variant g95 {
 	depends_lib-append	port:g95
-	configure.env-append	F77="${prefix}/bin/g95" FFLAGS=-O2 MACOSX_DEPLOYMENT_TARGET=10.4
+	configure.f77	"${prefix}/bin/g95"
+	configure.env-append	FFLAGS=-O2 MACOSX_DEPLOYMENT_TARGET=10.4
 }

Modified: trunk/dports/math/octave-forge/Portfile
===================================================================
--- trunk/dports/math/octave-forge/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/octave-forge/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -33,10 +33,8 @@
 	close [open "${worksrcpath}/extra/Windows/NOINSTALL" w]
 }
 
-configure.env   CFLAGS="-O2"		\
-		CXXFLAGS="-O2"		\
-		LDFLAGS="-L${prefix}/lib" \
-		CPPFLAGS="-I${prefix}/include"
+configure.cflags	"-O2"
+configure.cxxflags	"-O2"
 
 configure.args	--enable-shared	\
 		--enable-dl	\
@@ -49,15 +47,13 @@
 platform powerpc {
 	if {![variant_isset g95]} {
 		depends_lib-append	port:gcc40
-		configure.env-append	F77="gfortran-mp-4.0"
+		configure.f77	"${prefix}/bin/gfortran-mp-4.0"
 	}
 }
 platform i386 {
 	if {![variant_isset g95]} {
 		depends_lib-append	port:gcc42
-		configure.env-append	F77="gfortran-mp-4.2"
-		configure.env-append	CC="gcc-mp-4.2"
-		configure.env-append	CXX="g++-mp-4.2"
+		configure.compiler	macports-gcc-4.2
 
 		post-patch {
 			reinplace "s|-ObjC|-x objective-c|" \
@@ -73,7 +69,7 @@
 
 variant g95 {
 	depends_lib-append port:g95
-	configure.env-append F77="${prefix}/bin/g95"
-	configure.env-append CC="/usr/bin/cc"
-	configure.env-append CXX="/usr/bin/c++"
+	configure.f77	"${prefix}/bin/g95"
+	configure.cc	"/usr/bin/cc"
+	configure.cxx	"/usr/bin/c++"
 }

Modified: trunk/dports/math/optpp/Portfile
===================================================================
--- trunk/dports/math/optpp/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/optpp/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -19,7 +19,7 @@
 
 patchfiles patch-acx_blas.m4
 use_autoconf yes
-configure.env LDFLAGS="-framework vecLib"
+configure.ldflags	"-framework vecLib"
 configure.args --includedir=${prefix}/include/OPT++ --with-blas
 
 variant mpi {

Modified: trunk/dports/math/orpie/Portfile
===================================================================
--- trunk/dports/math/orpie/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/orpie/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -19,5 +19,4 @@
 homepage		http://www.eecs.umich.edu/~pelzlpj/orpie/
 depends_lib		port:gsl
 depends_build	port:ocaml
-configure.env	LDFLAGS="-L${prefix}/lib" CPPFLAGS="-I${prefix}/include"
 

Modified: trunk/dports/math/yacas/Portfile
===================================================================
--- trunk/dports/math/yacas/Portfile	2007-09-02 21:07:50 UTC (rev 28509)
+++ trunk/dports/math/yacas/Portfile	2007-09-02 21:18:39 UTC (rev 28510)
@@ -19,8 +19,6 @@
 
 depends_build	bin:perl:perl5.8
 
-configure.env	LDFLAGS="-L${prefix}/lib" \
-		CPPFLAGS="-I${prefix}/include"
 configure.args-append   --disable-shared
 
 test.run	yes

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070902/dc478884/attachment.html


More information about the macports-changes mailing list