7 files changed, 56 insertions, 63 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 5d093c9feb31..bbc4ff2e2c84 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	mpich2
-DISTVERSION=	1.0.6p1
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 PORTEPOCH=	2
 CATEGORIES=	net parallel
-MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/	\
-		http://www-unix.mcs.anl.gov/mpi/mpich/downloads/
+MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/
 DIST_SUBDIR=	mpich
 #PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/mpich2-patch/
 #PATCHFILES=
@@ -55,18 +53,19 @@ CONFIGURE_ARGS+=	--disable-graphics
 WITHOUT_JAVA=	yes
 PLIST_SUB+=	X11="@comment "
 .else
-USE_X11=	x11
-PLIST_SUB+=	X11=""
+PLIST_SUB+=	X11=${PLX11}
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
 PLIST_SUB+=	JAVA="@comment "
+PLX11=		"@comment "
 .else
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 BUILD_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 PLIST_SUB+=	JAVA=""
+PLX11=		""
 .endif
 
 .if defined(WITH_SMPD)
@@ -88,8 +87,8 @@ LIBSSO=		fmpich mpich mpichcxx
 THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
 		test/mpi/threads/pt2pt/Makefile.in
 LOCALBASE2FIX=	src/mpe2/src/slog2sdk/trace_rlog/configure	\
-		src/mpe2/src/slog2sdk/trace_sample/configure
-X11BASE2FIX=	src/mpe2/src/graphics/configure
+		src/mpe2/src/slog2sdk/trace_sample/configure	\
+		src/mpe2/src/graphics/configure
 
 .include <bsd.port.pre.mk>
 
@@ -97,6 +96,10 @@ X11BASE2FIX=	src/mpe2/src/graphics/configure
 WITHOUT_JAVA=	yo	# No package for Java ATM
 .endif
 
+.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+WITHOUT_JAVA=	yo	# No package for Java ATM
+.endif
+
 .if ${ARCH} == "amd64"
 # gmake should not be required, this is a work-around
 USE_GMAKE=	yes
@@ -125,7 +128,6 @@ pre-everything::
 pre-configure:
 	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
-	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${X11BASE2FIX:S|^|${WRKSRC}/|}
 
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/confdb/libtool-2.13.m4
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/confdb/libtool.m4
@@ -133,11 +135,6 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/src/mpe2/src/slog2sdk/trace_sample/libtool.m4
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
-	${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${X11BASE2FIX:S|^|${WRKSRC}/|}
-.for mp in ${MAN4}
-	${MV} ${WRKSRC}/src/mpe2/man/man4/${mp:S/4$/3/}	\
-		${WRKSRC}/src/mpe2/man/man4/${mp}
-.endfor
 
 post-configure:
 	${REINPLACE_CMD} -e 's|$${exec_prefix}|${PREFIX}|g;	\
diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo
index 7473d9d8e755..1dd3ef5ece89 100644
--- a/net/mpich2/distinfo
+++ b/net/mpich2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpich/mpich2-1.0.6p1.tar.gz) = 6373b7824a782e890ecf4bfb77cbc4cc
-SHA256 (mpich/mpich2-1.0.6p1.tar.gz) = 38808f96071965c79451a8d975fe4f28454f56f27a19ce13b2aec85012521fcc
-SIZE (mpich/mpich2-1.0.6p1.tar.gz) = 15437620
+MD5 (mpich/mpich2-1.0.7.tar.gz) = c3beb9430d45347078a80cf1c6780509
+SHA256 (mpich/mpich2-1.0.7.tar.gz) = d280e6eb81c4d30b5f3fa1a7775870c32f6a9e58673be11e67f05e75cc944998
+SIZE (mpich/mpich2-1.0.7.tar.gz) = 16565875
diff --git a/net/mpich2/files/manpages b/net/mpich2/files/manpages
index 3b6925d39983..2cb7f8a28ac0 100644
--- a/net/mpich2/files/manpages
+++ b/net/mpich2/files/manpages
@@ -325,8 +325,8 @@ MPE_Line_thickness.4 \
 MPE_Log_bare_event.4 \
 MPE_Log_comm_event.4 \
 MPE_Log_comm_receive.4 \
