Date: Thu, 18 May 2006 00:53:32 GMT From: "Pedro F. Giffuni" <giffunip@asme.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/97443: net/lam port: fix build Message-ID: <200605180053.k4I0rWsT051903@www.freebsd.org> Resent-Message-ID: <200605180100.k4I10TGO035787@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97443 >Category: ports >Synopsis: net/lam port: fix build >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 18 01:00:29 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 6.1-Release >Organization: >Environment: FreeBSD etoile.cable.net.co 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Fri May 12 00:18:58 COT 2006 root@etoile.cable.net.co:/usr/src/sys/amd64/compile/DIMENSION amd64 >Description: strtonum(3) was adopted from OpenBSD but it conflicts with a similar function used in lam. This patch changes the name to fix the build and also cleans some portlint issues. This port should be repocopied to lam6. lam7 requires a similar fix and an update but should become the new net/lam. I also think both should have parallel as a main category. >How-To-Repeat: >Fix: diff -ruN lam.orig/Makefile lam/Makefile --- lam.orig/Makefile Tue Dec 20 22:09:40 2005 +++ lam/Makefile Wed May 17 19:45:38 2006 @@ -5,12 +5,12 @@ # $FreeBSD: ports/net/lam/Makefile,v 1.6 2005/12/21 03:09:40 edwin Exp $ # -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 diff -ruN lam.orig/files/patch-share+args+all_opt.c lam/files/patch-share+args+all_opt.c --- lam.orig/files/patch-share+args+all_opt.c Wed Dec 31 19:00:00 1969 +++ lam/files/patch-share+args+all_opt.c Wed May 17 17:44:35 2006 @@ -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); + } diff -ruN lam.orig/pkg-plist lam/pkg-plist --- lam.orig/pkg-plist Thu Jun 19 10:31:00 2003 +++ lam/pkg-plist Wed May 17 19:36:52 2006 @@ -72,11 +72,11 @@ 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%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605180053.k4I0rWsT051903>