Attachment #79970 for bug #114805




#

PORTNAME=	mbdyn
PORTVERSION=	1.2.7
PORTREVISION=	1
CATEGORIES=	science
MASTER_SITES=	http://mbdyn.aero.polimi.it/~masarati/Download/mbdyn/


CONFIGURE_ARGS+=	--program-prefix='' --with-umfpack=yes
CPPFLAGS+=	-I${LOCALBASE}/include/suitesparse ${PTHREAD_CFLAGS}
LDFLAGS+=	-lm -L${LOCALBASE}/lib ${PTHREAD_LIBS}
USE_FORTRAN=	yes 
BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
FC=		gfortran42
F77=		gfortran42
FORTRANLIBS=	-lgfortranbegin -lgfortran
GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..


Lines 1-3 Link Here

(-)mbdyn/distinfo (-3 / +3 lines)
1	MD5 (mbdyn-1.2.6.tar.gz) = c77fcd450481054462a70a4426c5f816	1	MD5 (mbdyn-1.2.7.tar.gz) = 8a1340262781babb76776ac2f9357556
2	SHA256 (mbdyn-1.2.6.tar.gz) = f550ca89a2cc04c5175315ba8a1f5585531423ac02b64a1d80809c714850e9d6	2	SHA256 (mbdyn-1.2.7.tar.gz) = 30bf8ae2888617fd359d2d63b5b1a45d5c305690ddf29b106693aec2ff3f0122
3	SIZE (mbdyn-1.2.6.tar.gz) = 1599343	3	SIZE (mbdyn-1.2.7.tar.gz) = 1599410

Lines 1-11 Link Here

(-)mbdyn/files/patch-dummy_c.c (-11 lines)
1	--- mbdyn/dummy_c.c~ Thu Jan 19 01:26:09 2006
2	+++ mbdyn/dummy_c.c Wed Jan 17 11:12:01 2007
3	@@ -40,7 +40,7 @@
4	dummy_c(void)
5	{
6	double a, b;
7	- pow_dd(&a, &b);
8	+// pow_dd(&a, &b);
9
10	#ifdef NEED_F77_IO
11	#warning "needed for F77 I/o"




Fix to Schur data manager caused by the introduction of the output meter;
only affects MBDyn 1.2.6 when --enable-schur

Index: mbdyn/base/schurdataman.cc
===================================================================
RCS file: /var/cvs/mbdyn/mbdyn/mbdyn-1.0/mbdyn/base/schurdataman.cc,v
retrieving revision 1.40.2.6
retrieving revision 1.40.2.7
diff -u -r1.40.2.6 -r1.40.2.7
--- mbdyn/base/schurdataman.cc	18 Jan 2006 16:29:56 -0000	1.40.2.6
+++ mbdyn/base/schurdataman.cc	8 Feb 2006 20:02:29 -0000	1.40.2.7
@@ -1835,7 +1835,7 @@
 	DEBUGCOUT("Entering SchurDataManager::Output()" << std::endl);
 
 	/* output only at multiples of iOutputFrequency */
-	if ((!force) && (iOutputCount++%iOutputFrequency)) {
+	if ((!force) && !pOutputMeter->dGet()) {
 		return;
 	}
 

Lines 1-6 Link Here

(-)mbdyn/pkg-plist (-1 lines)
1	bin/mbdyn	1	bin/mbdyn
2	bin/2vec2phi	2	bin/2vec2phi
3	bin/trim
4	bin/autopilot	3	bin/autopilot
5	bin/c81merge	4	bin/c81merge
6	bin/c81test	5	bin/c81test

Return to bug 114805

Lines 6-13 Link Here

(-)mbdyn/Makefile (-6 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= mbdyn	8	PORTNAME= mbdyn
9	PORTVERSION= 1.2.6	9	PORTVERSION= 1.2.7
10	PORTREVISION= 1
11	CATEGORIES= science	10	CATEGORIES= science
12	MASTER_SITES= http://mbdyn.aero.polimi.it/~masarati/Download/mbdyn/	11	MASTER_SITES= http://mbdyn.aero.polimi.it/~masarati/Download/mbdyn/
13		12
Lines 22-31 Link Here
22	CONFIGURE_ARGS+= --program-prefix='' --with-umfpack=yes	21	CONFIGURE_ARGS+= --program-prefix='' --with-umfpack=yes
23	CPPFLAGS+= -I${LOCALBASE}/include/suitesparse ${PTHREAD_CFLAGS}	22	CPPFLAGS+= -I${LOCALBASE}/include/suitesparse ${PTHREAD_CFLAGS}
24	LDFLAGS+= -lm -L${LOCALBASE}/lib ${PTHREAD_LIBS}	23	LDFLAGS+= -lm -L${LOCALBASE}/lib ${PTHREAD_LIBS}
25	WANT_FORTRAN= yes #dummy but future use	24	USE_FORTRAN= yes
26	BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
27	FC= gfortran42
28	F77= gfortran42
29	FORTRANLIBS= -lgfortranbegin -lgfortran	25	FORTRANLIBS= -lgfortranbegin -lgfortran
30	GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..	26	GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
31		27

Lines 1-20 Link Here

(-)mbdyn/files/patch-mbdyn__base__schurdataman.cc (-20 lines)
1	Fix to Schur data manager caused by the introduction of the output meter;
2	only affects MBDyn 1.2.6 when --enable-schur
3
4	Index: mbdyn/base/schurdataman.cc
5	===================================================================
6	RCS file: /var/cvs/mbdyn/mbdyn/mbdyn-1.0/mbdyn/base/schurdataman.cc,v
7	retrieving revision 1.40.2.6
8	retrieving revision 1.40.2.7
9	diff -u -r1.40.2.6 -r1.40.2.7
10	--- mbdyn/base/schurdataman.cc 18 Jan 2006 16:29:56 -0000 1.40.2.6
11	+++ mbdyn/base/schurdataman.cc 8 Feb 2006 20:02:29 -0000 1.40.2.7
12	@@ -1835,7 +1835,7 @@
13	DEBUGCOUT("Entering SchurDataManager::Output()" << std::endl);
14
15	/* output only at multiples of iOutputFrequency */
16	- if ((!force) && (iOutputCount++%iOutputFrequency)) {
17	+ if ((!force) && !pOutputMeter->dGet()) {
18	return;
19	}
20