From b0c55b07ca7363a20e3d729e52e7c84888a9ef85 Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Tue, 23 Jul 2002 22:30:18 +0000 Subject: [PATCH] * Unbreak build of FORTRAN parts. PR: 40928 Submitted by: Amar Takhar * Fix build on -CURRENT. --- math/femlab/Makefile | 2 - math/femlab/files/patch-ab | 129 +++++++++----------- math/femlab/files/patch-fsource_makepoisson | 11 ++ math/femlab/files/patch-fsource_y.tab.c | 14 +++ math/femlab/files/patch-source_y.tab.c | 14 +++ 5 files changed, 95 insertions(+), 75 deletions(-) create mode 100644 math/femlab/files/patch-fsource_makepoisson create mode 100644 math/femlab/files/patch-fsource_y.tab.c create mode 100644 math/femlab/files/patch-source_y.tab.c diff --git a/math/femlab/Makefile b/math/femlab/Makefile index 2599c51ff73b..a159f8085c10 100644 --- a/math/femlab/Makefile +++ b/math/femlab/Makefile @@ -14,8 +14,6 @@ DISTFILES= femlab-2d-v${PORTVERSION}.tar.gz MAINTAINER= ports@FreeBSD.org -BROKEN= "Does not build" - BUILD_DEPENDS= ${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx USE_X_PREFIX= yes diff --git a/math/femlab/files/patch-ab b/math/femlab/files/patch-ab index c67482259225..e2679899f721 100644 --- a/math/femlab/files/patch-ab +++ b/math/femlab/files/patch-ab @@ -1,74 +1,57 @@ -*** source/graph.c.orig Thu Sep 14 08:42:13 1995 ---- source/graph.c Sat Mar 7 00:14:42 1998 -*************** -*** 608,614 **** - void getDrawingScale() - { - float xoff, yoff; -! float scl; - int width, height; - int ww; - int nx, ny, id; ---- 611,617 ---- - void getDrawingScale() - { - float xoff, yoff; -! float iscl; /* inverse scale */ - int width, height; - int ww; - int nx, ny, id; -*************** -*** 630,654 **** - width = width / nx; - height = height / ny; - -! if(state > HAVE_NOTHING){ -! scl = 1./max(xmax-xmin,ymax-ymin); -! xoff = -scl*(xmin+.5*(xmax-xmin)-.5/scl); -! yoff = -scl*(ymin+.5*(ymax-ymin)-.5/scl); -! -! xoff = - xmin*scl*.85; -! yoff = - ymin*scl*.85; -! -! ww = min(width, height); -! Xscl = (int) ((float)ww * 0.85 * scl); -! Xxoff = (int) ww * xoff ; -! Xyoff = (int) ww * yoff; -! Xxoff += (int) (width - ( Xscl*xmax +Xxoff))/2 + (id+nx-1)%nx *width; -! Xyoff += (int) (height - ( Xscl*ymax +Xyoff))/2 + (int)(id/(nx+.5)) *height; -! } - - SetDrawArea(drawWindow); - if(device == PS) - psGetScale(); - } - - void getBoundaryScale(Widget w, void *data) ---- 633,659 ---- - width = width / nx; - height = height / ny; - -! iscl = max(xmax-xmin,ymax-ymin); -! if (iscl != 0.0) { -! if(state > HAVE_NOTHING) { -! /* These are recalculated ?? -! xoff = .5-(xmin+.5*(xmax-xmin))/iscl; -! yoff = .5-(ymin+.5*(ymax-ymin))/iscl; -! */ -! xoff = - xmin*.85/iscl; -! yoff = - ymin*.85/iscl; -! ww = min(width, height); -! Xscl = (int) ((float)ww * 0.85 / iscl); -! Xxoff = (int) ww * xoff ; -! Xyoff = (int) ww * yoff; -! Xxoff += (int) (width - ( Xscl*xmax +Xxoff))/2 + (id+nx-1)%nx *width; -! Xyoff += (int) (height - ( Xscl*ymax +Xyoff))/2 + (int)(id/(nx+.5)) *height; -! } - - SetDrawArea(drawWindow); - if(device == PS) - psGetScale(); + +$FreeBSD$ + +--- source/graph.c.orig Wed Jul 24 00:01:06 2002 ++++ source/graph.c Wed Jul 24 00:01:07 2002 +@@ -608,7 +608,7 @@ + void getDrawingScale() + { + float xoff, yoff; +- float scl; ++ float iscl; /* inverse scale */ + int width, height; + int ww; + int nx, ny, id; +@@ -630,25 +630,27 @@ + width = width / nx; + height = height / ny; + +- if(state > HAVE_NOTHING){ +- scl = 1./max(xmax-xmin,ymax-ymin); +- xoff = -scl*(xmin+.5*(xmax-xmin)-.5/scl); +- yoff = -scl*(ymin+.5*(ymax-ymin)-.5/scl); +- +- xoff = - xmin*scl*.85; +- yoff = - ymin*scl*.85; +- +- ww = min(width, height); +- Xscl = (int) ((float)ww * 0.85 * scl); +- Xxoff = (int) ww * xoff ; +- Xyoff = (int) ww * yoff; +- Xxoff += (int) (width - ( Xscl*xmax +Xxoff))/2 + (id+nx-1)%nx *width; +- Xyoff += (int) (height - ( Xscl*ymax +Xyoff))/2 + (int)(id/(nx+.5)) *height; +- } ++ iscl = max(xmax-xmin,ymax-ymin); ++ if (iscl != 0.0) { ++ if(state > HAVE_NOTHING) { ++/* These are recalculated ?? ++ xoff = .5-(xmin+.5*(xmax-xmin))/iscl; ++ yoff = .5-(ymin+.5*(ymax-ymin))/iscl; ++*/ ++ xoff = - xmin*.85/iscl; ++ yoff = - ymin*.85/iscl; ++ ww = min(width, height); ++ Xscl = (int) ((float)ww * 0.85 / iscl); ++ Xxoff = (int) ww * xoff ; ++ Xyoff = (int) ww * yoff; ++ Xxoff += (int) (width - ( Xscl*xmax +Xxoff))/2 + (id+nx-1)%nx *width; ++ Xyoff += (int) (height - ( Xscl*ymax +Xyoff))/2 + (int)(id/(nx+.5)) *height; + } - } - - void getBoundaryScale(Widget w, void *data) + + SetDrawArea(drawWindow); + if(device == PS) + psGetScale(); ++ } + } + + void getBoundaryScale(Widget w, void *data) diff --git a/math/femlab/files/patch-fsource_makepoisson b/math/femlab/files/patch-fsource_makepoisson new file mode 100644 index 000000000000..2544f6e764ca --- /dev/null +++ b/math/femlab/files/patch-fsource_makepoisson @@ -0,0 +1,11 @@ + +$FreeBSD$ + +--- fsource/makepoisson.orig Thu Sep 14 09:47:27 1995 ++++ fsource/makepoisson Wed Jul 24 00:06:17 2002 +@@ -1,4 +1,4 @@ +-FFLAGS= -O ++FFLAGS= -O -fno-globals + + FFILES= dwm1.f startpo.f preproc.f rhslhs.f poisson.f output.f + diff --git a/math/femlab/files/patch-fsource_y.tab.c b/math/femlab/files/patch-fsource_y.tab.c new file mode 100644 index 000000000000..9d34ab611752 --- /dev/null +++ b/math/femlab/files/patch-fsource_y.tab.c @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- fsource/y.tab.c.orig Wed Jul 24 00:14:46 2002 ++++ fsource/y.tab.c Wed Jul 24 00:14:56 2002 +@@ -38,7 +38,7 @@ + #include + #endif + +-#include ++#include + + #ifdef __cplusplus + diff --git a/math/femlab/files/patch-source_y.tab.c b/math/femlab/files/patch-source_y.tab.c new file mode 100644 index 000000000000..0b62ac04f66a --- /dev/null +++ b/math/femlab/files/patch-source_y.tab.c @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- source/y.tab.c.orig Wed Jul 24 00:01:34 2002 ++++ source/y.tab.c Wed Jul 24 00:01:44 2002 +@@ -38,7 +38,7 @@ + #include + #endif + +-#include ++#include + + #ifdef __cplusplus +