5 files changed, 129 insertions, 65 deletions

diff --git a/net/lam7/Makefile b/net/lam7/Makefile
index aa9741146517..e319a4049b10 100644
--- a/net/lam7/Makefile
+++ b/net/lam7/Makefile
@@ -5,18 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=      	lam
-PORTVERSION=   	6.5.9
-CATEGORIES=    	net parallel
-MASTER_SITES=  	http://www.lam-mpi.org/download/files/
+PORTNAME=	lam7
+PORTVERSION=	7.0.5
+CATEGORIES=	net parallel
+MASTER_SITES=	http://www.lam-mpi.org/download/files/
+DISTNAME=	lam-${PORTVERSION}
 
-MAINTAINER=    	bremner@unb.ca
+MAINTAINER=	jan.lentfer@web.de
 COMMENT=	Local Area Multicomputer MPI implementation
 
 USE_BZIP2=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-rsh=ssh
 
+CONFLICTS=	lam-6.*
+
 .include "files/manpages"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/lam7/distinfo b/net/lam7/distinfo
index e25c95c0229c..5256fe234936 100644
--- a/net/lam7/distinfo
+++ b/net/lam7/distinfo
@@ -1,2 +1,2 @@
-MD5 (lam-6.5.9.tar.bz2) = 8a4e98da5e1ba41e68c9422635b42364
-SIZE (lam-6.5.9.tar.bz2) = 1642559
+MD5 (lam-7.0.5.tar.bz2) = 8dc847526d194f168309b7c00f5b9492
+SIZE (lam-7.0.5.tar.bz2) = 5763641
diff --git a/net/lam7/files/manpages b/net/lam7/files/manpages
index d15c9ae26cb6..3d35eedc8140 100644
--- a/net/lam7/files/manpages
+++ b/net/lam7/files/manpages
@@ -9,11 +9,13 @@ lamclean.1 \
 lamd.1 \
 lamexec.1 \
 lamgrow.1 \
+laminfo.1 \
 lamshrink.1 \
 lamtrace.1 \
 mpiCC.1 \
 mpic++.1 \
 mpicc.1 \
+mpiexec.1 \
 mpif77.1 \
 mpimsg.1 \
 mpirun.1 \
@@ -26,13 +28,12 @@ wipe.1
 MAN3= \
 MPIL_Comm_gps.3 \
 MPIL_Comm_id.3 \
-MPIL_Comm_parent.3 \
+MPIL_Request_get_name.3 \
+MPIL_Request_set_name.3 \
 MPIL_Signal.3 \
-MPIL_Spawn.3 \
 MPIL_Trace_off.3 \
 MPIL_Trace_on.3 \
 MPIL_Type_id.3 \
-MPIL_Universe_size.3 \
 MPIO_Request_c2f.3 \
 MPIO_Request_f2c.3 \
 MPIO_Test.3 \
@@ -297,7 +298,10 @@ MPI_Wait.3 \
 MPI_Waitall.3 \
 MPI_Waitany.3 \
 MPI_Waitsome.3 \
+MPI_Win_Lock.3 \
+MPI_Win_Test.3 \
 MPI_Win_c2f.3 \
+MPI_Win_call_errhandler.3 \
 MPI_Win_complete.3 \
 MPI_Win_create.3 \
 MPI_Win_create_errhandler.3 \
@@ -316,6 +320,7 @@ MPI_Win_set_attr.3 \
 MPI_Win_set_errhandler.3 \
 MPI_Win_set_name.3 \
 MPI_Win_start.3 \
+MPI_Win_unlock.3 \
 MPI_Win_wait.3 \
 MPI_Wtick.3 \
 MPI_Wtime.3 \
@@ -336,4 +341,9 @@ MAN7= \
 LAM.7 \
 MPI.7 \
 lam.7 \
+lamssi.7 \
+lamssi_boot.7 \
+lamssi_coll.7 \
+lamssi_cr.7 \
+lamssi_rpi.7 \
 mpi.7
diff --git a/net/lam7/files/patch-tools-mpiexec-mpiexec b/net/lam7/files/patch-tools-mpiexec-mpiexec
new file mode 100644
index 000000000000..930c740acfe5
--- /dev/null
+++ b/net/lam7/files/patch-tools-mpiexec-mpiexec
@@ -0,0 +1,16 @@
+--- tools/mpiexec/mpiexec.orig	Sun Apr 25 23:41:00 2004
++++ tools/mpiexec/mpiexec	Tue May 25 19:11:44 2004
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/env perl -w
+ 
+ # Copyright (c) 2001-2003 The Trustees of Indiana University.  
+ #                         All rights reserved.
+@@ -17,7 +17,6 @@
+ #
+ 
+ use strict;
+-use warnings;
+ use File::Temp qw(tempfile tempdir);
+ use Data::Dumper;
+ use POSIX;
diff --git a/net/lam7/pkg-plist b/net/lam7/pkg-plist
index d66a3db691ec..e749852241e8 100644
--- a/net/lam7/pkg-plist
+++ b/net/lam7/pkg-plist
@@ -1,82 +1,109 @@
+bin/hboot
+bin/hcc
+bin/hcp
+bin/hf77
+bin/lamboot
 bin/lamclean
+bin/lamd
 bin/lamexec
 bin/lamgrow
+bin/lamhalt
+bin/laminfo
+bin/lamnodes
 bin/lamshrink
 bin/lamtrace
