Index: Portfile
===================================================================
--- Portfile	(revision 26337)
+++ Portfile	(working copy)
@@ -27,7 +27,8 @@
 		patch-dynamic-ld-cc patch-glpk patch-glpk.m
 
 depends_build   bin:texinfo:texinfo	\
-		bin:tex:teTeX
+		bin:tex:teTeX		\
+		port:gcc42
 
 depends_lib     port:readline			\
 		port:hdf5			\
@@ -41,7 +42,10 @@
 configure.env   CFLAGS="-O2"		\
 		CXXFLAGS="-O2"		\
 		LDFLAGS="-L${prefix}/lib" \
-		CPPFLAGS="-I${prefix}/include"
+		CPPFLAGS="-I${prefix}/include" \
+		F77="gfortran-mp-4.2"	\
+		CC="gcc-mp-4.2"		\
+		CXX="g++-mp-4.2"
 
 configure.args	--enable-shared	\
 		--enable-dl	\
@@ -66,22 +70,6 @@
 	file rename -force ${worksrcpath}/src/oct-conf.h.tmp ${destroot}${prefix}/include/${name}-${version}/${name}/oct-conf.h
 }
 
-platform powerpc {
-	if {![variant_isset g95]} {
-		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-append	F77="gfortran-mp-4.2"
-		configure.env-append	CC="gcc-mp-4.2"
-		configure.env-append	CXX="g++-mp-4.2"
-	}
-}
-
 default_variants +test
 variant test	{ depends_build-append	bin:runtest:dejagnu
 		  test.run	yes
@@ -94,6 +82,8 @@
 }
 
 variant g95 {
-	depends_lib-append	port:g95
+	depends_build-delete	port:gcc42
+	depends_build-append	port:g95
+	configure.env-delete	F77="gfortran-mp-4.2" CC="gcc-mp-4.2" CXX="g++-mp-4.2"
 	configure.env-append	F77="${prefix}/bin/g95" FFLAGS=-O2 MACOSX_DEPLOYMENT_TARGET=10.4
 }