- Fix build; strtonum(3) was added to recent versions of FreeBSD, but lam

already have an internal function of same name
- Portlint

PR:		ports/97443
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>

net/lam/Makefile

@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=      	lam
-PORTVERSION=   	6.5.9
-CATEGORIES=    	net parallel
-MASTER_SITES=  	http://www.lam-mpi.org/download/files/
+PORTNAME=	lam
+PORTVERSION=	6.5.9
+CATEGORIES=	net parallel
+MASTER_SITES=	http://www.lam-mpi.org/download/files/
 
-MAINTAINER=    	ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Local Area Multicomputer MPI implementation
 
 USE_BZIP2=	yes

net/lam/files/patch-share-args-all_opt.c

@@ -0,0 +1,64 @@
+--- 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 @@
+  */
+ 
+ #include <stdlib.h>
++#include <limits.h>
+ #include <string.h>
+ 
+ #include <all_opt.h>
+@@ -34,7 +35,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);
+ 
+ 
+@@ -481,7 +482,7 @@
+ /*
+  * If a number, assume '#' option.
+  */
+-		else if (strtonum(++str, &num) == 0) {
++		else if (istrtonum(++str, &num) == 0) {
+ 
+ 			popt = findopt(aod, "#");
+ 			if ((popt == 0) || (mutexchk(popt))) {
+@@ -650,7 +651,7 @@
+ }
+ 
+ /*
+- *	strtonum
++ *	istrtonum
+  *
+  *	Function:	- convert string to number if possible
+  *			- handles decimal/octal/hexadecimal
+@@ -660,7 +661,7 @@
+  *	Returns:	- 0 or LAMERROR
+  */
+ static int
+-strtonum(char *str, int *pnum)
++istrtonum(char *str, int *pnum)
+ {
+ 	char		*endstr;		/* end of parsed string */
+ 
+@@ -720,7 +721,7 @@
+ 
+ 		if (strcmp(string, "--") == 0) break;
+ 
+-		if ((strtonum(string + 1, &num) == 0) &&
++		if ((istrtonum(string + 1, &num) == 0) &&
+ 				(findopt(aod, "#") != 0)) break;
+ 
+ 		if (findopt(aod, string + 1)) break;
+@@ -799,7 +800,7 @@
+ 	for (; nparam > 0; --nparam, ++params, parmbuf += size) {
+ 
+ 		if (fl_int) {
+-			if (strtonum(*params, &num)) {
++			if (istrtonum(*params, &num)) {
+ 				errno = EUSAGE;
+ 				return(LAMERROR);
+ 			}

net/lam/pkg-plist

@@ -72,11 +72,11 @@ lib/libmpi.la
 lib/libmpi.a
 lib/liblammpi++.a
 lib/liblammpio.a
-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/mpi.share
+%%DATADIR%%/doc/ROMIO-COPYRIGHT
+%%DATADIR%%/doc/ROMIO-README
+%%DATADIR%%/doc/ROMIO-README_LAM
+%%DATADIR%%/doc/romio-users-guide.ps.gz
+%%DATADIR%%/mpi.share
 @dirrm include/mpi2c++
-@dirrm share/lam/doc
-@dirrm share/lam
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%