1 files changed, 34 insertions, 23 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 5b187f37efc2..9d9e44e1e48f 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scilab
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	4.0
 CATEGORIES=	math cad parallel
 MASTER_SITES=	http://scilabsoft.inria.fr/download/${PORTVERSION}/
 EXTRACT_SUFX=	-src.tar.gz
@@ -15,15 +14,10 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	js@jeannot.org
 COMMENT=	A free Matlab clone by INRIA & ENPC
 
-LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
-		lapack.3:${PORTSDIR}/math/lapack
-BUILD_DEPENDS=	pvm:${PORTSDIR}/net/pvm \
-		wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		sabcmd:${PORTSDIR}/textproc/sablotron
-RUN_DEPENDS+=	pvm:${PORTSDIR}/net/pvm \
-		wish8.4:${PORTSDIR}/x11-toolkits/tk84
-
-PVM_ROOT=	${LOCALBASE}/lib/pvm
+LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+BUILD_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
+		xsltproc:${PORTSDIR}/textproc/libxslt
+RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
@@ -34,39 +28,55 @@ CONFIGURE_ARGS=	--with-tk \
 		--with-tk-include=${LOCALBASE}/include/tk8.4 \
 		--with-tcl-library=${LOCALBASE}/lib \
 		--with-tcl-include=${LOCALBASE}/include/tcl8.4 \
-		--with-pvm-library=${LOCALBASE}/lib \
-		--with-pvm-include=${LOCALBASE}/include \
 		--with-xaw3d \
 		--x-include=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
 		--without-java \
 		--without-ocaml
 
-CONFIGURE_ENV=	PVM_ROOT=${PVM_ROOT} X11BASE=${X11BASE} F77=${F77} FFLAGS="${FFLAGS}"
-MAKE_ENV=	PVM_INCLUDE=${LOCALBASE}/include
+CONFIGURE_ENV=	X11BASE=${X11BASE} F77=${F77} FFLAGS="${FFLAGS}"
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}" DOCSDIR="share/doc/scilab"
 
-OPTIONS=	ATLAS	"Use Atlas"		on \
-		GTK2	"Adds Gtk+2 support"	off
+OPTIONS=	ATLAS	"Use Atlas"		off \
+		GTK2	"Use Gtk+2 interface"	off \
+		PVM	"Use PVM"	 	off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_PVM)
+CONFIGURE_ARGS+=	--with-pvm-library=${LOCALBASE}/lib \
+			--with-pvm-include=${LOCALBASE}/include
+PVM_ROOT=	${LOCALBASE}/lib/pvm
+CONFIGURE_ENV+=	PVM_ROOT=${PVM_ROOT}
+RUN_DEPENDS+=	pvm:${PORTSDIR}/net/pvm
+BUILD_DEPENDS+=	pvm:${PORTSDIR}/net/pvm
+MAKE_ENV=	PVM_INCLUDE=${LOCALBASE}/include
+.else
+CONFIGURE_ARGS+=	--without-pvm
+.endif
+
 .if defined(WITH_GTK2)
-USE_GNOME=		pkgconfig gtk20 libgtkhtml vte
+USE_GNOME=	pkgconfig gtk20 libgtkhtml vte
 CONFIGURE_ARGS+=	--with-gtk2
-PLIST_SUB+=		GTK2="" NOGTK2="@comment "
+PLIST_SUB+=	GTK2="" NOGTK2="@comment "
 .if ${OSVERSION} < 500000
-LIB_DEPENDS+=		readline.5:${PORTSDIR}/devel/readline
+LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
 .endif
 .else
-PLIST_SUB+=		GTK2="@comment " NOGTK2=""
+PLIST_SUB+=	GTK2="@comment " NOGTK2=""
 .endif
 
-.if !defined(WITHOUT_ATLAS)
+.if defined(WITH_ATLAS)
 CONFIGURE_ARGS+=	--with-atlas-library=${LOCALBASE}/lib
-LIB_DEPENDS+=		f77blas.1:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	f77blas.1:${PORTSDIR}/math/atlas
+BLAS_LIBS=	-lalapack -lcblas -lf77blas -latlas
+.else
+LIB_DEPENDS+=	lapack.3:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	blas.1:${PORTSDIR}/math/blas
+BLAS_LIBS?=	-llapack -lblas
 .endif
+MAKE_ENV+=	BLAS_LIBS="-L${LOCALBASE}/lib ${BLAS_LIBS}"
 
 # Scilab broken with GCC 3.3 on FreeBSD 5.3
 .if ${OSVERSION} >= 503000 && ${OSVERSION} < 600000
@@ -91,5 +101,6 @@ post-patch:
 pre-install:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${FIND} ${WRKSRC} -name \*.bak -delete
+	@${FIND} ${WRKSRC} -name .cvsignore -delete
 
 .include <bsd.port.post.mk>