ports/93176: [Maintainer Update] science/mbdyn: add a patch to unbreak compilation with mpich

[Kay Lehmann]

>Number:         93176
>Category:       ports
>Synopsis:       [Maintainer Update] science/mbdyn: add a patch to unbreak compilation with mpich
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 11 11:00:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Kay Lehmann
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.0-STABLE #4: Wed Jan 18 20:18:17 CET 2006
    root at bippes.finkenkrug.ev:/usr/obj/usr/src/sys/bippes



>Description:


This is a followup to pr=ports/92909
The last version did not compile with mpich.
This pr includes the official patch which solves this problem


>How-To-Repeat:





>Fix:


--- mbdyn-1.2.6-schurman.diff begins here ---
Index: files/patch-mbdyn__base__schurdataman.cc
===================================================================
--- files/patch-mbdyn__base__schurdataman.cc	(revision 0)
+++ files/patch-mbdyn__base__schurdataman.cc	(revision 0)
@@ -0,0 +1,20 @@
+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;
+ 	}
+ 
Index: Makefile
===================================================================
--- Makefile	(revision 43)
+++ Makefile	(working copy)
@@ -37,7 +37,6 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MPI)
-BROKEN=		does not build with mpi enabled
 BUILD_DEPENDS+=	${LOCALBASE}/mpich/lib/libmpich.a:${PORTSDIR}/net/mpich
 CONFIGURE_ARGS+=	--with-mpi=pmpi
 CPPFLAGS+=	-I${LOCALBASE}/mpich/include -I${LOCALBASE}/mpich/include/mpi2c++
@@ -47,6 +46,7 @@
 .endif
 
 .if defined(WITH_METIS)
+BROKEN=		Does not compile with metis enabled
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis
 CONFIGURE_ARGS+=	--with-metis=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/metis
--- mbdyn-1.2.6-schurman.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: