From b1b6752632dcc7bf702971d7649f250e623c4c72 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Wed, 26 Jan 2005 13:56:44 +0000
Subject: - Force gcc 3.2 if gcc 3.3 is present in base system, to avoid
 runtime crashes

PR:		ports/76636
Submitted by:	Jean-Sebastien Roy <js@jeannot.org> (maintainer)
---
 math/scilab/Makefile       |  8 +++++++-
 math/scilab/files/patch-bb | 28 ++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'math/scilab')

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 964890d..61c76da 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	math cad parallel
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Scilab/distributions/
 EXTRACT_SUFX=	.src.tar.gz
@@ -43,13 +44,18 @@ CONFIGURE_ARGS=	--with-tk \
 		--with-atlas-library=${LOCALBASE}/lib \
 		--without-ocaml
 
-CONFIGURE_ENV=	PVM_ROOT=${PVM_ROOT} X11BASE=${X11BASE}
+CONFIGURE_ENV=	PVM_ROOT=${PVM_ROOT} X11BASE=${X11BASE} F77=$(F77)
 MAKE_ENV=	PVM_INCLUDE=${LOCALBASE}/include
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
+# Scilab broken with GCC 3.3 on FreeBSD 5.3
+.if ${OSVERSION} >= 503000
+USE_GCC=	3.2
+.endif
+
 .if ${ARCH} == "alpha" && ${OSVERSION} >= 502102 || ${ARCH} == "sparc64"
 BROKEN=		"Does not compile on alpha 5.x or sparc64"
 .endif
diff --git a/math/scilab/files/patch-bb b/math/scilab/files/patch-bb
index ccf1485..dbc5cbb 100644
--- a/math/scilab/files/patch-bb
+++ b/math/scilab/files/patch-bb
@@ -1,5 +1,29 @@
---- configure.orig	Sat Jul 24 11:16:25 2004
-+++ configure	Sat Jul 24 11:16:34 2004
+--- configure.orig	Fri Jul  9 10:28:05 2004
++++ configure	Sun Jan 16 14:45:09 2005
+@@ -21087,12 +21087,12 @@
+ # FreeBSD  systems (not supported by INRIA)
+   *-*-freebsd*)
+      GCC=yes
+-     CC=cc
++     CC=$CC
+      CC_OPTIONS="${CFLAGS} -Dfreebsd"
+      CC_LDFLAGS=-lm
+      CC_PICFLAGS='-fPIC'
+      # script shell f77 have bugs, get ours
+-     FC=f77
++     FC=$F77
+      FC_OPTIONS="${CFLAGS} -Dfreebsd"
+      FC_OPTIONS_O0='-Dfreebsd'
+      FC_LDFLAGS='-lm -Wl,--export-dynamic'
+@@ -21106,7 +21106,7 @@
+      fi
+      if test "$WITH_G77" = yes; then
+        # On FreeBSD the gnu fortran compiler is named f77
+-       FC=f77
++       FC=$F77
+      fi
+     DLDLIB='${SCIDIR}/libs/libdld.a'
+     DLD_SUBDIR=dld
 @@ -26503,7 +26503,7 @@
      ;;
  esac
-- 
cgit v1.1