-MPE_Log_event.4 \
 MPE_Log_comm_send.4 \
+MPE_Log_event.4 \
 MPE_Log_get_event_number.4 \
 MPE_Log_get_solo_eventID.4 \
 MPE_Log_get_state_eventIDs.4 \
@@ -342,8 +342,8 @@ MPE_Open_graphics.4 \
 MPE_ReturnTags.4 \
 MPE_Seq_begin.4 \
 MPE_Seq_end.4 \
-MPE_Start_log.4 \
 MPE_Signals_call_debugger.4 \
+MPE_Start_log.4 \
 MPE_Stop_log.4 \
 MPE_TagsEnd.4 \
 MPE_Update.4
diff --git a/net/mpich2/files/patch-configure b/net/mpich2/files/patch-configure
index c6f17cec0700..4997bb8a1cf2 100644
--- a/net/mpich2/files/patch-configure
+++ b/net/mpich2/files/patch-configure
@@ -1,42 +1,6 @@
---- configure.orig	Tue Oct 30 21:17:11 2007
-+++ configure	Mon Nov  5 11:01:30 2007
-@@ -3927,7 +3927,7 @@
- fi
- 
- MPI_DEFAULT_COPTS="-O2"
--if test "$compiler_optimizations" == "yes"; then
-+if test "$compiler_optimizations" = "yes"; then
-    echo "$as_me:$LINENO: checking whether $CC accepts default optimizations" >&5
- echo $ECHO_N "checking whether $CC accepts default optimizations... $ECHO_C" >&6
-    rm -f conftest.c
-@@ -5227,7 +5227,7 @@
- 
- MPI_DEFAULT_FOPTS="-O2"
- if test "$enable_f77" = yes ; then
--    if test "$compiler_optimizations" == "yes"; then
-+    if test "$compiler_optimizations" = "yes"; then
-         echo "$as_me:$LINENO: checking whether $F77 accepts default optimizations" >&5
- echo $ECHO_N "checking whether $F77 accepts default optimizations... $ECHO_C" >&6
-             rm -f conftest.f
-@@ -7592,7 +7592,7 @@
- 
- MPI_DEFAULT_F90OPTS="-O2"
- if test "$enable_f90" = yes ; then
--    if test "$compiler_optimizations" == "yes"; then
-+    if test "$compiler_optimizations" = "yes"; then
-         echo "$as_me:$LINENO: checking whether $F90 accepts default optimizations" >&5
- echo $ECHO_N "checking whether $F90 accepts default optimizations... $ECHO_C" >&6
-             rm -f conftest.f
-@@ -10340,7 +10340,7 @@
- 
- MPI_DEFAULT_CXXOPTS="-O2"
- if test "$enable_cxx" = yes; then
--    if test "$compiler_optimizations" == "yes"; then
-+    if test "$compiler_optimizations" = "yes"; then
-         echo "$as_me:$LINENO: checking whether $CXX accepts default optimizations" >&5
- echo $ECHO_N "checking whether $CXX accepts default optimizations... $ECHO_C" >&6
-             rm -f conftest.cpp
-@@ -30355,8 +30355,8 @@
+--- configure.orig	2008-04-05 00:04:44.000000000 +0200
++++ configure	2008-04-07 19:06:49.000000000 +0200
+@@ -31340,8 +31340,8 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_pthread_key_create" = no; then
@@ -47,7 +11,7 @@
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -30400,7 +30400,7 @@
+@@ -31385,7 +31385,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/net/mpich2/files/patch-src_mpi_romio_adio_ad_hfs_ad_hfs_fcntl.c b/net/mpich2/files/patch-src_mpi_romio_adio_ad_hfs_ad_hfs_fcntl.c
new file mode 100644
index 000000000000..8b96154eaff5
--- /dev/null
+++ b/net/mpich2/files/patch-src_mpi_romio_adio_ad_hfs_ad_hfs_fcntl.c
@@ -0,0 +1,14 @@
+--- ./src/mpi/romio/adio/ad_hfs/ad_hfs_fcntl.c.orig	2007-11-02 23:50:19.000000000 +0100
++++ ./src/mpi/romio/adio/ad_hfs/ad_hfs_fcntl.c	2008-04-07 23:19:28.000000000 +0200
+@@ -20,7 +20,11 @@
+ 
+     switch(flag) {
+     case ADIO_FCNTL_GET_FSIZE:
++#ifdef __FreeBSD__
++	fcntl_struct->fsize = lseek(fd->fd_sys, 0, SEEK_END);
++#else
+ 	fcntl_struct->fsize = lseek64(fd->fd_sys, 0, SEEK_END);
++#endif
+ #ifdef HPUX
+ 	if (fd->fp_sys_posn != -1) 
+ 	     lseek64(fd->fd_sys, fd->fp_sys_posn, SEEK_SET);
diff --git a/net/mpich2/files/patch-src_mpi_romio_adio_common_ad_write_nolock.c b/net/mpich2/files/patch-src_mpi_romio_adio_common_ad_write_nolock.c
new file mode 100644
index 000000000000..0c6617934b4d
--- /dev/null
+++ b/net/mpich2/files/patch-src_mpi_romio_adio_common_ad_write_nolock.c
@@ -0,0 +1,18 @@
+--- ./src/mpi/romio/adio/common/ad_write_nolock.c.orig	2008-03-10 23:38:31.000000000 +0100
++++ ./src/mpi/romio/adio/common/ad_write_nolock.c	2008-04-07 23:21:55.000000000 +0200
+@@ -89,9 +89,15 @@
+ 	/* seek to the right spot in the file */
+ 	if (file_ptr_type == ADIO_EXPLICIT_OFFSET) {
+ 	    off = fd->disp + etype_size * offset;
++#ifdef __FreeBSD__
++	    lseek(fd->fd_sys, off, SEEK_SET);
++	}
++	else off = lseek(fd->fd_sys, fd->fp_ind, SEEK_SET);
++#else
+ 	    lseek64(fd->fd_sys, off, SEEK_SET);
+ 	}
+ 	else off = lseek64(fd->fd_sys, fd->fp_ind, SEEK_SET);
++#endif
+ 
+ 	/* loop through all the flattened pieces.  combine into buffer until
+ 	 * no more will fit, then write.
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index f3cc677127ba..3ca120177f6c 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -186,6 +186,7 @@ sbin/mpetestexec
 sbin/mpetestexeclog
 sbin/mpetestlink
 sbin/mpeuninstall
+%%JAVA%%share/barrier.rlog
 %%PORTDOCS%%%%DOCSDIR%%/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/install.pdf
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/About24.png
@@ -718,15 +719,14 @@ share/examples_logging/fpilog.f
 share/examples_logging/fpilog_pack.F
 share/examples_logging/iotest.c
 share/examples_logging/log_cost.c
+share/examples_logging/openmp_mpilog.F
 share/examples_logging/openmp_sendrecv.c
 share/examples_logging/pthread_allreduce.c
 share/examples_logging/pthread_sendrecv.c
 share/examples_logging/pthread_sendrecv_user.c
 share/examples_logging/srtest.c
-%%JAVA%%share/logfiles/barrier.rlog
-%%JAVA%%share/logfiles/fpilog.clog
-%%JAVA%%share/logfiles/fpilog.slog2
-%%JAVA%%@dirrm share/logfiles
+%%JAVA%%share/fpilog.clog
+%%JAVA%%share/fpilog.slog2
 @dirrm share/examples_logging
 %%X11%%@dirrm share/examples_graphics
 @dirrm share/examples_collchk