[22907] trunk/dports/math/octave-forge/Portfile

[source_changes at macosforge.org]

Revision: 22907
          http://trac.macosforge.org/projects/macports/changeset/22907
Author:   takanori at macports.org
Date:     2007-03-18 10:01:37 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
In some cases, MacPorts may try to install gcc40 regardless of platform. This is a workaround.

Modified Paths:
--------------
    trunk/dports/math/octave-forge/Portfile

Modified: trunk/dports/math/octave-forge/Portfile
===================================================================
--- trunk/dports/math/octave-forge/Portfile	2007-03-18 17:00:59 UTC (rev 22906)
+++ trunk/dports/math/octave-forge/Portfile	2007-03-18 17:01:37 UTC (rev 22907)
@@ -19,8 +19,7 @@
 
 checksums	md5 94a844d1e41aca9580fde00e023e4e5b
 
-depends_lib	port:gcc40	\
-		port:ginac	\
+depends_lib	port:ginac	\
 		port:gsl	\
 		port:jpeg	\
 		port:libpng	\
@@ -34,8 +33,7 @@
 	close [open "${worksrcpath}/extra/Windows/NOINSTALL" w]
 }
 
-configure.env   F77="gfortran-dp-4.0"	\
-		CFLAGS="-O2"		\
+configure.env   CFLAGS="-O2"		\
 		CXXFLAGS="-O2"		\
 		LDFLAGS="-L${prefix}/lib" \
 		CPPFLAGS="-I${prefix}/include"
@@ -48,12 +46,15 @@
                 --with-mpath=${prefix}/share/octave-forge/m \
                 --with-opath=${prefix}/share/octave-forge/oct
 
-platform darwin 8 i386 {
+platform powerpc {
 	if {![variant_isset g95]} {
-		depends_lib-delete	port:gcc40
+		depends_lib-append	port:gcc40
+		configure.env-append	F77="gfortran-dp-4.0"
+	}
+}
+platform i386 {
+	if {![variant_isset g95]} {
 		depends_lib-append	port:gcc42
-
-		configure.env-delete	F77="gfortran-dp-4.0"
 		configure.env-append	F77="gfortran-dp-4.2"
 		configure.env-append	CC="gcc-dp-4.2"
 		configure.env-append	CXX="g++-dp-4.2"
@@ -71,10 +72,7 @@
 		}
 
 variant g95 {
-	depends_lib-delete port:gcc40
 	depends_lib-append port:g95
-
-	configure.env-delete F77="gfortran-dp-4.0"
 	configure.env-append F77="${prefix}/bin/g95"
 	configure.env-append CC="/usr/bin/cc"
 	configure.env-append CXX="/usr/bin/c++"

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