Revision
32419
Author
mww@macports.org
Date
2007-12-30 09:09:38 -0800 (Sun, 30 Dec 2007)

Log Message

version 1.0.6p1, fix mtree violation (by docdir), move include-dir to $name/include to avoid conflict with openmpi, enable osx-style shared libs automatically on darwin

Modified Paths

Diff

Modified: trunk/dports/science/mpich2/Portfile (32418 => 32419)


--- trunk/dports/science/mpich2/Portfile	2007-12-30 16:14:26 UTC (rev 32418)
+++ trunk/dports/science/mpich2/Portfile	2007-12-30 17:09:38 UTC (rev 32419)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name			mpich2
-version			1.0.5p3
+version			1.0.6p1
 categories		science parallel net
 platforms		darwin
 maintainers		nomaintainer
@@ -17,25 +17,25 @@
 
 homepage		http://www-unix.mcs.anl.gov/mpi/mpich2/
 master_sites	ftp://ftp.mcs.anl.gov/pub/mpi/
-checksums		sha1 4e404b9a1a4a336ed1d8cde9159a117a190c2318 
+checksums		sha1 f8acd360df0380774d74804a706ffc1022acd62e
 
 depends_lib port:python24
 
+# the default include-dir conflicts with openmpi!
 configure.args	--with-thread-package=posix \
 				--enable-timer-type=gettimeofday \
 				--enable-cxx \
 				--mandir=${prefix}/share/man \
-				--with-htmldir=${prefix}/share/doc/${name}
+				--with-htmldir=${prefix}/share/doc/${name} \
+				--includedir=${prefix}/include/${name} \
+				--with-docdir=${prefix}/share/doc/${name}
 
-platform darwin 8 {
-	configure.compiler	gcc-4.0
-}
-
 variant g95 {
 	depends_lib-append port:g95
-	configure.f77	"$prefix/bin/g95"
-	configure.env-append	FFLAGS="-i4" F90FLAGS="-i4"
-	configure.f90	"$prefix/bin/g95"
+	configure.f77	"${prefix}/bin/g95"
+	configure.fflags	"-i4"
+	configure.f90	"${prefix}/bin/g95"
+	configure.f90flags	"-i4"
 	configure.args-append --enable-f77 --enable-f90
 }
 
@@ -47,6 +47,7 @@
 	configure.args-append --enable-pm=gforker:mpd
 }
 
-variant sharedlibs {
-	configure.args-append --enable-sharedlibs=osx-gcc
+platform darwin {
+	configure.args-append	--enable-sharedlibs=osx-gcc
 }
+