Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Feb 2006 08:23:55 +0100 (CET)
From:      Jean-Sebastien Roy <js@jeannot.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/93695: Maintainer update of math/scilab
Message-ID:  <200602220723.k1M7NtnD058945@durandal.root>
Resent-Message-ID: <200602220730.k1M7U4nQ082222@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         93695
>Category:       ports
>Synopsis:       Maintainer update of math/scilab
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 22 07:30:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Sebastien Roy
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
-
>Environment:
System: FreeBSD durandal.root 6.0-STABLE FreeBSD 6.0-STABLE #3: Thu Jan 26 22:07:13 CET 2006 root@durandal.root:/opt/obj/usr/src/sys/DURANDAL i386


>Description:
	The math/scilab distfile location has moved. The following patch fixes this,
	and provide the ability to:
	- build scilab without math/atlas
	- build the gtk interface
	It is an interim update before the the scilab 4.0 port.
	
	For what is worth, I was not able to create an option for the gtk interface;
	it seems it conflicts with USE_GNOME and I would be interested by a solution.
	
>How-To-Repeat:
	
>Fix:

	Apply the following patch to math/scilab.
	scilab/pkg-plist and scilab/Makefile are modified.

diff -ruN scilab/Makefile scilab.gtk/Makefile
--- scilab/Makefile	Mon Jan  2 04:48:58 2006
+++ scilab.gtk/Makefile	Tue Feb 21 19:02:02 2006
@@ -7,16 +7,15 @@
 
 PORTNAME=	scilab
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math cad parallel
-MASTER_SITES=	http://scilabsoft.inria.fr/download/stable/
+MASTER_SITES=	http://scilabsoft.inria.fr/download/${PORTVERSION}/
 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 \
-		f77blas.1:${PORTSDIR}/math/atlas \
 		lapack.3:${PORTSDIR}/math/lapack
 BUILD_DEPENDS=	pvm:${PORTSDIR}/net/pvm \
 		wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
@@ -39,7 +38,6 @@
 		--with-xaw3d \
 		--x-include=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
-		--with-atlas-library=${LOCALBASE}/lib \
 		--without-java \
 		--without-ocaml
 
@@ -48,7 +46,22 @@
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}" DOCSDIR="share/doc/scilab"
 
+.if defined (WITH_GNOME)
+CONFIGURE_ARGS+= --with-gtk2
+USE_GNOME=	gtk20 pkgconfig
+PLIST_SUB+=        GNOME="" NOGNOME="@comment "
+.else
+PLIST_SUB+=        GNOME="@comment " NOGNOME=""
+.endif
+
+OPTIONS=	ATLAS	"Use Atlas" on
+
 .include <bsd.port.pre.mk>
+
+.if defined (WITH_ATLAS)
+CONFIGURE_ARGS+= --with-atlas-library=${LOCALBASE}/lib
+LIB_DEPENDS+= f77blas.1:${PORTSDIR}/math/atlas
+.endif
 
 # Scilab broken with GCC 3.3 on FreeBSD 5.3
 .if ${OSVERSION} >= 503000 && ${OSVERSION} < 600000
diff -ruN scilab/pkg-plist scilab.gtk/pkg-plist
--- scilab/pkg-plist	Tue Jun  7 22:49:04 2005
+++ scilab.gtk/pkg-plist	Fri Feb  3 00:01:36 2006
@@ -14,7 +14,7 @@
 lib/scilab/Version.incl
 lib/scilab/X11_defaults/.cvsignore
 lib/scilab/X11_defaults/README
-lib/scilab/X11_defaults/Xscilab
+%%NOGNOME%%lib/scilab/X11_defaults/Xscilab
 lib/scilab/X11_defaults/scilab.xpm
 lib/scilab/bin/.cvsignore
 lib/scilab/bin/.scicos_pal
@@ -43,6 +43,7 @@
 lib/scilab/bin/wgscilabF.mnu
 lib/scilab/bin/wscilabE.mnu
 lib/scilab/bin/wscilabF.mnu
+%%GNOME%%lib/scilab/bin/zterm
 lib/scilab/config/.cvsignore
 lib/scilab/config/Makecygdll.incl
 lib/scilab/config/Makedll.incl
@@ -10763,7 +10764,7 @@
 lib/scilab/routines/xsci/All-extern-x1.h
 lib/scilab/routines/xsci/All-extern.h
 lib/scilab/routines/xsci/All-static.h
-lib/scilab/routines/xsci/Xscilab.ad.h
+%%NOGNOME%%lib/scilab/routines/xsci/Xscilab.ad.h
 lib/scilab/routines/xsci/h_display.h
 lib/scilab/routines/xsci/h_help.ad.h
 lib/scilab/routines/xsci/jpc_defs.h
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602220723.k1M7NtnD058945>