+bin/mpiCC
+bin/mpic++
+bin/mpicc
+bin/mpiexec
+bin/mpif77
 bin/mpimsg
 bin/mpirun
 bin/mpitask
-bin/lamd
-bin/tping
-bin/hboot
-bin/hcc
-bin/hcp
-bin/mpicc
-bin/mpic++
-bin/mpiCC
-bin/hf77
-bin/mpif77
-bin/lamboot
-bin/lamhalt
-bin/lamnodes
 bin/recon
 bin/tkill
+bin/tping
 bin/wipe
-bin/balky
 etc/lam-bhost.def
-etc/lam-bhost.lam
-etc/lam-conf.lam
-etc/lam-conf.otb
+etc/lam-conf.lamd
 etc/lam-helpfile
+etc/lam-ssi-boot-globus-helpfile
 include/lam_config.h
+include/lam_config_bottom.h
 include/mpi.h
+include/mpi2cxx/comm.h
+include/mpi2cxx/comm_inln.h
+include/mpi2cxx/constants.h
+include/mpi2cxx/datatype.h
+include/mpi2cxx/datatype_inln.h
+include/mpi2cxx/errhandler.h
+include/mpi2cxx/errhandler_inln.h
+include/mpi2cxx/exception.h
+include/mpi2cxx/functions.h
+include/mpi2cxx/functions_inln.h
+include/mpi2cxx/group.h
+include/mpi2cxx/group_inln.h
+include/mpi2cxx/info.h
+include/mpi2cxx/info_inln.h
+include/mpi2cxx/intercomm.h
+include/mpi2cxx/intercomm_inln.h
+include/mpi2cxx/intracomm.h
+include/mpi2cxx/intracomm_inln.h
+include/mpi2cxx/mpi2cxx_list.h
+include/mpi2cxx/mpi2cxx_map.h
+include/mpi2cxx/op.h
+include/mpi2cxx/op_inln.h
+include/mpi2cxx/pcomm.h
+include/mpi2cxx/pdatatype.h
+include/mpi2cxx/perrhandler.h
+include/mpi2cxx/pexception.h
+include/mpi2cxx/pgroup.h
+include/mpi2cxx/pgroup_inln.h
+include/mpi2cxx/pinfo.h
+include/mpi2cxx/pintercomm.h
+include/mpi2cxx/pintracomm.h
+include/mpi2cxx/pmpicxx.h
+include/mpi2cxx/pop.h
+include/mpi2cxx/pop_inln.h
+include/mpi2cxx/prequest.h
+include/mpi2cxx/prequest_inln.h
+include/mpi2cxx/pstatus.h
+include/mpi2cxx/pstatus_inln.h
+include/mpi2cxx/ptopology.h
+include/mpi2cxx/pwin.h
+include/mpi2cxx/request.h
+include/mpi2cxx/request_inln.h
+include/mpi2cxx/status.h
+include/mpi2cxx/status_inln.h
+include/mpi2cxx/topology.h
+include/mpi2cxx/topology_inln.h
+include/mpi2cxx/win.h
+include/mpi2cxx/win_inln.h
+include/mpicxx.h
 include/mpif.h
-include/mpi2c++/mpi2c++_config.h
-include/mpi2c++/mpi++.h
-include/mpi2c++/mpi2c++_map.h
-include/mpi2c++/mpi2c++_list.h
-include/mpi2c++/constants.h
-include/mpi2c++/functions.h
-include/mpi2c++/datatype.h
-include/mpi2c++/exception.h
-include/mpi2c++/op.h
-include/mpi2c++/status.h
-include/mpi2c++/request.h
-include/mpi2c++/group.h
-include/mpi2c++/comm.h
-include/mpi2c++/errhandler.h
-include/mpi2c++/intracomm.h
-include/mpi2c++/topology.h
-include/mpi2c++/intercomm.h
-include/mpi2c++/datatype_inln.h
-include/mpi2c++/functions_inln.h
-include/mpi2c++/request_inln.h
-include/mpi2c++/comm_inln.h
-include/mpi2c++/intracomm_inln.h
-include/mpi2c++/op_inln.h
-include/mpi2c++/topology_inln.h
-include/mpi2c++/intercomm_inln.h
-include/mpi2c++/group_inln.h
-include/mpi2c++/errhandler_inln.h
-include/mpi2c++/status_inln.h
-include/mpi++.h
 include/mpio.h
 include/mpiof.h
-lib/liblamf77mpi.la
-lib/liblamf77mpi.a
-lib/libpmpi.la
-lib/libpmpi.a
-lib/liblam.la
+lib/lam/liblam_totalview.la
+lib/lam/liblam_totalview.so
+lib/lam/liblam_totalview.so.0
 lib/liblam.a
-lib/libmpi.la
-lib/libmpi.a
+lib/liblam.la
+lib/liblamf77mpi.a
+lib/liblamf77mpi.la
 lib/liblammpi++.a
+lib/liblammpi++.la
 lib/liblammpio.a
+lib/libmpi.a
+lib/libmpi.la
 share/lam/doc/ROMIO-COPYRIGHT
 share/lam/doc/ROMIO-README
 share/lam/doc/ROMIO-README_LAM
 share/lam/doc/romio-users-guide.ps.gz
+share/lam/lam-shell-setup.csh
+share/lam/lam-shell-setup.sh
+share/lam/lam_module.tcl
 share/lam/mpi.share
-@dirrm include/mpi2c++
+@dirrm include/mpi2cxx
+@dirrm lib/lam
 @dirrm share/lam/doc
 @dirrm share/lam