--- Portfile.orig	2009-11-10 13:48:16.000000000 -0500
+++ Portfile	2009-11-14 16:29:15.000000000 -0500
@@ -3,10 +3,10 @@
 PortSystem	1.0
 name		fftw-single
 version		2.1.5
-revision	1
+revision	2
 categories	math devel
 maintainers	nomaintainer
-description	Single precision version of fftw
+description	Fast C routines to compute the Discrete Fourier Transform (single precision version)
 long_description \
 	FFTW is a C subroutine library for computing the Discrete Fourier \
 	Transform (DFT) in one or more dimensions, of both real and complex \
@@ -21,28 +21,46 @@
 platforms	darwin
 
 distname	fftw-${version}
+dist_subdir	fftw
 homepage	http://www.fftw.org/
 master_sites	${homepage} \
 		ftp://ftp.fftw.org/pub/fftw/ \
 		ftp://ftp.kusastro.kyoto-u.ac.jp/pub/src/GNU/fftw/
 
-checksums	md5 8d16a84f3ca02a785ef9eb36249ba433
+checksums	md5 8d16a84f3ca02a785ef9eb36249ba433 \
+		sha1 12020b58edc1b0490a83db4aa912fac5dfdfb26b \
+		rmd160 723308722d76c12710db6473979adf8d086b0909
 
 depends_run	port:fftw
 
-configure.args	--enable-type-prefix	\
-		--enable-threads	\
-		--enable-float		\
-		--disable-fortran	\
-		--infodir=${prefix}/share/info
+configure.args	--enable-type-prefix --enable-threads \
+		--enable-shared --enable-mpi \
+		--enable-float \
+		--disable-fortran --infodir=${prefix}/share/info
 
-variant fortran {
-	depends_lib-append	port:gcc34
+platform darwin {
+	patchfiles-append	patch-configure_darwin
+	}
+
+variant gcc42 conflicts gcc43 g95 description {create Fortran wrappers using gcc42} {
+	depends_lib-append	port:gcc42
+	configure.compiler	macports-gcc-4.2
+	configure.args-delete	--disable-fortran
+	configure.args-append	--enable-fortran --with-gcc
+}
+
+variant gcc43 conflicts gcc42 g95 description {create Fortran wrappers using gcc43} {
+	depends_lib-append	port:gcc43
+	configure.compiler	macports-gcc-4.3
+	configure.args-delete	--disable-fortran
+	configure.args-append	--enable-fortran --with-gcc
+}
+
+variant g95 conflicts gcc42 gcc43 description {create Fortran wrappers using g95} {
+	depends_lib-append	port:g95
+	configure.f77		g95
 	configure.args-delete	--disable-fortran
 	configure.args-append	--enable-fortran
-	if {[variant_isset darwin]} {
-		patchfiles-append	patch-configure_darwin
-	}
 }
 
 # Documentation conflicts with the double precision version,