diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-03-13 08:26:26 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-03-13 08:26:26 +0000 |
| commit | 97c69cc6df86fd875887a23b33a7084f153c0bbc (patch) | |
| tree | 974f9a7fe051abd10e28b3628268a9e5b609f640 /math | |
| parent | - Add forgotten files dir (diff) | |
- Fix libtk nameing to enable scilab build-in to work.
PR: 110186
Submitted by: Jean-Sebastien Roy <js@jeannot.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=187254
Diffstat (limited to 'math')
| -rw-r--r-- | math/scilab/Makefile | 8 | ||||
| -rw-r--r-- | math/scilab/files/patch-configure.in | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 186cf453440f..7ce9011591ff 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -7,7 +7,7 @@ PORTNAME= scilab PORTVERSION= 4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math cad parallel MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/ EXTRACT_SUFX= -src.tar.gz @@ -69,7 +69,7 @@ PLIST_SUB+= GTK2="@comment " NOGTK2="" .endif .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) -WITH_ATLAS= yes +WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) CONFIGURE_ARGS+= --with-atlas-library=${LOCALBASE}/lib @@ -85,13 +85,13 @@ MAKE_ENV+= BLAS_LIBS="-L${LOCALBASE}/lib ${BLAS_LIBS}" # Scilab broken with GCC 3.3 on FreeBSD 5.3 .if ${OSVERSION} >= 503000 && ${OSVERSION} < 600000 #USE_GCC= 3.2 #override FC and F77 -BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 CC= gcc32 CXX= g++32 .endif WANT_FORTRAN=yes #dummy but future use -BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 +BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 F77= gfortran42 FC= gfortran42 CONFIGURE_ARGS+= --with-gfortran diff --git a/math/scilab/files/patch-configure.in b/math/scilab/files/patch-configure.in index 3e4fde71b033..0dd311f105d9 100644 --- a/math/scilab/files/patch-configure.in +++ b/math/scilab/files/patch-configure.in @@ -53,3 +53,13 @@ fi DLDLIB='${SCIDIR}/libs/libdld.a' DLD_SUBDIR=dld +@@ -1904,6 +1919,9 @@ + GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME + + case "$host" in ++ *-*-freebsd*) ++ GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME ++ ;; + *-*-darwin*) + GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib + ;; |