sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 10:56:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak it and update to 5.2.0

Browse source 
PR:		ports/143867
Submitted by:	Rob Farmer <rfarmer@predatorlabs.net>
Approved by:	maintainer
Feature safe:	yes
This commit is contained in:
Wen Heping 2010-02-25 02:09:17 +00:00
parent d0a6541ebe
commit 01eca2900d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=250285
17 changed files with 15417 additions and 14583 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

226
math/scilab/Makefile
View file

@ -6,58 +6,47 @@
#
PORTNAME= scilab
PORTVERSION= 4.1.2
PORTREVISION= 8
CATEGORIES= math cad parallel
PORTVERSION= 5.2.0
CATEGORIES= math cad parallel java
MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= utisoft@googlemail.com
COMMENT= A free Matlab clone by INRIA & ENPC
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
pvm:${PORTSDIR}/net/pvm
RUN_DEPENDS+= pvm:${PORTSDIR}/net/pvm
# A partial dependencies list can be found at:
# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
pcre.0:${PORTSDIR}/devel/pcre \
readline.6:${PORTSDIR}/devel/readline
USE_FORTRAN=yes
USE_XORG= x11
GNU_CONFIGURE= yes
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl \
${LOCALBASE}/share/examples/saxon/data/books.dtd:${PORTSDIR}/textproc/saxon \
xsltproc:${PORTSDIR}/textproc/libxslt
MAKE_JOBS_UNSAFE= yes
USE_FORTRAN= yes
USE_GETTEXT= yes
WANT_GNOME= yes
USE_GNOME= pkgconfig gtk20 libgtkhtml vte
USE_AUTOTOOLS= autoconf:262
USE_TK= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
DEPRECATED= unmaintained, many releases behind upstream (without anyone caring), broken nearly everywhere
EXPIRATION_DATE=2009-11-21
CONFIGURE_ARGS= --without-ocaml \
--with-docbook=${LOCALBASE}/share/xsl/docbook
CONFIGURE_ARGS= --with-tk \
--with-tk-library=${LOCALBASE}/lib \
--with-tk-include=${TK_INCLUDEDIR} \
--with-tcl-library=${LOCALBASE}/lib \
--with-tcl-include=${TCL_INCLUDEDIR} \
--with-xaw3d \
--x-include=${LOCALBASE}/include \
--x-libraries=${LOCALBASE}/lib \
--without-java \
--without-ocaml \
--with-pvm-library=${LOCALBASE}/lib \
--with-pvm-include=${LOCALBASE}/include \
--with-gtk2 --with-gfortran
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV+= PVM_ROOT=${LOCALBASE}/lib/pvm
OPTIONS= ATLAS "Use Atlas instead of Blas" OFF \
FFTW "Use FFTW" ON \
GUI "Build GUI (requires Java)" ON \
HDF5 "Use HDF5 (requires GUI)" OFF \
NLS "Build localization" OFF \
MATIO "Matlab compatibility" OFF \
PVM "Parallel Virtual Machine support" OFF \
TK "TCL/TK support" OFF
.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>
.if exists(${LOCALBASE}/lib/libreadline.so.6)
LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline
.endif
.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
WITH_ATLAS= yes
.endif
.if defined(WITH_ATLAS)
CONFIGURE_ARGS+= --with-atlas-library=${LOCALBASE}/lib
LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas
@ -69,32 +58,173 @@ BLAS_LIBS?= -llapack -lblas
.endif
MAKE_ENV+= BLAS_LIBS="-L${LOCALBASE}/lib ${BLAS_LIBS}"
.if ${ARCH} == "alpha" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
BROKEN= does not compile on alpha 5.x, ia64, sparc64
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-build-localization
PLIST_SUB+= NLS="@comment "
.else
PLIST_SUB+= NLS=""
.endif
.if ${ARCH} == "amd64" && ${OSVERSION} >= 700000
BROKEN= segfaults during build on FreeBSD amd64/7.x
.if defined(WITHOUT_TK)
CONFIGURE_ARGS+= --without-tk
PLIST_SUB+= TK="@comment "
.else
USE_TK= yes
CONFIGURE_ARGS+= --with-tk-library=${LOCALBASE}/lib \
--with-tk-include=${TK_INCLUDEDIR} \
--with-tcl-library=${LOCALBASE}/lib \
--with-tcl-include=${TCL_INCLUDEDIR}
PLIST_SUB+= TK=""
.endif
.if defined(WITHOUT_GUI)
CONFIGURE_ARGS+= --without-gui \
--without-javasci \
--disable-build-help
PLIST_SUB+= GUI="@comment "
PLIST_SUB+= NOGUI=""
.else
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant \
${JAVALIBDIR}/flexdock-0.5.1.jar:${PORTSDIR}/devel/flexdock \
${JAVALIBDIR}/jogl.jar:${PORTSDIR}/graphics/jogl \
${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf \
${JAVALIBDIR}/jrosetta-API.jar:${PORTSDIR}/java/jrosetta \
${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
${JAVALIBDIR}/jlatexmath-0.8.9.jar:${PORTSDIR}/math/jlatexmath \
fop:${PORTSDIR}/textproc/fop \
${LOCALBASE}/share/java/batik/batik.jar:${PORTSDIR}/graphics/batik \
foprep:${PORTSDIR}/math/jeuclid \
${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
swig:${PORTSDIR}/devel/swig13
RUN_DEPENDS+= ${JAVALIBDIR}/flexdock-0.5.1.jar:${PORTSDIR}/devel/flexdock \
${JAVALIBDIR}/jogl.jar:${PORTSDIR}/graphics/jogl \
${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf \
${JAVALIBDIR}/jrosetta-API.jar:${PORTSDIR}/java/jrosetta \
${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
${JAVALIBDIR}/jlatexmath-0.8.9.jar:${PORTSDIR}/math/jlatexmath \
fop:${PORTSDIR}/textproc/fop \
${LOCALBASE}/share/java/batik/batik.jar:${PORTSDIR}/graphics/batik \
foprep:${PORTSDIR}/math/jeuclid \
${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons \
${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework
USE_JAVA= yes
JAVA_VERSION= 1.5+
JAVA_BUILD= yes
JAVA_RUN= yes
USE_XORG= x11
CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME}
DESKTOP_ENTRIES= "SciLab" "A free Matlab clone by INRIA & ENPC" \
"${DATADIR}/icons/scilab.xpm" "scilab" \
"Application;Education;Math;" false
PLIST_SUB+= GUI=""
PLIST_SUB+= NOGUI="@comment "
.endif
.if defined(WITHOUT_FFTW)
CONFIGURE_ARGS+= --without-fftw
PLIST_SUB+= FFTW="@comment "
.else
LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3
PLIST_SUB+= FFTW=""
.endif
.if defined(WITHOUT_PVM)
CONFIGURE_ARGS+= --without-pvm
PLIST_SUB+= PVM="@comment "
.else
BUILD_DEPENDS+= pvm:${PORTSDIR}/net/pvm
RUN_DEPENDS+= pvm:${PORTSDIR}/net/pvm
CONFIGURE_ARGS+= --with-pvm-include=${LOCALBASE}/include \
--with-pvm-library=${LOCALBASE}/lib
CONFIGURE_ENV= PVM_ROOT=${LOCALBASE} \
PVMGETARCH=${LOCALBASE}/lib/pvm/lib/pvmgetarch
PLIST_SUB+= PVM=""
.endif
.if defined(WITHOUT_UMFPACK)
CONFIGURE_ARGS+= --without-umfpack
PLIST_SUB+= UMFPACK="@comment "
.else
LIB_DEPENDS+= amd.1:${PORTSDIR}/math/suitesparse
CONFIGURE_ARGS+= --with-umfpack-include=${LOCALBASE}/include \
--with-umfpack-library=${LOCALBASE}/lib
PLIST_SUB+= UMFPACK=""
.endif
.if defined(WITHOUT_MATIO)
CONFIGURE_ARGS+= --without-matio
PLIST_SUB+= MATIO="@comment "
.else
LIB_DEPENDS+= matio.0:${PORTSDIR}/math/matio
PLIST_SUB+= MATIO=""
.endif
.if defined(WITHOUT_HDF5)
CONFIGURE_ARGS+= --without-hdf5
PLIST_SUB+= HDF5="@comment "
.else
LIB_DEPENDS+= hdf5.6:${PORTSDIR}/science/hdf5-18
BUILD_DEPENDS+= ${JAVALIBDIR}/jhdf5.jar:${PORTSDIR}/science/hdf-java
RUN_DEPENDS+= ${JAVALIBDIR}/jhdf5.jar:${PORTSDIR}/science/hdf-java
PLIST_SUB+= HDF5=""
.endif
post-patch:
# Configure fixes
${REINPLACE_CMD} -e 's|/usr/share/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|/usr/lib/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|-lmatio|-lmatio -lgfortran|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|-L$$with_umfpack_library|-L$$with_umfpack_library -lgfortran|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lamd -L$$with_umfpack_library -lgfortran|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|TCLTK_LIBS=" -ldl"|TCLTK_LIBS=" "|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|batik-all|batik|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$jardir/batik.jar|${LOCALBASE}/share/java/batik/batik.jar|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure
# Build fixes
${REINPLACE_CMD} -e 's|$$FFLAGS -DNDEBUG|$$FFLAGS -DNDEBUG -fPIC|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in
${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h
${REINPLACE_CMD} -e 1715d ${WRKSRC}/Makefile.in
@# malloc.h -> stdlib.h conversions
@${GREP} -lr "<malloc.h>" ${WRKSRC} \
| ${XARGS} ${REINPLACE_CMD} -e \
's/[<"]malloc.h[>"]/<stdlib.h>/'
#Install fixes
${MV} ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My\ Project/ \
${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/My_Project/
${REINPLACE_CMD} -e 's|My Project|My_Project|g' ${WRKSRC}/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj
${REINPLACE_CMD} -e 317d ${WRKSRC}/contrib/Makefile.in
${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e '/%%PORTDOCS%%/d' ${WRKSRC}/Makefile.in
.else
@${REINPLACE_CMD} -e 's/%%PORTDOCS%%//' ${WRKSRC}/Makefile.in
.endif
post-configure:
${REINPLACE_CMD} -e 's|CC_OPTIONS)|CC_OPTIONS) ${CFLAGS}|g' \
${WRKSRC}/routines/scicos/Makefile
pre-install:
@${FIND} ${WRKSRC} -name \*.orig -delete
@${FIND} ${WRKSRC} -name \*.bak -delete
@${FIND} ${WRKSRC} -name .cvsignore -delete
.include <bsd.port.post.mk>
.include <bsd.port.mk>

6
math/scilab/distinfo
View file

@ -1,3 +1,3 @@
MD5 (scilab-4.1.2-src.tar.gz) = 17a7a6aa52918f33d96777a0dc423658
SHA256 (scilab-4.1.2-src.tar.gz) = 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9
SIZE (scilab-4.1.2-src.tar.gz) = 15892277
MD5 (scilab-5.2.0-src.tar.gz) = d751abfd5f1a2f7a69bffa4d421dd666
SHA256 (scilab-5.2.0-src.tar.gz) = 3412d4343cd3ca6ba0b03b28fec66a00f643d4d73f13dc28c0f6596ccb9f386a
SIZE (scilab-5.2.0-src.tar.gz) = 54656677

13
math/scilab/files/patch-Makefile.OBJ.in
View file

@ -1,13 +0,0 @@
--- Makefile.OBJ.in.orig Wed Oct 19 09:37:11 2005
+++ Makefile.OBJ.in Sat May 27 21:52:50 2006
@@ -1,8 +1,5 @@
-
-ATLASDIR=@ATLAS_DIR@
-
-STD_BLAS=$(SCIDIR)/libs/blas.a
-ATLAS_LAPACKBLAS= $(ATLASDIR)/liblapack.a $(ATLASDIR)/libcblas.a $(ATLASDIR)/libf77blas.a $(ATLASDIR)/libatlas.a
+STD_BLAS=$(BLAS_LIBS)
+ATLAS_LAPACKBLAS=$(BLAS_LIBS)
BLAS=$(@WHICH_BLAS@)

39
math/scilab/files/patch-ba
View file

@ -1,39 +0,0 @@
--- Makefile.in.orig 2007-10-23 19:25:45.000000000 +0200
+++ Makefile.in 2008-04-28 17:26:44.000000000 +0200
@@ -111,7 +111,7 @@
conftest conftest.c so_locations
# SCIBASE for scilab binaries generation
-SCIBASE = scilab-4.1.2
+SCIBASE = scilab
PVMBINDISTFILES = \
$(SCIBASE)/pvm3/Readme \
@@ -127,21 +127,21 @@
BINDISTFILES = \
$(SCIBASE)/.binary \
$(SCIBASE)/.pvmd.conf \
- $(SCIBASE)/ACKNOWLEDGEMENTS \
- $(SCIBASE)/CHANGES \
+%%PORTDOCS%% $(SCIBASE)/ACKNOWLEDGEMENTS \
+%%PORTDOCS%% $(SCIBASE)/CHANGES \
$(SCIBASE)/Makefile \
$(SCIBASE)/Makefile.OBJ \
$(SCIBASE)/Makefile.incl \
$(SCIBASE)/Makemex \
$(SCIBASE)/Path.incl \
- $(SCIBASE)/README_Unix \
- $(SCIBASE)/RELEASE_NOTES \
+%%PORTDOCS%% $(SCIBASE)/README_Unix \
+%%PORTDOCS%% $(SCIBASE)/RELEASE_NOTES \
$(SCIBASE)/SVN_revision.incl \
$(SCIBASE)/Version.incl \
$(SCIBASE)/configure \
$(SCIBASE)/libtool \
- $(SCIBASE)/license.txt \
- $(SCIBASE)/licence.txt \
+%%PORTDOCS%% $(SCIBASE)/license.txt \
+%%PORTDOCS%% $(SCIBASE)/licence.txt \
$(SCIBASE)/scilab.quit \
$(SCIBASE)/scilab.star \
$(SCIBASE)/X11_defaults \

30
math/scilab/files/patch-bb
View file

@ -1,30 +0,0 @@
--- configure.orig Wed Feb 1 21:47:53 2006
+++ configure Sat May 27 19:27:55 2006
@@ -22162,7 +22162,7 @@
CC_PICFLAGS='-fPIC'
# script shell f77 have bugs, get ours
FC=$F77
- FC_OPTIONS="${CFLAGS} -Dfreebsd"
+ FC_OPTIONS="${FFLAGS} -Dfreebsd"
FC_OPTIONS_O0='-Dfreebsd'
FC_LDFLAGS='-lm -Wl,--export-dynamic'
FC_PICFLAGS='-fPIC'
@@ -25056,7 +25056,8 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/IntrinsicP.h> #include <X11/Xaw3d/ViewportP.h>
+#include <X11/IntrinsicP.h>
+#include <X11/Xaw3d/ViewportP.h>
int
main ()
{
@@ -27200,7 +27201,7 @@
;;
esac
- GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
+ GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
case "$host" in
*-*-darwin*)

65
math/scilab/files/patch-configure.in
View file

@ -1,65 +0,0 @@
--- configure.in.orig Sat Nov 4 00:06:57 2006
+++ configure.in Tue Jan 16 17:37:44 2007
@@ -119,7 +119,7 @@
fi
AC_CHECK_PROG(WITH_G77,g77,yes,no)
if test "$WITH_G77" = no; then
- AC_CHECK_PROG(WITH_GFORTRAN,gfortran,yes,no)
+ AC_CHECK_PROGS(WITH_GFORTRAN,[gfortran gfortran44],no)
if test "$WITH_GFORTRAN" = no; then
AC_MSG_ERROR([Unable to configure: g77 or gfortran compiler not found])
fi
@@ -151,7 +151,7 @@
fi
elif test "$with_gfortran" = yes; then
# GNU g95 (gfortran) required
- AC_CHECK_PROG(WITH_GFORTRAN,gfortran,yes,no)
+ AC_CHECK_PROGS(WITH_GFORTRAN,[gfortran gfortran44],no)
if test "$WITH_GFORTRAN" = no; then
AC_MSG_ERROR([Unable to configure: gfortran compiler not found])
fi
@@ -1297,14 +1297,29 @@
FC_PICFLAGS='-fPIC'
LD=ld
LD_LDFLAGS=-lm
-
+ if test "$WITH_G77" = yes; then
+ FC_PICFLAGS=-fPIC
+ if test "$enable_debug" = yes; then
+ FC_OPTIONS="-g"
+ FC_OPTIONS_O0=""
+ else
+ FC_OPTIONS="-O"
+ FC_OPTIONS_O0=""
+ fi
+ elif test "$WITH_GFORTRAN" != no;then
+ if test "$enable_debug" = yes; then
+ FC_OPTIONS="-g"
+ FC_OPTIONS_O0=""
+ else
+ FC_OPTIONS="-O"
+ FC_OPTIONS_O0=""
+ fi
+ FC_PICFLAGS=-fPIC
+ AC_DEFINE(G95_FORTRAN)
+ fi
if test "$enable_debug" = yes; then
CC_OPTIONS='-g -Dfreebsd'
FC_OPTIONS=-g
- fi
- if test "$WITH_G77" = yes; then
- # On FreeBSD the gnu fortran compiler is named f77
- FC=f77
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
;;

328
math/scilab/files/patch-debian-jgraphx Normal file
View file

@ -0,0 +1,328 @@
--- modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java 2010-01-22 16:43:29.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java 2010-01-22 16:44:22.000000000 +0100
@@ -75,7 +75,7 @@
public void invoke(Object source, mxEventObject evt) {
if (!redoInAction) {
- undoManager.undoableEditHappened((mxUndoableEdit) evt.getArgAt(0));
+ undoManager.undoableEditHappened((mxUndoableEdit) evt.getProperty("edit"));
incrementUndoCounter();
}
}
@@ -86,7 +86,7 @@
*/
mxIEventListener selectionHandler = new mxIEventListener() {
public void invoke(Object source, mxEventObject evt) {
- List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges();
+ List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
setSelectionCells(getSelectionCellsForChanges(changes));
}
};
@@ -209,10 +209,12 @@
* com.mxgraph.util.mxUndoManager
*/
public void redo() {
+ if (!redoInAction) {
incrementUndoCounter();
redoInAction = true;
undoManager.redo();
redoInAction = false;
+ }
}
/**
--- modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-22 16:55:10.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-22 16:55:42.000000000 +0100
@@ -63,11 +63,15 @@
if (allCells[i] instanceof BasicBlock) {
//((BasicBlock) allCells[i])
mxCellState state = getGraph(null).getView().getState(allCells[i]);
- Hashtable<String, Object> style = (state != null) ? state.getStyle() : getGraph(null).getCellStyle(allCells[i]);
-
+ Map<String, Object> style;
+ if (state != null) {
+ style = state.getStyle();
+ } else {
+ style = getGraph(null).getCellStyle(allCells[i]);
+ }
if (style != null)
{
- String value = (mxUtils.isTrue(style, mxConstants.STYLE_SHADOW, false)) ? "0" : "1";
+ String value = Boolean.toString(mxUtils.isTrue(style, mxConstants.STYLE_SHADOW, false));
getGraph(null).setCellStyles(mxConstants.STYLE_SHADOW, value, new Object[] { allCells[i] });
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-22 16:55:52.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-22 16:57:58.000000000 +0100
@@ -17,7 +17,7 @@
public class XcosCanvas extends mxInteractiveCanvas{
public Object drawVertex(int x, int y, int w, int h,
- Hashtable<String, Object> style) {
+ Map<String, Object> style) {
if (g != null)
{
@@ -90,7 +90,7 @@
start = (int) Math.round(start * scale);
// Removes some styles to draw the content area
- Hashtable<String, Object> cloned = new Hashtable<String, Object>(
+ Map<String, Object> cloned = new Hashtable<String, Object>(
style);
cloned.remove(mxConstants.STYLE_FILLCOLOR);
cloned.remove(mxConstants.STYLE_ROUNDED);
--- modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java 2010-01-22 16:45:37.000000000 +0100
@@ -562,7 +562,7 @@
*/
if (getParentDiagram() instanceof SuperBlockDiagram) {
SuperBlock parentBlock = ((SuperBlockDiagram) getParentDiagram()).getContainer();
- parentBlock.getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED,new mxEventObject(new Object[] { parentBlock }));
+ parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", parentBlock));
}
}
@@ -606,7 +606,7 @@
// Now read new Block
BasicBlock modifiedBlock = BlockReader.readBlockFromFile(tempInput.getAbsolutePath());
updateBlockSettings(modifiedBlock);
- getParentDiagram().fireEvent(XcosEvent.ADD_PORTS, new mxEventObject(new Object[] {currentBlock}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.ADD_PORTS, "block", currentBlock));
setLocked(false);
}
};
--- modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java 2010-01-22 16:47:03.000000000 +0100
@@ -51,7 +51,7 @@
double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
if(oldValue != newValue){
- getParentDiagram().fireEvent(XcosEvent.IN_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java 2010-01-22 16:47:19.000000000 +0100
@@ -51,7 +51,7 @@
double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
if(oldValue != newValue){
- getParentDiagram().fireEvent(XcosEvent.OUT_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java 2010-01-22 16:48:57.000000000 +0100
@@ -50,7 +50,7 @@
double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
if(oldValue != newValue){
- getParentDiagram().fireEvent(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java 2010-01-22 16:49:18.000000000 +0100
@@ -51,7 +51,7 @@
double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
if(oldValue != newValue){
- getParentDiagram().fireEvent(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java 2010-01-22 16:49:36.000000000 +0100
@@ -51,7 +51,7 @@
double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
if(oldValue != newValue){
- getParentDiagram().fireEvent(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java 2010-01-22 16:49:52.000000000 +0100
@@ -51,7 +51,7 @@
double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
if(oldValue != newValue){
- getParentDiagram().fireEvent(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
}
}
--- modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java 2010-01-22 16:46:14.000000000 +0100
@@ -386,7 +386,7 @@
updateExportedExplicitOutputPort();
updateExportedImplicitOutputPort();
updateExportedEventOutputPort();
- getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED, new mxEventObject(new Object[] {this}));
+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", this));
}
--- modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-23 22:49:59.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-23 23:32:57.000000000 +0100
@@ -7,6 +7,7 @@
import java.awt.Stroke;
import java.awt.geom.AffineTransform;
import java.util.Hashtable;
+import java.util.Map;
import com.mxgraph.swing.view.mxInteractiveCanvas;
import com.mxgraph.util.mxConstants;
--- modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java 2010-01-24 00:01:43.000000000 +0100
@@ -187,8 +187,9 @@
selectedEntry.setOpaque(true);
}
- eventSource.fireEvent(mxEvent.SELECT, new mxEventObject(new Object[] {
- selectedEntry, t, last }));
+
+ eventSource.fireEvent(new mxEventObject(mxEvent.SELECT, "entry",
+ selectedEntry, "transferable", t, "previous", last));
}
--- modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-23 22:49:59.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-23 23:59:58.000000000 +0100
@@ -13,6 +13,7 @@
package org.scilab.modules.xcos.actions;
import java.util.Hashtable;
+import java.util.Map;
import org.scilab.modules.graph.ScilabGraph;
import org.scilab.modules.graph.actions.DefaultAction;
--- modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java 2009-12-16 08:25:20.000000000 +0100
+++ modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java 2010-01-23 23:57:56.000000000 +0100
@@ -625,7 +625,7 @@
public void invoke(Object source, mxEventObject evt) {
getModel().beginUpdate();
refresh();
- BasicBlock updatedBlock = (BasicBlock) evt.getArgAt(0);
+ BasicBlock updatedBlock = (BasicBlock) evt.getProperty("block");
BlockPositioning.updateBlockView(updatedBlock);
getModel().endUpdate();
}
@@ -639,7 +639,7 @@
*/
private class ModelTracker implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getArgAt(0);
+ List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getProperty("changes");
List<Object> objects = new ArrayList<Object>();
getModel().beginUpdate();
for (int i = 0; i < changes.size(); ++i) {
@@ -660,7 +660,8 @@
firedCells[j] = objects.get(j);
}
//fireEvent(XcosEvent.FORCE_CELL_RESHAPE, new mxEventObject(new Object[] {firedCells}));
- fireEvent(XcosEvent.FORCE_CELL_VALUE_UPDATE, new mxEventObject(new Object[] {firedCells}));
+ fireEvent(new mxEventObject(XcosEvent.FORCE_CELL_VALUE_UPDATE, "cells", firedCells));
+
}
getModel().endUpdate();
}
@@ -671,7 +672,7 @@
*/
private class ForceCellValueUpdate implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- Object[] cells = (Object[]) evt.getArgs()[0];
+ Object[] cells = (Object[]) evt.getProperty("cells");
getModel().beginUpdate();
@@ -704,7 +705,7 @@
*/
private class ForceCellReshapeTracker implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- Object[] cells = (Object[]) evt.getArgs()[0];
+ Object[] cells = (Object[]) evt.getProperty("cells");
getModel().beginUpdate();
for (int i = 0; i < cells.length; ++i) {
Object cell = cells[i];
@@ -723,16 +724,15 @@
*/
private class SuperBlockUpdateTracker implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- assert evt.getArgs()[0] instanceof SuperBlock;
- SuperBlock updatedBlock = (SuperBlock) evt.getArgs()[0];
+ assert evt.getProperty("block") instanceof SuperBlock;
+ SuperBlock updatedBlock = (SuperBlock) evt.getProperty("block");
updatedBlock.setRealParameters(BlockWriter
.convertDiagramToMList(updatedBlock.getChild()));
if (updatedBlock.getParentDiagram() instanceof SuperBlockDiagram) {
SuperBlock parentBlock = ((SuperBlockDiagram) updatedBlock
.getParentDiagram()).getContainer();
- parentBlock.getParentDiagram().fireEvent(
- XcosEvent.SUPER_BLOCK_UPDATED,
- new mxEventObject(new Object[] { parentBlock }));
+ parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED,"block", parentBlock));
+
}
BlockPositioning.updateBlockView(updatedBlock);
refresh();
@@ -751,7 +751,7 @@
}
public void invoke(Object source, mxEventObject evt) {
- Object[] cells = (Object[]) evt.getArgs()[0];
+ Object[] cells = (Object[]) evt.getProperty("cells");
diagram.getModel().beginUpdate();
for (int i = 0; i < cells.length; ++i) {
@@ -782,7 +782,7 @@
}
public void invoke(Object source, mxEventObject evt) {
- Object[] cells = (Object[]) evt.getArgs()[0];
+ Object[] cells = (Object[]) evt.getProperty("cells");
for (int i = 0; i < cells.length; i++) {
if (cells[i] instanceof BasicLink) {
BasicLink link = (BasicLink) cells[i];
@@ -900,7 +900,7 @@
*/
private class CellResizedTracker implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- Object[] cells = (Object[]) evt.getArgs()[0];
+ Object[] cells = (Object[]) evt.getProperty("cells");
getModel().beginUpdate();
for (int i = 0; i < cells.length; ++i) {
if (cells[i] instanceof BasicBlock) {
@@ -916,7 +916,7 @@
*/
private class UndoUpdateTracker implements mxIEventListener {
public void invoke(Object source, mxEventObject evt) {
- List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges();
+ List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
Object[] changedCells = getSelectionCellsForChanges(changes);
getModel().beginUpdate();
for (Object object : changedCells) {
@@ -1712,7 +1712,7 @@
//getParentTab().setName((String) properties.get("title"));
// Clear all undo events in Undo Manager
- undoManager.reset();
+ undoManager.clear();
setModified(false);
}
@@ -2051,7 +2051,7 @@
* This function will reset the UndoManager in a stable state.
*/
public void resetUndoManager() {
- undoManager.reset();
+ undoManager.clear();
resetUndoCounter();

5
math/scilab/files/patch-examples__mex-examples__cmex__Makefile
View file

@ -1,5 +0,0 @@
diff -ruN examples/mex-examples/cmex/Makefile.orig examples/mex-examples/cmex/Makefile
--- examples/mex-examples/cmex/Makefile Thu Jan 1 01:00:00 1970
+++ examples/mex-examples/cmex/Makefile Sun Dec 31 11:39:14 2006
@@ -0,0 +1 @@
+distclean:

28
math/scilab/files/patch-modules-core-src-c-getmemory.c Normal file
View file

@ -0,0 +1,28 @@
--- modules/core/src/c/getmemory.c.orig 2009-12-16 07:24:40.000000000 +0000
+++ modules/core/src/c/getmemory.c 2010-01-06 19:27:34.939739546 +0000
@@ -25,8 +25,12 @@
#include <sys/sysctl.h>
#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
#define PAGESHIFT_UNDEF -100
+#elif defined(__FreeBSD__)
+#include <sys/param.h>
+#include <sys/sysctl.h>
#endif
+
#include <stdio.h>
#define kooctet 1024
int getfreememory(void)
@@ -160,6 +164,12 @@
return 0;
}
+#elif defined(__FreeBSD__)
+ int avphys_pages;
+ size_t oldlenp = sizeof (avphys_pages);
+ sysctlbyname("vm.stats.vm.v_free_count", &avphys_pages, &oldlenp, NULL, NULL);
+ return (avphys_pages / kooctet) * sysconf(_SC_PAGESIZE);
+
#else
/* Solaris and others assumed*/
return (sysconf(_SC_AVPHYS_PAGES)/kooctet)*sysconf(_SC_PAGESIZE);

11
math/scilab/files/patch-routines__Makefile.in
View file

@ -1,11 +0,0 @@
--- routines/Makefile.in.orig Sat May 27 21:13:55 2006
+++ routines/Makefile.in Sat May 27 21:14:03 2006
@@ -2,7 +2,7 @@
include ../Makefile.incl
-SCIDIRS = graphics calelm blas control default integ interf intersci \
+SCIDIRS = graphics calelm control default integ interf intersci \
lapack slicot arpack \
metanet optim poly signal sparse os_specific system system2 console\
menusX scicos fileio dcd randlib slicot arpack wintools\

18
math/scilab/files/patch-routines__graphics__periFig.c
View file

@ -1,18 +0,0 @@
--- ./routines/graphics/periFig.c.orig Tue Mar 21 19:22:44 2006
+++ ./routines/graphics/periFig.c Tue Mar 21 19:22:57 2006
@@ -1176,6 +1176,7 @@
integer rect[4], font=-1,font_flag=2;
integer verbose=0,Dnarg,Dvalue1[10];
int pen_color;
+ int alloc;
if ( ScilabGCXfig_is_initialized == FALSE ) {
sciprint("xinit must be called before any action \r\n");
@@ -1183,7 +1184,6 @@
}
#ifdef WITH_GTK
- int alloc;
string = sci_convert_from_utf8(string, &alloc,NULL);
#endif
C2F(boundingboxXfig)(string,x,y,rect,PI0,PI0,PI0,PD0,PD0,PD0,PD0);

12
math/scilab/files/patch-routines__graphics__periGtk.c
View file

@ -1,12 +0,0 @@
--- routines/graphics/periGtk.c.orig Tue Mar 21 18:51:59 2006
+++ routines/graphics/periGtk.c Tue Mar 21 18:52:33 2006
@@ -862,8 +862,8 @@
static void xset_curwin(integer *intnum, integer *v2, integer *v3, integer *v4)
{
struct BCG *bcgk;
- bcgk = ScilabXgc ;
integer ierr;
+ bcgk = ScilabXgc ;
/** send info to menu **/
if (v2 != (integer *) 0) MenuFixCurrentWin(*intnum);
if ( ScilabXgc == (struct BCG *) 0 )

18
math/scilab/files/patch-routines__graphics__periPos.c
View file

@ -1,18 +0,0 @@
--- ./routines/graphics/periPos.c.orig Tue Mar 21 19:07:20 2006
+++ ./routines/graphics/periPos.c Tue Mar 21 19:07:46 2006
@@ -1225,6 +1225,7 @@
{
integer i,rect[4] ;
int yn = (int) (*y + ascentPos());
+ int alloc;
if ( ScilabGCPos_is_initialized == FALSE ) {
sciprint("xinit must be called before any action \r\n");
@@ -1232,7 +1233,6 @@
}
#ifdef WITH_GTK
- int alloc;
/* we expect iso-latin1 in postscript */
string = sci_convert_from_utf8(string, &alloc,NULL);
#endif

23
math/scilab/files/patch-routines__gtksci__x_main.c
View file

@ -1,23 +0,0 @@
--- ./routines/gtksci/x_main.c.orig Tue Mar 21 19:50:48 2006
+++ ./routines/gtksci/x_main.c Tue Mar 21 19:51:50 2006
@@ -655,8 +655,8 @@
/* sciprint("GetScreenProperty not implemented in gtk 1\r\n"); */
return -1;
#else
- start_sci_gtk();
GdkScreen *screen = gdk_screen_get_default();
+ start_sci_gtk();
if(!strcmp(prop,"screensize_px"))
{
@@ -714,9 +714,9 @@
*iyres = 96;
return 0;
#else
- start_sci_gtk();
GdkScreen *screen = gdk_screen_get_default();
double xres, yres;
+ start_sci_gtk();
/*
* there are 2.54 centimeters to an inch; so there are 25.4 millimeters.

26
math/scilab/files/patch-routines__os_specific__getmemory.c
View file

@ -1,26 +0,0 @@
--- routines/os_specific/getmemory.c Wed Feb 1 21:50:55 2006
+++ routines/os_specific/getmemory.c Sat May 27 19:59:53 2006
@@ -69,6 +69,11 @@
}
#endif
+#if defined(__FreeBSD__)
+#define MEMOK 1
+ return 0;
+#endif
+
#ifndef MEMOK
/* Linux ,Solaris and others assumed*/
return (sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE))/kooctet;
@@ -132,6 +137,11 @@
return 0;
}
}
+#endif
+
+#if defined(__FreeBSD__)
+#define MEMOK 1
+ return 0;
#endif
#ifndef MEMOK

84
math/scilab/files/patch-scripts__Makefile.in
View file

@ -1,84 +0,0 @@
--- scripts/Makefile.in.orig Sat May 27 20:41:36 2006
+++ scripts/Makefile.in Sat May 27 20:42:07 2006
@@ -21,14 +21,14 @@
all:: $(PROGRAMS)
-CYGDRIVE= -e "s+/cygdrive/\([a-zA-Z]*\)/+\1:/+g"
+CYGDRIVE= -e "s!/cygdrive/\([a-zA-Z]*\)/!\1:/!g"
SED_CYGDRIVE= @SED_CYGDRIVE@
$(SBIN)/scilab: @SCILABSCRIPT@ $(IP) $(IV)
@$(RM) $(SBIN)/scilab
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" $(SED_CYGDRIVE) \
- -e "s+SCILAB_VERSION+$(SCIVERSION)+" \
- -e "s+SCILABGS+@SCILAB_GS@+" @SCILABSCRIPT@ > scilab;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" $(SED_CYGDRIVE) \
+ -e "s!SCILAB_VERSION!$(SCIVERSION)!" \
+ -e "s!SCILABGS!@SCILAB_GS@!" @SCILABSCRIPT@ > scilab;
@cp scilab $(SBIN)
@chmod 775 $(SBIN)/scilab
@$(RM) scilab
@@ -37,7 +37,7 @@
$(SBIN)/Blatexpr: Blatexpr.g $(IP)
@$(RM) $(SBIN)/Blatexpr
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatexpr.g > Blatexpr;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatexpr.g > Blatexpr;
@cp Blatexpr $(SBIN)
@chmod 775 $(SBIN)/Blatexpr
@$(RM) Blatexpr
@@ -45,7 +45,7 @@
$(SBIN)/BEpsf: BEpsf.g $(IP)
@$(RM) $(SBIN)/BEpsf
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" BEpsf.g > BEpsf;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" BEpsf.g > BEpsf;
@cp BEpsf $(SBIN)
@chmod 775 $(SBIN)/BEpsf
@$(RM) BEpsf
@@ -53,7 +53,7 @@
$(SBIN)/Blatexpr2: Blatexpr2.g $(IP)
@$(RM) $(SBIN)/Blatexpr2
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatexpr2.g > Blatexpr2;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatexpr2.g > Blatexpr2;
@cp Blatexpr2 $(SBIN)
@chmod 775 $(SBIN)/Blatexpr2
@$(RM) Blatexpr2
@@ -61,7 +61,7 @@
$(SBIN)/Blatexprs: Blatexprs.g $(IP)
@$(RM) $(SBIN)/Blatexprs
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatexprs.g > Blatexprs;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatexprs.g > Blatexprs;
@cp Blatexprs $(SBIN)
@chmod 775 $(SBIN)/Blatexprs
@$(RM) Blatexprs
@@ -69,7 +69,7 @@
$(SBIN)/Blpr: Blpr.g $(IP)
@$(RM) $(SBIN)/Blpr
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blpr.g > Blpr;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blpr.g > Blpr;
@cp Blpr $(SBIN)
@chmod 775 $(SBIN)/Blpr
@$(RM) Blpr
@@ -77,7 +77,7 @@
$(UTIL)/Blatdoc: Blatdoc.g $(IP)
@$(RM) $(UTIL)/Blatdoc
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatdoc.g > Blatdoc;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatdoc.g > Blatdoc;
@cp Blatdoc $(UTIL)
@chmod 775 $(UTIL)/Blatdoc
@$(RM) Blatdoc
@@ -85,7 +85,7 @@
$(UTIL)/Blatdocs: Blatdocs.g $(IP)
@$(RM) $(UTIL)/Blatdocs
- @sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatdocs.g > Blatdocs;
+ @sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatdocs.g > Blatdocs;
@cp Blatdocs $(UTIL)
@chmod 775 $(UTIL)/Blatdocs
@$(RM) Blatdocs

29068
math/scilab/pkg-plist
View file

File diff suppressed because it is too large Load diff