- Upgrade net/lam to 7.1.2 and remove net/lam7;

- Chase lam7 -> lam in the dependent ports;

- Mark math/freemat IGNORE if WITH_MPI is defined and add a note about
  FreeMat 2.0 and QT4.

4 files changed, 61 insertions, 358 deletions

diff --git a/net/lam/files/manpages b/net/lam/files/manpages
deleted file mode 100644
index d15c9ae26cb6..000000000000
--- a/net/lam/files/manpages
+++ /dev/null
@@ -1,339 +0,0 @@
-MAN1= \
-hboot.1 \
-hcc.1 \
-hcp.1 \
-hf77.1 \
-introu.1 \
-lamboot.1 \
-lamclean.1 \
-lamd.1 \
-lamexec.1 \
-lamgrow.1 \
-lamshrink.1 \
-lamtrace.1 \
-mpiCC.1 \
-mpic++.1 \
-mpicc.1 \
-mpif77.1 \
-mpimsg.1 \
-mpirun.1 \
-mpitask.1 \
-recon.1 \
-tkill.1 \
-tping.1 \
-wipe.1
-
-MAN3= \
-MPIL_Comm_gps.3 \
-MPIL_Comm_id.3 \
-MPIL_Comm_parent.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 \
-MPIO_Wait.3 \
-MPI_Abort.3 \
-MPI_Accumulate.3 \
-MPI_Address.3 \
-MPI_Allgather.3 \
-MPI_Allgatherv.3 \
-MPI_Alloc_mem.3 \
-MPI_Allreduce.3 \
-MPI_Alltoall.3 \
-MPI_Alltoallv.3 \
-MPI_Attr_delete.3 \
-MPI_Attr_get.3 \
-MPI_Attr_put.3 \
-MPI_Barrier.3 \
-MPI_Bcast.3 \
-MPI_Bsend.3 \
-MPI_Bsend_init.3 \
-MPI_Buffer_attach.3 \
-MPI_Buffer_detach.3 \
-MPI_COMM_DUP_FN.3 \
-MPI_Cancel.3 \
-MPI_Cart_coords.3 \
-MPI_Cart_create.3 \
-MPI_Cart_get.3 \
-MPI_Cart_map.3 \
-MPI_Cart_rank.3 \
-MPI_Cart_shift.3 \
-MPI_Cart_sub.3 \
-MPI_Cartdim_get.3 \
-MPI_Close_port.3 \
-MPI_Comm_accept.3 \
-MPI_Comm_c2f.3 \
-MPI_Comm_compare.3 \
-MPI_Comm_connect.3 \
-MPI_Comm_create.3 \
-MPI_Comm_create_errhandler.3 \
-MPI_Comm_create_keyval.3 \
-MPI_Comm_delete_attr.3 \
-MPI_Comm_disconnect.3 \
-MPI_Comm_dup.3 \
-MPI_Comm_f2c.3 \
-MPI_Comm_free.3 \
-MPI_Comm_free_keyval.3 \
-MPI_Comm_get_attr.3 \
-MPI_Comm_get_errhandler.3 \
-MPI_Comm_get_name.3 \
-MPI_Comm_get_parent.3 \
-MPI_Comm_group.3 \
-MPI_Comm_join.3 \
-MPI_Comm_rank.3 \
-MPI_Comm_remote_group.3 \
-MPI_Comm_remote_size.3 \
-MPI_Comm_ser_errhandler.3 \
-MPI_Comm_set_attr.3 \
-MPI_Comm_set_name.3 \
-MPI_Comm_size.3 \
-MPI_Comm_spawn.3 \
-MPI_Comm_spawn_multiple.3 \
-MPI_Comm_split.3 \
-MPI_Comm_test_inter.3 \
-MPI_DUP_FN.3 \
-MPI_Dims_create.3 \
-MPI_Errhandler_c2f.3 \
-MPI_Errhandler_create.3 \
-MPI_Errhandler_f2c.3 \
-MPI_Errhandler_free.3 \
-MPI_Errhandler_get.3 \
-MPI_Errhandler_set.3 \
-MPI_Error_class.3 \
-MPI_Error_string.3 \
-MPI_File_c2f.3 \
-MPI_File_close.3 \
-MPI_File_delete.3 \
-MPI_File_f2c.3 \
-MPI_File_get_amode.3 \
-MPI_File_get_atomicity.3 \
-MPI_File_get_byte_offset.3 \
-MPI_File_get_errhandler.3 \
-MPI_File_get_group.3 \
-MPI_File_get_info.3 \
-MPI_File_get_position.3 \
-MPI_File_get_position_shared.3 \
-MPI_File_get_size.3 \
-MPI_File_get_type_extent.3 \
-MPI_File_get_view.3 \
-MPI_File_iread.3 \
-MPI_File_iread_at.3 \
-MPI_File_iread_shared.3 \
-MPI_File_iwrite.3 \
-MPI_File_iwrite_at.3 \
-MPI_File_iwrite_shared.3 \
-MPI_File_open.3 \
-MPI_File_preallocate.3 \
-MPI_File_read.3 \
-MPI_File_read_all.3 \
-MPI_File_read_all_begin.3 \
-MPI_File_read_all_end.3 \
-MPI_File_read_at.3 \
-MPI_File_read_at_all.3 \
-MPI_File_read_at_all_begin.3 \
-MPI_File_read_at_all_end.3 \
-MPI_File_read_ordered.3 \
-MPI_File_read_ordered_begin.3 \
-MPI_File_read_ordered_end.3 \
-MPI_File_read_shared.3 \
-MPI_File_seek.3 \
-MPI_File_seek_shared.3 \
-MPI_File_set_atomicity.3 \
-MPI_File_set_errhandler.3 \
-MPI_File_set_info.3 \
-MPI_File_set_size.3 \
-MPI_File_set_view.3 \
-MPI_File_sync.3 \
-MPI_File_write.3 \
-MPI_File_write_all.3 \
-MPI_File_write_all_begin.3 \
-MPI_File_write_all_end.3 \
-MPI_File_write_at.3 \
-MPI_File_write_at_all.3 \
-MPI_File_write_at_all_begin.3 \
-MPI_File_write_at_all_end.3 \
-MPI_File_write_ordered.3 \
-MPI_File_write_ordered_begin.3 \
-MPI_File_write_ordered_end.3 \
-MPI_File_write_shared.3 \
-MPI_Finalize.3 \
-MPI_Finalized.3 \
-MPI_Free_mem.3 \
-MPI_Gather.3 \
-MPI_Gatherv.3 \
-MPI_Get.3 \
-MPI_Get_address.3 \
-MPI_Get_count.3 \
-MPI_Get_elements.3 \
-MPI_Get_processor_name.3 \
-MPI_Get_version.3 \
-MPI_Graph_create.3 \
-MPI_Graph_get.3 \
-MPI_Graph_map.3 \
-MPI_Graph_neighbors.3 \
-MPI_Graph_neighbors_count.3 \
-MPI_Graphdims_get.3 \
-MPI_Group_c2f.3 \
-MPI_Group_compare.3 \
-MPI_Group_difference.3 \
-MPI_Group_excl.3 \
-MPI_Group_f2c.3 \
-MPI_Group_free.3 \
-MPI_Group_incl.3 \
-MPI_Group_intersection.3 \
-MPI_Group_range_excl.3 \
-MPI_Group_range_incl.3 \
-MPI_Group_rank.3 \
-MPI_Group_size.3 \
-MPI_Group_translate_ranks.3 \
-MPI_Group_union.3 \
-MPI_Ibsend.3 \
-MPI_Info_c2f.3 \
-MPI_Info_create.3 \
-MPI_Info_delete.3 \
-MPI_Info_dup.3 \
-MPI_Info_f2c.3 \
-MPI_Info_free.3 \
-MPI_Info_get.3 \
-MPI_Info_get_nkeys.3 \
-MPI_Info_get_nthkey.3 \
-MPI_Info_get_valuelen.3 \
-MPI_Info_set.3 \
-MPI_Init.3 \
-MPI_Init_thread.3 \
-MPI_Initialized.3 \
-MPI_Intercomm_create.3 \
-MPI_Intercomm_merge.3 \
-MPI_Iprobe.3 \
-MPI_Irecv.3 \
-MPI_Irsend.3 \
-MPI_Is_thread_main.3 \
-MPI_Isend.3 \
-MPI_Issend.3 \
-MPI_Keyval_create.3 \
-MPI_Keyval_free.3 \
-MPI_Lookup_name.3 \
-MPI_Op_c2f.3 \
-MPI_Op_create.3 \
-MPI_Op_f2c.3 \
-MPI_Op_free.3 \
-MPI_Open_port.3 \
-MPI_Pack.3 \
-MPI_Pack_size.3 \
-MPI_Pcontrol.3 \
-MPI_Probe.3 \
-MPI_Publish_name.3 \
-MPI_Put.3 \
-MPI_Query_thread.3 \
-MPI_Recv.3 \
-MPI_Recv_init.3 \
-MPI_Reduce.3 \
-MPI_Reduce_scatter.3 \
-MPI_Request_c2f.3 \
-MPI_Request_f2c.3 \
-MPI_Request_free.3 \
-MPI_Rsend.3 \
-MPI_Rsend_init.3 \
-MPI_Scan.3 \
-MPI_Scatter.3 \
-MPI_Scatterv.3 \
-MPI_Send.3 \
-MPI_Send_init.3 \
-MPI_Sendrecv.3 \
-MPI_Sendrecv_replace.3 \
-MPI_Ssend.3 \
-MPI_Ssend_init.3 \
-MPI_Start.3 \
-MPI_Startall.3 \
-MPI_Status_c2f.3 \
-MPI_Status_f2c.3 \
-MPI_TYPE_DUP_FN.3 \
-MPI_Test.3 \
-MPI_Test_cancelled.3 \
-MPI_Testall.3 \
-MPI_Testany.3 \
-MPI_Testsome.3 \
-MPI_Topo_test.3 \
-MPI_Type_c2f.3 \
-MPI_Type_commit.3 \
-MPI_Type_contiguous.3 \
-MPI_Type_create_darray.3 \
-MPI_Type_create_extent.3 \
-MPI_Type_create_hindexed.3 \
-MPI_Type_create_hvector.3 \
-MPI_Type_create_keyval.3 \
-MPI_Type_create_struct.3 \
-MPI_Type_create_subarray.3 \
-MPI_Type_delete_attr.3 \
-MPI_Type_dup.3 \
-MPI_Type_extent.3 \
-MPI_Type_f2c.3 \
-MPI_Type_free.3 \
-MPI_Type_free_keyval.3 \
-MPI_Type_get_attr.3 \
-MPI_Type_get_contents.3 \
-MPI_Type_get_envelope.3 \
-MPI_Type_get_extent.3 \
-MPI_Type_get_name.3 \
-MPI_Type_get_true_extent.3 \
-MPI_Type_hindexed.3 \
-MPI_Type_hvector.3 \
-MPI_Type_indexed.3 \
-MPI_Type_lb.3 \
-MPI_Type_set_attr.3 \
-MPI_Type_set_name.3 \
-MPI_Type_size.3 \
-MPI_Type_struct.3 \
-MPI_Type_ub.3 \
-MPI_Type_vector.3 \
-MPI_Unpack.3 \
-MPI_WIN_DUP_FN.3 \
-MPI_Wait.3 \
-MPI_Waitall.3 \
-MPI_Waitany.3 \
-MPI_Waitsome.3 \
-MPI_Win_c2f.3 \
-MPI_Win_complete.3 \
-MPI_Win_create.3 \
-MPI_Win_create_errhandler.3 \
-MPI_Win_create_keyval.3 \
-MPI_Win_delete_attr.3 \
-MPI_Win_f2c.3 \
-MPI_Win_fence.3 \
-MPI_Win_free.3 \
-MPI_Win_free_keyval.3 \
-MPI_Win_get_attr.3 \
-MPI_Win_get_errhandler.3 \
-MPI_Win_get_group.3 \
-MPI_Win_get_name.3 \
-MPI_Win_post.3 \
-MPI_Win_set_attr.3 \
-MPI_Win_set_errhandler.3 \
-MPI_Win_set_name.3 \
-MPI_Win_start.3 \
-MPI_Win_wait.3 \
-MPI_Wtick.3 \
-MPI_Wtime.3 \
-XMPI_Buoy.3 \
-XMPI_Coloroff.3 \
-XMPI_Coloron.3 \
-libmpi.3
-
-MAN5= \
-CONSTANTS.5 \
-appschema.5 \
-bhost.5 \
-conf.5 \
-lam-helpfile.5 \
-procschema.5
-
-MAN7= \
-LAM.7 \
-MPI.7 \
-lam.7 \
-mpi.7
diff --git a/net/lam/files/patch-man-mans-Makefile.in b/net/lam/files/patch-man-mans-Makefile.in
index 9202a2aed5e8..de6a111db378 100644
--- a/net/lam/files/patch-man-mans-Makefile.in
+++ b/net/lam/files/patch-man-mans-Makefile.in
@@ -1,7 +1,11 @@
---- man/mans/Makefile.in	Mon Jan 27 17:03:38 2003
-+++ man/mans/Makefile.in	Wed Jun 18 12:18:05 2003
-@@ -193,3 +193,3 @@
- 
+--- man/mans/Makefile.in.orig	Fri Mar 10 22:31:27 2006
++++ man/mans/Makefile.in	Sun Jul 16 16:43:58 2006
+@@ -134,7 +134,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
 -mansdir = $(mandir)/mans
 +mansdir = $(datadir)/lam
