- Update to 7.1.4

- Disable f77 bits, so it can be compiled on 7.0

PR:		ports/117272
Submitted by:	Alexandre "Sunny" Kovalenko <alex.kovalenko@verizon.net>
This commit is contained in:
Pav Lucistnik 2007-10-26 11:40:17 +00:00
parent 7b322489c0
commit ad085fb22d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202071
5 changed files with 6 additions and 114 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= lam
PORTVERSION= 7.1.2
PORTVERSION= 7.1.4
CATEGORIES= net parallel
MASTER_SITES= http://www.lam-mpi.org/download/files/ \
http://www.thinkingnerds.com/lam/download/files/
@ -17,7 +17,7 @@ COMMENT= Local Area Multicomputer MPI implementation
USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rsh=ssh
CONFIGURE_ARGS= --with-rsh=ssh --without-fc
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_LDCONFIG= yes
@ -373,10 +373,6 @@ MAN7= LAM.7 \
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Broken with gcc 4.2
.endif
.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

View file

@ -1,3 +1,3 @@
MD5 (lam-7.1.2.tar.bz2) = 07c59cf03c773a67199e066e500e499b
SHA256 (lam-7.1.2.tar.bz2) = b3826e79f1a674ed275d2a0e32895aefe63d4278126bd5fa01dbe43cc1c1960b
SIZE (lam-7.1.2.tar.bz2) = 7851483
MD5 (lam-7.1.4.tar.bz2) = 3f9240327fae75b1de479ae3f3e2c31a
SHA256 (lam-7.1.4.tar.bz2) = d66c205f57d9ffc38dbfb81faef8b586ef2b9e08853034c0472ef4ae45803d2e
SIZE (lam-7.1.4.tar.bz2) = 7865813

View file

@ -1,38 +0,0 @@
--- ./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 */

View file

@ -1,64 +0,0 @@
--- 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>
+#include <limits.h>
#include <string.h>
#include <all_opt.h>
@@ -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(const char *str, int *pnum);
+static int istrtonum(const char *str, int *pnum);
static struct ao_opt *findopt(OPT *desc, const char *optstr);
@@ -652,7 +653,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))) {
@@ -884,7 +885,7 @@
/*
- * strtonum
+ * istrtonum
*
* Function: - convert string to number if possible
* - handles decimal/octal/hexadecimal
@@ -894,7 +895,7 @@
* Returns: - 0 or LAMERROR
*/
static int
-strtonum(const char *str, int *pnum)
+istrtonum(const char *str, int *pnum)
{
char *endstr; /* end of parsed string */
@@ -956,7 +957,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;
@@ -1036,7 +1037,7 @@
for (; nparam > 0; --nparam, ++params, parmbuf += size) {
if (fl_int) {
- if (strtonum(*params, &num)) {
+ if (istrtonum(*params, &num)) {
errno = EUSAGE;
return(LAMERROR);
}

View file

@ -33,6 +33,7 @@ etc/lam-helpfile
etc/lam-hostmap.txt
etc/lam-ssi-boot-globus-helpfile
etc/lam-ssi-boot-slurm-helpfile
etc/lam-ssi-crlam-self-helpfile
etc/lam-ssi-crmpi-self-helpfile
include/lam_config.h
include/lam_config_bottom.h
@ -86,7 +87,6 @@ include/mpi2cxx/topology_inln.h
include/mpi2cxx/win.h
include/mpi2cxx/win_inln.h
include/mpicxx.h
include/mpif.h
include/mpio.h
include/mpiof.h
%%I386%%lib/lam/liblam_totalview.la
@ -94,8 +94,6 @@ include/mpiof.h
%%I386%%lib/lam/liblam_totalview.so.0
lib/liblam.a
lib/liblam.la
lib/liblamf77mpi.a
lib/liblamf77mpi.la
lib/liblammpi++.a
lib/liblammpi++.la
lib/liblammpio.a