mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

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

Browse Source 
already have an internal function of same name
- Portlint

PR:		ports/97443
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>
This commit is contained in:
Pav Lucistnik 2006-05-21 20:02:32 +00:00
parent 2df2774f05
commit 8a94f41648
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=162969
3 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/lam/Makefile
View File

@ -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

64
net/lam/files/patch-share-args-all_opt.c Normal file
View File

@ -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);
}

14
net/lam/pkg-plist
View File

@ -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%%