+ am__installdirs = "$(DESTDIR)$(mansdir)"
+ NROFF = nroff
  MANS = $(man_MANS)
diff --git a/net/lam/files/patch-otb+lamcheckpoint+lamcheckpoint.c b/net/lam/files/patch-otb+lamcheckpoint+lamcheckpoint.c
new file mode 100644
index 000000000000..b2baecbc7045
--- /dev/null
+++ b/net/lam/files/patch-otb+lamcheckpoint+lamcheckpoint.c
@@ -0,0 +1,38 @@
+--- ./otb/lamcheckpoint/lamcheckpoint.c.orig	Fri Feb 24 00:26:54 2006
++++ ./otb/lamcheckpoint/lamcheckpoint.c	Sun Jul 16 12:31:41 2006
+@@ -36,7 +36,7 @@
+ OPT *ad;
+ int param_crlam;
+ 
+-static int strtonum(const char *, pid_t *);
++static int istrtonum(const char *, pid_t *);
+ 
+ /*
+  * main
+@@ -80,7 +80,7 @@
+ 
+   pid_arg = ao_param(ad, "pid", 0, 0);
+  
+-  if (strtonum(pid_arg, &pid) != 0) {
++  if (istrtonum(pid_arg, &pid) != 0) {
+     show_help("lamcheckpoint", "usage", NULL);
+     lam_ssi_base_close();
+     ao_free(ad);
+@@ -125,7 +125,7 @@
+ 
+ 
+ /*
+- *	strtonum
++ *	istrtonum
+  *
+  *	Function:	- convert string to number if possible
+  *			- handles decimal/octal/hexadecimal
+@@ -135,7 +135,7 @@
+  *	Returns:	- 0 or LAMERROR
+  */
+ static int
+-strtonum(const char *str, pid_t *pnum)
++istrtonum(const char *str, pid_t *pnum)
+ {
+ 	char		*endstr;		/* end of parsed string */
+ 
diff --git a/net/lam/files/patch-share-args-all_opt.c b/net/lam/files/patch-share+args+all_opt.c
index ccf7d879a7a7..4c249dae4db9 100644
--- a/net/lam/files/patch-share-args-all_opt.c
+++ b/net/lam/files/patch-share+args+all_opt.c
@@ -1,6 +1,6 @@
---- share/args/all_opt.c.orig	Wed May 17 17:31:19 2006
-+++ share/args/all_opt.c	Wed May 17 17:43:55 2006
-@@ -21,6 +21,7 @@
+--- share/args/all_opt.c.orig	Sun Sep 26 17:35:02 2004
++++ share/args/all_opt.c	Sun Jul 16 12:07:07 2006
+@@ -19,6 +19,7 @@
   */
  
  #include <stdlib.h>
@@ -8,16 +8,16 @@
  #include <string.h>
  
  #include <all_opt.h>
-@@ -34,7 +35,7 @@
+@@ -33,7 +34,7 @@
  static int addinst(struct ao_opt *opt, int nparam, char **params);
  static int countparam(OPT *aod, struct ao_opt *opt, char **argv);
  static int mutexchk(struct ao_opt *opt);
--static int strtonum(char *str, int *pnum);
-+static int istrtonum(char *str, int *pnum);
- static struct ao_opt *findopt(OPT *desc, char *optstr);
+-static int strtonum(const char *str, int *pnum);
++static int istrtonum(const char *str, int *pnum);
+ static struct ao_opt *findopt(OPT *desc, const char *optstr);
  
  
-@@ -481,7 +482,7 @@
+@@ -652,7 +653,7 @@
  /*
   * If a number, assume '#' option.
   */
@@ -26,8 +26,8 @@
  
  			popt = findopt(aod, "#");
  			if ((popt == 0) || (mutexchk(popt))) {
-@@ -650,7 +651,7 @@
- }
+@@ -884,7 +885,7 @@
+ 
  
  /*
 - *	strtonum
@@ -35,16 +35,16 @@
   *
   *	Function:	- convert string to number if possible
   *			- handles decimal/octal/hexadecimal
-@@ -660,7 +661,7 @@
+@@ -894,7 +895,7 @@
   *	Returns:	- 0 or LAMERROR
   */
  static int
--strtonum(char *str, int *pnum)
-+istrtonum(char *str, int *pnum)
+-strtonum(const char *str, int *pnum)
++istrtonum(const char *str, int *pnum)
  {
  	char		*endstr;		/* end of parsed string */
  
-@@ -720,7 +721,7 @@
+@@ -956,7 +957,7 @@
  
  		if (strcmp(string, "--") == 0) break;
  
@@ -53,7 +53,7 @@
  				(findopt(aod, "#") != 0)) break;
  
  		if (findopt(aod, string + 1)) break;
-@@ -799,7 +800,7 @@
+@@ -1036,7 +1037,7 @@
  	for (; nparam > 0; --nparam, ++params, parmbuf += size) {
  
  		if (fl_int) {