mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-31 10:46:16 +00:00
math/scilab:
- Update to 5.5.0 - Populate USES with desktop-file-utils, iconv, libtool, pathfix, and shared-mime-info - Add dependency on xdg-utils - Remove needless USE_LDCONFIG - Clean up CONFIGURE_ENV from stale stuff - Update options: . remove DOCS, FFTW, MATIO, UMFPACK (always build with them for simplicity) . remove NLS (doesn't build without it) . merge HELP with GUI . PVM is not supported anymore . Enable OCAML and TK by default - Use options heplers - Clean up post-patch section from stale fixes - Convert to static pkg-plist
This commit is contained in:
Max Brazhnikov
parent
7ebae92484
commit
57a37508d6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=367295
@ -2,48 +2,107 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= scilab
|
||||
PORTVERSION= 5.3.3
|
||||
PORTREVISION= 11
|
||||
PORTVERSION= 5.5.0
|
||||
CATEGORIES= math cad parallel java
|
||||
MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/:scilab \
|
||||
http://www.predatorlabs.net/dl/:jgraphx \
|
||||
http://www.bayofrum.net/dist/jgraphx/:jgraphx \
|
||||
SF/saxon/saxon6/${SAXON_VERSION}:saxon
|
||||
DISTFILES= ${DISTNAME}-src.tar.gz:scilab
|
||||
EXTRACT_ONLY= ${DISTNAME}-src.tar.gz
|
||||
MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/
|
||||
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
|
||||
|
||||
MAINTAINER= makc@FreeBSD.org
|
||||
COMMENT= Scientific software package for numerical computations
|
||||
|
||||
EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
|
||||
# A partial dependencies list can be found at:
|
||||
# http://wiki.scilab.org/Dependencies_of_Scilab_5.X
|
||||
LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 \
|
||||
libpcre.so:${PORTSDIR}/devel/pcre
|
||||
libpcre.so:${PORTSDIR}/devel/pcre \
|
||||
libcurl.so:${PORTSDIR}/ftp/curl \
|
||||
libhdf5.so:${PORTSDIR}/science/hdf5 \
|
||||
libarpack.so:${PORTSDIR}/math/arpack \
|
||||
libfftw3.so:${PORTSDIR}/math/fftw3 \
|
||||
libmatio.so:${PORTSDIR}/math/matio \
|
||||
libamd.so:${PORTSDIR}/math/suitesparse
|
||||
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
|
||||
|
||||
USES= fortran gettext gmake pkgconfig
|
||||
USES= desktop-file-utils fortran gettext gmake iconv libtool \
|
||||
pathfix pkgconfig shared-mime-info
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ARGS= --with-gfortran \
|
||||
--without-hdf5
|
||||
CONFIGURE_ENV= ac_cv_search_pthread_join="${PTHREAD_LIBS}" \
|
||||
BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
|
||||
--without-emf \
|
||||
-disable-static-system-lib
|
||||
CONFIGURE_ENV= BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
|
||||
MAKE_ENV= LANG=en_US.UTF-8 \
|
||||
LC_ALL=en_US.UTF-8
|
||||
INSTALL_TARGET= install-strip
|
||||
|
||||
OPTIONS_DEFINE= ATLAS FFTW GUI HELP NLS MATIO OCAML PVM TK UMFPACK DOCS
|
||||
OPTIONS_DEFAULT= FFTW GUI HELP
|
||||
OPTIONS_DEFINE= ATLAS GUI OCAML TK
|
||||
OPTIONS_DEFAULT= GUI OCAML TK
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
ATLAS_DESC= Use Atlas instead of Blas
|
||||
GUI_DESC= Build GUI (requires Java)
|
||||
HELP_DESC= Help Browser (Java based, requires GUI)
|
||||
MATIO_DESC= Matlab compatibility
|
||||
OCAML_DESC= Build OCaml modelica compiler (requires GUI)
|
||||
PVM_DESC= Parallel Virtual Machine support
|
||||
UMFPACK_DESC= Build with umfpack
|
||||
GUI_DESC= Graphical User Interface (Java)
|
||||
OCAML_DESC= Scicos - dynamical system simulator (requires GUI)
|
||||
|
||||
# Java dependencies:
|
||||
_GUI_DEPENDS+= ${JAVALIBDIR}/flexdock.jar:${PORTSDIR}/devel/flexdock \
|
||||
${JAVALIBDIR}/jogl2.jar:${PORTSDIR}/graphics/jogamp-jogl \
|
||||
foprep:${PORTSDIR}/math/jeuclid \
|
||||
${JAVALIBDIR}/jhall.jar:${PORTSDIR}/java/javahelp \
|
||||
${JAVALIBDIR}/jrosetta-api.jar:${PORTSDIR}/java/jrosetta \
|
||||
${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
|
||||
${JAVALIBDIR}/jgraphx.jar:${PORTSDIR}/java/jgraphx \
|
||||
${JAVALIBDIR}/jlatexmath.jar:${PORTSDIR}/math/jlatexmath \
|
||||
${LOCALBASE}/share/java/ecj-4.5.jar:${PORTSDIR}/lang/gcc-ecj45
|
||||
# Documentation, graphic export:
|
||||
_GUI_DEPENDS+= ${LOCALBASE}/share/java/fop/build/fop.jar:${PORTSDIR}/textproc/fop \
|
||||
${JAVALIBDIR}/jlatexmath-fop.jar:${PORTSDIR}/math/jlatexmath \
|
||||
${LOCALBASE}/share/java/batik/lib/batik-all.jar:${PORTSDIR}/graphics/batik \
|
||||
${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework \
|
||||
${JAVALIBDIR}/commons-io.jar:${PORTSDIR}/devel/jakarta-commons-io \
|
||||
${JAVALIBDIR}/xmlgraphics-commons.jar:${PORTSDIR}/graphics/xmlgraphics-commons
|
||||
# Code quality:
|
||||
_GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
|
||||
${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr \
|
||||
${JAVALIBDIR}/junit4.jar:${PORTSDIR}/java/junit \
|
||||
${LOCALBASE}/bin/splint:${PORTSDIR}/devel/splint
|
||||
# Documentation building:
|
||||
_GUI_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:${PORTSDIR}/textproc/docbook-xsl \
|
||||
${JAVALIBDIR}/saxon9he.jar:${PORTSDIR}/textproc/saxon-he \
|
||||
${JAVALIBDIR}/xml-apis-ext.jar:${PORTSDIR}/textproc/xml-commons \
|
||||
xsltproc:${PORTSDIR}/textproc/libxslt
|
||||
# Other gui deps:
|
||||
_GUI_DEPENDS+= ${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks \
|
||||
${JAVALIBDIR}/skinlf.jar:${PORTSDIR}/x11-toolkits/skinlf
|
||||
|
||||
# Can't use USE_ANT because it overrides do-build target
|
||||
GUI_BUILD_DEPENDS= ${_GUI_DEPENDS} \
|
||||
ant:${PORTSDIR}/devel/apache-ant
|
||||
GUI_RUN_DEPENDS= ${_GUI_DEPENDS}
|
||||
|
||||
GUI_ALL_TARGET= all doc
|
||||
GUI_USE= GL=gl
|
||||
GUI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-bin-JAVA_HOME
|
||||
GUI_CONFIGURE_ON= --with-jdk=${JAVA_HOME} \
|
||||
--with-docbook=${LOCALBASE}/share/xsl/docbook \
|
||||
--enable-build-help
|
||||
GUI_CONFIGURE_OFF= --without-gui \
|
||||
--without-javasci \
|
||||
--without-xcos \
|
||||
--disable-build-help
|
||||
CONFIGURE_ENV_OFF= JAVADOC="${TRUE}"
|
||||
|
||||
OCAML_CONFIGURE_WITH= modelica
|
||||
OCAML_BUILD_DEPENDS= ocaml:${PORTSDIR}/lang/ocaml
|
||||
OCAML_RUN_DEPENDS= ocaml:${PORTSDIR}/lang/ocaml
|
||||
|
||||
TK_CONFIGURE_OFF= --without-tk
|
||||
TK_CONFIGURE_ON= --with-tk-library=${LOCALBASE}/lib \
|
||||
--with-tk-include=${TK_INCLUDEDIR} \
|
||||
--with-tcl-library=${LOCALBASE}/lib \
|
||||
--with-tcl-include=${TCL_INCLUDEDIR}
|
||||
TK_USES= tk
|
||||
TK_USE= XORG=x11
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
@ -54,145 +113,18 @@ LAPACK_LIBS= -lalapack -lcblas
|
||||
.else
|
||||
LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack \
|
||||
libblas.so:${PORTSDIR}/math/blas
|
||||
BLAS_LIBS?= -lblas
|
||||
LAPACK_LIBS?= -llapack
|
||||
BLAS_LIBS= -lblas
|
||||
LAPACK_LIBS= -llapack
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MNLS}
|
||||
CONFIGURE_ARGS+= --disable-build-localization
|
||||
PLIST_SUB+= NLS="@comment "
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-build-localization
|
||||
PLIST_SUB+= NLS=""
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MTK}
|
||||
CONFIGURE_ARGS+= --without-tk
|
||||
.else
|
||||
USES+= tk
|
||||
CONFIGURE_ARGS+= --with-tk-library=${LOCALBASE}/lib \
|
||||
--with-tk-include=${TK_INCLUDEDIR} \
|
||||
--with-tcl-library=${LOCALBASE}/lib \
|
||||
--with-tcl-include=${TCL_INCLUDEDIR}
|
||||
.endif
|
||||
|
||||
SAXON_VERSION= 6.5.5
|
||||
SAXON_DISTFILE= saxon${SAXON_VERSION:S/./-/g}.zip
|
||||
DISTFILES+= ${SAXON_DISTFILE}:saxon
|
||||
|
||||
.if ! ${PORT_OPTIONS:MGUI}
|
||||
CONFIGURE_ARGS+= --without-gui \
|
||||
--without-javasci \
|
||||
--without-xcos \
|
||||
--disable-build-help
|
||||
CONFIGURE_ENV += JAVADOC="${TRUE}"
|
||||
PLIST_SUB+= WITHOUT_GUI=""
|
||||
.else
|
||||
DISTFILES+= ${JGRAPHX_JAR}:jgraphx
|
||||
JGRAPHX_VERSION= 1.4.1.0
|
||||
JGRAPHX_JAR= jgraphx-${JGRAPHX_VERSION:C/\./_/g}.jar
|
||||
|
||||
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-bin-JAVA_HOME
|
||||
|
||||
GUI_DEPENDS= ${JAVALIBDIR}/flexdock.jar:${PORTSDIR}/devel/flexdock \
|
||||
${JAVALIBDIR}/jogl.jar:${PORTSDIR}/graphics/jogl \
|
||||
${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
|
||||
${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.jar:${PORTSDIR}/math/jlatexmath \
|
||||
fop:${PORTSDIR}/textproc/fop \
|
||||
${LOCALBASE}/share/java/batik/lib/batik-all.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 \
|
||||
${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:${PORTSDIR}/textproc/docbook-xsl \
|
||||
xsltproc:${PORTSDIR}/textproc/libxslt \
|
||||
${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils
|
||||
|
||||
# Can't use USE_ANT because it overrides do-build target
|
||||
BUILD_DEPENDS+= ${GUI_DEPENDS} \
|
||||
ant:${PORTSDIR}/devel/apache-ant \
|
||||
swig:${PORTSDIR}/devel/swig13
|
||||
|
||||
RUN_DEPENDS+= ${GUI_DEPENDS}
|
||||
|
||||
.if ${PORT_OPTIONS:MGUI}
|
||||
USE_JAVA= yes
|
||||
JAVA_VERSION= 1.6+
|
||||
# bsdjava (ie java/jdk16) doesn't have some "extra" classes that aren't in
|
||||
# the standard java. namespace, but are required by scilab, such as
|
||||
# javax.xml.bind.annotation.XmlSeeAlso
|
||||
JAVA_VENDOR= openjdk
|
||||
JAVA_BUILD= yes
|
||||
JAVA_RUN= yes
|
||||
USE_XORG= x11
|
||||
|
||||
CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME} \
|
||||
--with-docbook=${LOCALBASE}/share/xsl/docbook \
|
||||
--enable-build-help \
|
||||
--enable-build-swig
|
||||
PLIST_SUB+= WITHOUT_GUI="@comment "
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MHELP}
|
||||
ALL_TARGET= all doc
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MFFTW}
|
||||
CONFIGURE_ARGS+= --without-fftw
|
||||
.else
|
||||
LIB_DEPENDS+= libfftw3.so:${PORTSDIR}/math/fftw3
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MPVM}
|
||||
CONFIGURE_ARGS+= --without-pvm
|
||||
.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
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MUMFPACK}
|
||||
CONFIGURE_ARGS+= --without-umfpack
|
||||
.else
|
||||
LIB_DEPENDS+= libamd.so:${PORTSDIR}/math/suitesparse
|
||||
CONFIGURE_ARGS+= --with-umfpack-include=${LOCALBASE}/include \
|
||||
--with-umfpack-library=${LOCALBASE}/lib
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MMATIO}
|
||||
CONFIGURE_ARGS+= --without-matio
|
||||
.else
|
||||
BROKEN= doesn't build with modern matio
|
||||
LIB_DEPENDS+= libmatio.so:${PORTSDIR}/math/matio
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MOCAML}
|
||||
CONFIGURE_ARGS+= --without-modelica
|
||||
PLIST_SUB+= OCAML="@comment "
|
||||
.else
|
||||
BUILD_DEPENDS+= ocaml:${PORTSDIR}/lang/ocaml
|
||||
RUN_DEPENDS+= ocaml:${PORTSDIR}/lang/ocaml
|
||||
PLIST_SUB+= OCAML=""
|
||||
.endif
|
||||
|
||||
.if ! ${PORT_OPTIONS:MDOCS}
|
||||
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-NOPORTDOCS
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@${MKDIR} ${WRKSRC}/thirdparty
|
||||
@${UNZIP_CMD} ${DISTDIR}/${SAXON_DISTFILE} saxon.jar -d ${WRKSRC}/thirdparty
|
||||
.if ${PORT_OPTIONS:MGUI}
|
||||
@${CP} ${DISTDIR}/${JGRAPHX_JAR} ${WRKSRC}/thirdparty/jgraphx.jar
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@ -206,17 +138,13 @@ post-patch:
|
||||
@# Build fixes
|
||||
@${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 's|exp10(|pow(10., |g' ${WRKSRC}/modules/graphics/src/c/Format.c \
|
||||
${WRKSRC}/modules/graphics/src/c/getHandleProperty/set_log_flags_property.c
|
||||
@# malloc.h -> stdlib.h conversions
|
||||
@${GREP} -lr "<malloc.h>" ${WRKSRC} \
|
||||
| ${XARGS} ${REINPLACE_CMD} -e \
|
||||
's/[<"]malloc.h[>"]/<stdlib.h>/'
|
||||
@# Install fixes
|
||||
@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
|
||||
@# Run fixes
|
||||
@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml
|
||||
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml
|
||||
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/etc/librarypath.xml
|
||||
@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
|
||||
.if ${PORT_OPTIONS:MGUI}
|
||||
@# Configure fixes
|
||||
@ -225,13 +153,9 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e 's|$$jardir/batik-all.jar|${LOCALBASE}/share/java/batik/lib/batik-all.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
|
||||
@${REINPLACE_CMD} -e 's|jrosetta-API.jar|jrosetta-api.jar|' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|jrosetta-API.jar|jrosetta-api.jar|' ${WRKSRC}/configure
|
||||
@# Run fixes
|
||||
@${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml
|
||||
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml
|
||||
@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab \
|
||||
${WRKSRC}/bin/scilab-adv-cli ${WRKSRC}/bin/scilab-cli
|
||||
@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab
|
||||
@${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop
|
||||
@${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \
|
||||
${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop
|
||||
@ -239,44 +163,16 @@ post-patch:
|
||||
@# Avoids segfault when building help
|
||||
@${REINPLACE_CMD} 's|JIT|NONE|' ${WRKSRC}/etc/jvm_options.xml
|
||||
.endif
|
||||
.else
|
||||
@${REINPLACE_CMD} -e '/^check-local:/,/^$$/s/scilab-adv-cli/scilab-cli/g' \
|
||||
${WRKSRC}/Makefile.in
|
||||
.endif
|
||||
|
||||
pre-install:
|
||||
@${MKDIR} ${STAGEDIR}${DATADIR}/.atoms
|
||||
@${TOUCH} ${STAGEDIR}${DATADIR}/.atoms/.keep_me
|
||||
.if ${PORT_OPTIONS:MGUI}
|
||||
@${MKDIR} ${STAGEDIR}${DATADIR}/modules && ${INSTALL_DATA} ${DISTDIR}/${JGRAPHX_JAR} ${STAGEDIR}${DATADIR}/modules/jgraphx.jar
|
||||
@${REINPLACE_CMD} -e 's|${WRKSRC}/thirdparty/jgraphx.jar|${DATADIR}/modules/jgraphx.jar|g' ${WRKSRC}/etc/classpath.xml
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
@# Remove empty dirs in DATADIR/modules - they will be removed by the
|
||||
@# toolbox uninstaller otherwise if 3rd party toolboxes are used
|
||||
@${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete
|
||||
@# plist for include/scilab
|
||||
@${FIND} -s ${STAGEDIR}${PREFIX}/include/scilab -not -type d | ${SORT} | \
|
||||
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
|
||||
@${FIND} ${STAGEDIR}${PREFIX}/include/scilab -type d | ${SORT} -r | \
|
||||
${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
|
||||
@# plist for lib/scilab
|
||||
@${FIND} -s ${STAGEDIR}${PREFIX}/lib/scilab -not -type d | ${SORT} | \
|
||||
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
|
||||
@${FIND} ${STAGEDIR}${PREFIX}/lib/scilab -type d | ${SORT} -r | \
|
||||
${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
|
||||
@# plist for share/scilab EXCEPT:
|
||||
@# contrib and .atoms (3rd party toolboxes)
|
||||
@${FIND} -s ${STAGEDIR}${DATADIR} -not -type d -not -path ${STAGEDIR}${DATADIR}/contrib\* | \
|
||||
${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
|
||||
@${FIND} ${STAGEDIR}${DATADIR} -type d -not -path ${STAGEDIR}${DATADIR}/contrib\* \
|
||||
-not -path ${STAGEDIR}${DATADIR}/.atoms\* -not -path ${STAGEDIR}${DATADIR} | \
|
||||
${SORT} -r | ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@unexec rmdir %D/share/scilab 2>/dev/null || true" >> ${TMPPLIST}
|
||||
.if ! ${PORT_OPTIONS:MGUI}
|
||||
@${TOUCH} ${STAGEDIR}${DATADIR}/contrib/xcos_toolbox_skeleton/images/h5/.keep_me
|
||||
.endif
|
||||
|
||||
check test regression-test: build
|
||||
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
|
||||
|
||||
@ -1,6 +1,2 @@
|
||||
SHA256 (scilab-5.3.3-src.tar.gz) = e6edd7d241f2a09bd2dadaaafff5c152509db240220933b87305875302401335
|
||||
SIZE (scilab-5.3.3-src.tar.gz) = 47253497
|
||||
SHA256 (jgraphx-1_4_1_0.jar) = 8c4bd7e63a5149b67373857c2cc3d45015463a9075d7b6f078d7307f6d1038ec
|
||||
SIZE (jgraphx-1_4_1_0.jar) = 503319
|
||||
SHA256 (saxon6-5-5.zip) = a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4
|
||||
SIZE (saxon6-5-5.zip) = 3346162
|
||||
SHA256 (scilab-5.5.0-src.tar.gz) = 7896ef914e40f6c7ce93dd106e091c552b1822190a3986795ee8b412a53aa5c3
|
||||
SIZE (scilab-5.5.0-src.tar.gz) = 68627863
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
--- Makefile.in.orig 2010-12-16 22:07:06.000000000 -0800
|
||||
+++ Makefile.in 2010-12-16 22:07:26.000000000 -0800
|
||||
@@ -618,24 +618,7 @@
|
||||
$(top_builddir)/Version.incl
|
||||
|
||||
infofilesdir = $(pkgdatadir)/
|
||||
-infofiles_DATA = $(top_srcdir)/CHANGES_2.X \
|
||||
-$(top_srcdir)/CHANGES_3.X \
|
||||
-$(top_srcdir)/CHANGES_4.X \
|
||||
-$(top_srcdir)/CHANGES_5.0.X \
|
||||
-$(top_srcdir)/CHANGES_5.1.X \
|
||||
-$(top_srcdir)/CHANGES_5.2.X \
|
||||
-$(top_srcdir)/CHANGES_5.3.X \
|
||||
-$(top_srcdir)/ACKNOWLEDGEMENTS \
|
||||
-$(top_srcdir)/COPYING \
|
||||
-$(top_srcdir)/COPYING-BSD \
|
||||
-$(top_srcdir)/COPYING-FR \
|
||||
-$(top_srcdir)/README_Unix \
|
||||
-$(top_srcdir)/RELEASE_NOTES_5.0.X \
|
||||
-$(top_srcdir)/RELEASE_NOTES_5.1.X \
|
||||
-$(top_srcdir)/RELEASE_NOTES_5.2.X \
|
||||
-$(top_srcdir)/RELEASE_NOTES_5.3.X \
|
||||
-$(top_srcdir)/Readme_Visual.txt \
|
||||
-$(top_srcdir)/README_Windows.txt
|
||||
+infofiles_DATA =
|
||||
|
||||
iconsdir = $(pkgdatadir)/icons/
|
||||
icons_DATA = $(top_srcdir)/icons/scilab.xpm \
|
||||
@ -8,23 +8,3 @@
|
||||
#
|
||||
# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
|
||||
# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
|
||||
--- bin/scilab-adv-cli.orig 2010-09-01 19:31:28.000000000 -0700
|
||||
+++ bin/scilab-adv-cli 2010-09-01 19:32:46.000000000 -0700
|
||||
@@ -1,4 +1,7 @@
|
||||
#!/bin/sh
|
||||
+
|
||||
+export JAVA_HOME=%%JAVA_HOME%%
|
||||
+
|
||||
#
|
||||
# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
|
||||
# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
|
||||
--- bin/scilab-cli.orig 2010-09-01 19:31:34.000000000 -0700
|
||||
+++ bin/scilab-cli 2010-09-01 19:32:57.000000000 -0700
|
||||
@@ -1,4 +1,7 @@
|
||||
#!/bin/sh
|
||||
+
|
||||
+export JAVA_HOME=%%JAVA_HOME%%
|
||||
+
|
||||
#
|
||||
# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
|
||||
# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
|
||||
|
||||
46
math/scilab/files/patch-Makefile.in
Normal file
46
math/scilab/files/patch-Makefile.in
Normal file
@ -0,0 +1,46 @@
|
||||
--- Makefile.in.orig 2014-07-23 08:16:45.372563695 +0000
|
||||
+++ Makefile.in 2014-07-23 09:22:04.067294214 +0000
|
||||
@@ -108,6 +108,7 @@
|
||||
@IS_MACOSX_TRUE@am__append_2 = -framework Cocoa
|
||||
@NEED_JAVA_TRUE@am__append_3 = \
|
||||
@NEED_JAVA_TRUE@ $(top_builddir)/modules/console/libsciconsole.la \
|
||||
+@NEED_JAVA_TRUE@ $(top_builddir)/modules/console/libsciconsole-minimal.la \
|
||||
@NEED_JAVA_TRUE@ $(top_builddir)/modules/jvm/libscijvm.la \
|
||||
@NEED_JAVA_TRUE@ $(top_builddir)/modules/commons/libscicommons.la
|
||||
|
||||
@@ -827,12 +828,22 @@
|
||||
scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
|
||||
$(top_builddir)/modules/libscilab-cli.la $(OPENMPI_LIBS) \
|
||||
$(XML_LIBS) $(COMMON_LIBS) $(FLIBS) $(am__append_3) \
|
||||
- $(am__append_4) $(am__append_11)
|
||||
+ $(am__append_4) $(am__append_11) \
|
||||
+ $(top_builddir)/modules/history_manager/libscihistory_manager.la \
|
||||
+ $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
|
||||
+ $(top_builddir)/modules/hdf5/libscihdf5.la \
|
||||
+ $(top_builddir)/modules/functions/libscifunctions.la \
|
||||
+ $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la
|
||||
scilab_cli_bin_LDADD = $(top_builddir)/modules/libscilab-cli.la \
|
||||
$(top_builddir)/modules/console/libsciconsole-minimal.la \
|
||||
$(top_builddir)/modules/jvm/libscijvm-disable.la \
|
||||
$(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
|
||||
- $(am__append_12)
|
||||
+ $(am__append_12) \
|
||||
+ $(top_builddir)/modules/history_manager/libscihistory_manager.la \
|
||||
+ $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
|
||||
+ $(top_builddir)/modules/hdf5/libscihdf5.la \
|
||||
+ $(top_builddir)/modules/functions/libscifunctions.la \
|
||||
+ $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la
|
||||
LANG_DOMAIN = scilab
|
||||
TARGETS_ALL = macros $(am__append_13) $(am__append_14)
|
||||
|
||||
@@ -2355,8 +2366,8 @@
|
||||
@BUILD_HELP_TRUE@ done; \
|
||||
@BUILD_HELP_TRUE@ fi
|
||||
# Also install scirenderer.jar
|
||||
-@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
|
||||
-@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
|
||||
+@BUILD_HELP_TRUE@@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)
|
||||
+@BUILD_HELP_TRUE@@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/
|
||||
|
||||
.PHONY: macros localization doc
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- build.incl.xml.orig 2011-05-16 01:28:42.000000000 -0700
|
||||
+++ build.incl.xml 2011-05-16 01:29:23.000000000 -0700
|
||||
@@ -85,6 +85,7 @@
|
||||
<pathelement location="${saxon.jar}"/>
|
||||
<pathelement location="${fop.jar}"/>
|
||||
<pathelement location="${jlatexmath-fop.jar}"/>
|
||||
+ <pathelement location="${xmlgraphics-commons.jar}"/>
|
||||
<pathelement location="${avalon-framework.jar}"/>
|
||||
<pathelement location="${avalon-framework-impl.jar}"/>
|
||||
<pathelement location="${jeuclid-core.jar}"/>
|
||||
19
math/scilab/files/patch-clang
Normal file
19
math/scilab/files/patch-clang
Normal file
@ -0,0 +1,19 @@
|
||||
--- modules/core/includes/core_math.h.orig 2014-04-11 09:51:38.000000000 +0000
|
||||
+++ modules/core/includes/core_math.h 2014-07-23 08:27:27.143519955 +0000
|
||||
@@ -53,11 +53,11 @@
|
||||
#define DEG2RAD(x) ((x) * PI_OVER_180 )
|
||||
#define RAD2DEG(x) ((x) * _180_OVER_PI )
|
||||
|
||||
-#ifdef round
|
||||
-#undef round
|
||||
-#endif
|
||||
-
|
||||
-#define round(a) (int)(((a)<0.0)?(a)-.5:(a)+.5)
|
||||
+// #ifdef round
|
||||
+// #undef round
|
||||
+// #endif
|
||||
+//
|
||||
+// #define round(a) (int)(((a)<0.0)?(a)-.5:(a)+.5)
|
||||
#define EPSILON 1.0e-13
|
||||
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
--- ./configure.orig 2011-07-20 08:15:42.000000000 +0000
|
||||
+++ ./configure 2013-10-23 11:59:48.722499060 +0000
|
||||
@@ -10719,7 +10719,7 @@
|
||||
ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
||||
D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
|
||||
ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
|
||||
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
|
||||
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -10850,7 +10850,7 @@
|
||||
ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
||||
D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
|
||||
ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
|
||||
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
|
||||
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -12226,14 +12226,15 @@
|
||||
|
||||
public class conftest {
|
||||
public static void main(String[] argv) {
|
||||
- String minVersion="1.8.4";
|
||||
+ int minVersion=10804;
|
||||
int[] vers = new int[3];
|
||||
try { H5.H5get_libversion(vers); }
|
||||
catch (Throwable ex) {System.exit(-1);}
|
||||
String ver = vers[0] + "."+ vers[1] +"."+vers[2];
|
||||
+ int Version = 10000*vers[0] + 100*vers[1] + vers[2];
|
||||
|
||||
System.out.println(ver);
|
||||
- if (minVersion.compareTo(ver) > 0) {
|
||||
+ if (minVersion > Version) {
|
||||
System.exit(-1);
|
||||
}
|
||||
|
||||
@@ -12281,14 +12281,15 @@
|
||||
|
||||
public class conftest {
|
||||
public static void main(String[] argv) {
|
||||
- String minVersion="1.8.4";
|
||||
+ int minVersion=10804;
|
||||
int[] vers = new int[3];
|
||||
try { H5.H5get_libversion(vers); }
|
||||
catch (Throwable ex) {System.exit(-1);}
|
||||
String ver = vers[0] + "."+ vers[1] +"."+vers[2];
|
||||
+ int Version = 10000*vers[0] + 100*vers[1] + vers[2];
|
||||
|
||||
System.out.println(ver);
|
||||
- if (minVersion.compareTo(ver) != 0) {
|
||||
+ if (minVersion > Version) {
|
||||
System.exit(-1);
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- desktop/scilab-adv-cli.desktop.orig 2011-05-16 18:13:57.000000000 -0700
|
||||
+++ desktop/scilab-adv-cli.desktop 2011-05-16 18:14:10.000000000 -0700
|
||||
@@ -2,7 +2,7 @@
|
||||
Comment=Scientific software package for numerical computations
|
||||
Comment[fr]=Logiciel scientifique de calcul numérique
|
||||
Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen
|
||||
-Exec=scilab-cli
|
||||
+Exec=scilab-adv-cli
|
||||
GenericName=Scientific Software Package
|
||||
GenericName[fr]=Logiciel de calcul numérique
|
||||
GenericName[de]=Wissenschaftssoftware
|
||||
@ -1,24 +1,36 @@
|
||||
--- etc/librarypath.xml.orig 2010-08-29 23:41:41.000000000 -0700
|
||||
+++ etc/librarypath.xml 2010-08-29 23:42:38.000000000 -0700
|
||||
@@ -29,19 +29,11 @@
|
||||
<path value="$SCILAB/modules/scinotes/.libs"/>
|
||||
<path value="$SCILAB/.libs"/>
|
||||
|
||||
-<!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
|
||||
-<path value="/usr/lib/jni/"/>
|
||||
-
|
||||
-<!-- Some distributions (like openSUSE) put gluegen-rt in /usr/lib instead pf /usr/lib/jni -->
|
||||
-<path value="/usr/lib" />
|
||||
-
|
||||
<!-- Make install with prefix -->
|
||||
<path value="$SCILAB/../../lib/scilab/"/>
|
||||
|
||||
<!-- Standard path -->
|
||||
-<path value="/usr/lib/scilab/"/>
|
||||
-
|
||||
-<!-- Standard path for 64 bits -->
|
||||
-<path value="/usr/lib64/scilab/"/>
|
||||
+<path value="%%JAVALIBDIR%%"/>
|
||||
+<path value="%%PREFIX%%/lib"/>
|
||||
|
||||
--- etc/librarypath.xml.orig 2014-04-11 09:51:34.000000000 +0000
|
||||
+++ etc/librarypath.xml 2014-05-08 06:41:45.257546863 +0000
|
||||
@@ -35,30 +35,12 @@
|
||||
<path value="$SCILAB/modules/javasci/.libs"/>
|
||||
<path value="$SCILAB/modules/.libs"/>
|
||||
<path value="$SCILAB/.libs"/>
|
||||
-
|
||||
- <!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
|
||||
- <path value="/usr/lib/jni/"/>
|
||||
-
|
||||
- <!-- Standard path for %{_jnidir} rpm macro (jpackage) -->
|
||||
- <path value="/usr/lib/java/"/>
|
||||
- <path value="/usr/lib64/java/"/>
|
||||
-
|
||||
- <!-- RedHat put JNI on /usr/%{libdir}/%{name} instead of /usr/lib/jni -->
|
||||
- <path value="/usr/lib/jogl2/"/>
|
||||
- <path value="/usr/lib64/jogl2/"/>
|
||||
- <path value="/usr/lib/gluegen2/"/>
|
||||
- <path value="/usr/lib64/gluegen2/"/>
|
||||
-
|
||||
- <!-- Some distributions (like openSUSE) put gluegen-rt in /usr/lib instead pf /usr/lib/jni -->
|
||||
- <path value="/usr/lib" />
|
||||
-
|
||||
+
|
||||
<!-- Make install with prefix -->
|
||||
<path value="$SCILAB/../../lib/scilab/"/>
|
||||
|
||||
<!-- Standard path -->
|
||||
- <path value="/usr/lib/scilab/"/>
|
||||
-
|
||||
- <!-- Standard path for 64 bits -->
|
||||
- <path value="/usr/lib64/scilab/"/>
|
||||
+ <path value="%%JAVALIBDIR%%"/>
|
||||
+ <path value="%%LOCALBASE%%/lib"/>
|
||||
|
||||
</librarypaths>
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- modules/atoms/macros/atoms_gui/atomsGui.sci.orig 2010-12-15 02:20:51.000000000 -0800
|
||||
+++ modules/atoms/macros/atoms_gui/atomsGui.sci 2010-12-15 02:21:41.000000000 -0800
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
if errStatus<>0 | size(allModules, "*") == 0 then
|
||||
if size(atomsRepositoryList(),"*") > 0 then
|
||||
- messagebox(gettext("No ATOMS module is available. Please, check your Internet connection."), gettext("ATOMS error"), "error");
|
||||
+ messagebox(gettext("ATOMS is not available for FreeBSD at this time."), gettext("ATOMS error"), "error");
|
||||
else
|
||||
messagebox(gettext("No ATOMS module is available: your repository list is empty."), gettext("ATOMS error"), "error");
|
||||
end
|
||||
@ -1,32 +0,0 @@
|
||||
--- modules/atoms/macros/atoms_internals/atomsAUWriteAccess.sci.orig 2010-12-16 23:18:06.000000000 -0800
|
||||
+++ modules/atoms/macros/atoms_internals/atomsAUWriteAccess.sci 2010-12-16 23:21:49.000000000 -0800
|
||||
@@ -24,25 +24,11 @@
|
||||
atoms_system_directory = atomsPath("system" ,"allusers");
|
||||
atoms_install_directory = atomsPath("install","allusers");
|
||||
|
||||
- // Physical test
|
||||
-
|
||||
- if ~ isdir(atoms_system_directory) then
|
||||
- if mkdir(atoms_system_directory) <> 1 then
|
||||
- return;
|
||||
- end
|
||||
- end
|
||||
-
|
||||
- if execstr("mputl(""dummy"",atoms_system_directory+""dummy"");","errcatch") == 0 then
|
||||
+ // Just assume root should install to DATADIR and everyone else should
|
||||
+ // use ~/.Scilab
|
||||
+ rep = unix_g("whoami");
|
||||
+ if rep == "root" then
|
||||
res = %T;
|
||||
- mdelete(atoms_system_directory+"dummy");
|
||||
- else
|
||||
- return;
|
||||
- end
|
||||
-
|
||||
- if execstr("mputl(""dummy"",atoms_install_directory+""dummy"");","errcatch") <> 0 then
|
||||
- res = %F;
|
||||
- else
|
||||
- mdelete(atoms_install_directory+"dummy");
|
||||
end
|
||||
|
||||
endfunction
|
||||
@ -1,84 +0,0 @@
|
||||
--- modules/atoms/macros/atoms_internals/atomsDownload.sci.orig 2010-12-16 23:27:03.000000000 -0800
|
||||
+++ modules/atoms/macros/atoms_internals/atomsDownload.sci 2010-12-16 23:41:40.000000000 -0800
|
||||
@@ -71,6 +71,7 @@
|
||||
CURL = %F;
|
||||
WGET = %F;
|
||||
HTTPDOWNLOAD = %F;
|
||||
+ FETCH = %F;
|
||||
|
||||
// Maybe the detection has already been done
|
||||
|
||||
@@ -83,10 +84,16 @@
|
||||
elseif atomsGetConfig("downloadTool") == "httpdownload" & getos() == 'Windows' then
|
||||
HTTPDOWNLOAD=%T;
|
||||
|
||||
+ elseif atomsGetConfig("downloadTool") == "fetch" then
|
||||
+ FETCH=%T;
|
||||
+
|
||||
else
|
||||
|
||||
// Default values according to platform
|
||||
- if LINUX | SOLARIS | BSD then
|
||||
+ if BSD then
|
||||
+ FETCH = %T;
|
||||
+
|
||||
+ elseif LINUX | SOLARIS then
|
||||
|
||||
// Need to detect under Linux platforms
|
||||
[rep,stat,err] = unix_g("wget --version");
|
||||
@@ -125,9 +132,12 @@
|
||||
if CURL then
|
||||
// Curl
|
||||
timeout_arg = " --connect-timeout ";
|
||||
- else
|
||||
+ elseif WGET then
|
||||
// wget
|
||||
timeout_arg = " --timeout=";
|
||||
+ else
|
||||
+ // fetch
|
||||
+ timeout_arg = " -T ";
|
||||
end
|
||||
|
||||
timeout = string(strtod(atomsGetConfig("downloadTimeout")));
|
||||
@@ -141,6 +151,9 @@
|
||||
timeout_arg = timeout_arg + " ";
|
||||
|
||||
// Proxy configuration
|
||||
+ //
|
||||
+ // fetch should set environment variables for proxy - see fetch(3)
|
||||
+ //
|
||||
if (atomsGetConfig("useProxy") == "True") & (atomsGetConfig("proxyHost") <> "") then
|
||||
|
||||
// Host
|
||||
@@ -155,7 +168,7 @@
|
||||
if CURL then
|
||||
// Curl
|
||||
proxy_host_arg = " --proxy "+ proxy_host;
|
||||
- else
|
||||
+ elseif WGET then
|
||||
// wget
|
||||
proxy_host_arg = " http_proxy="""+proxy_host+""" ";
|
||||
end
|
||||
@@ -165,7 +178,7 @@
|
||||
if CURL then
|
||||
// Curl
|
||||
proxy_user_arg = " --proxy-user "+atomsGetConfig("proxyUser")+":"+atomsGetConfig("proxyPassword");
|
||||
- else
|
||||
+ elseif WGET then
|
||||
// wget
|
||||
proxy_user_arg = " --proxy-user="""+atomsGetConfig("proxyUser")+""" --proxy-password="""+atomsGetConfig("proxyPassword")+"""";
|
||||
end
|
||||
@@ -179,9 +192,12 @@
|
||||
elseif CURL then
|
||||
// curl
|
||||
download_cmd = "curl "+proxy_host_arg+proxy_user_arg+timeout_arg+" -s "+url_in + " -o " + file_out;
|
||||
- else
|
||||
+ elseif WGET
|
||||
// wget
|
||||
download_cmd = proxy_host_arg+"wget"+proxy_user_arg+timeout_arg+" "+url_in + " -O " + file_out;
|
||||
+ else
|
||||
+ // fetch
|
||||
+ download_cmd = "fetch " + timeout_arg + "-o " + file_out + " " + url_in;
|
||||
end
|
||||
|
||||
[rep,stat,err] = unix_g(download_cmd);
|
||||
@ -1,42 +1,32 @@
|
||||
--- modules/dynamic_link/macros/ilib_gen_Make_unix.sci.orig 2010-11-24 00:50:36.000000000 -0800
|
||||
+++ modules/dynamic_link/macros/ilib_gen_Make_unix.sci 2010-12-15 05:04:30.000000000 -0800
|
||||
@@ -64,22 +64,7 @@
|
||||
originPath = pwd();
|
||||
linkBuildDir = TMPDIR;
|
||||
--- ./modules/dynamic_link/macros/ilib_gen_Make_unix.sci.orig 2014-04-11 09:51:43.000000000 +0000
|
||||
+++ ./modules/dynamic_link/macros/ilib_gen_Make_unix.sci 2014-07-24 23:46:32.896279292 +0000
|
||||
@@ -65,20 +65,6 @@
|
||||
linkBuildDir = TMPDIR+"/"+libname;
|
||||
mkdir(linkBuildDir);
|
||||
commandpath = SCI+"/modules/dynamic_link/src/scripts";
|
||||
- [fd,ierr] = mopen(commandpath+"/write.test","w+");
|
||||
-
|
||||
- if (ierr<>0) then
|
||||
- writePerm=%F
|
||||
- writePerm=%F
|
||||
- else
|
||||
- writePerm=%T
|
||||
- mclose(fd)
|
||||
- mdelete(commandpath+"/write.test");
|
||||
- writePerm=%T
|
||||
- mclose(fd)
|
||||
- mdelete(commandpath+"/write.test");
|
||||
- end
|
||||
-
|
||||
- if (writePerm == %T & ( fileinfo(commandpath+"/Makefile.orig") == [] | fileinfo(commandpath+"/libtool") == [] )) then
|
||||
- // We have write permission on the scilab tree, then generate the stuff into the directory in order to avoid the configure each time.
|
||||
- // We have write permission on the scilab tree, then generate the stuff into the directory in order to avoid the configure each time.
|
||||
- generateConfigure(commandpath);
|
||||
- end
|
||||
-
|
||||
-
|
||||
+
|
||||
// Copy files => linkBuildDir
|
||||
chdir(linkBuildDir);
|
||||
|
||||
@@ -178,7 +163,7 @@
|
||||
|
||||
// Copy files => linkBuildDir
|
||||
@@ -187,7 +173,7 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if ldflags <> '' | cflags <> '' | fflags <> '' | cc <> '' | fileinfo(commandpath+"/Makefile.orig") == [] | fileinfo(commandpath+"/libtool") == [] then
|
||||
- if ldflags <> "" | cflags <> "" | fflags <> "" | cc <> "" | fileinfo(commandpath+"/Makefile.orig") == [] | fileinfo(commandpath+"/libtool") == [] then
|
||||
+ if %T then
|
||||
// Makefile.orig doesn't exists or may be invalid regarding the flags
|
||||
// run the ./configure with the flags
|
||||
|
||||
@@ -274,4 +259,4 @@
|
||||
end
|
||||
|
||||
endfunction
|
||||
-//=============================================================================
|
||||
\ No newline at end of file
|
||||
+//=============================================================================
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- modules/arnoldi/Makefile.in.orig 2011-07-20 04:15:42.000000000 -0400
|
||||
+++ modules/arnoldi/Makefile.in 2011-08-09 09:52:07.000000000 -0400
|
||||
@@ -489,7 +489,7 @@
|
||||
|
||||
libsciarnoldi_la_FFLAGS = -I$(srcdir)/src/arpack/
|
||||
pkglib_LTLIBRARIES = libsciarnoldi.la
|
||||
-libsciarnoldi_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LAPACK_LIBS)
|
||||
+libsciarnoldi_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LAPACK_LIBS) $(BLAS_LIBS)
|
||||
libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
|
||||
|
||||
# For the code check (splint)
|
||||
@ -1,105 +0,0 @@
|
||||
--- ./modules/core/src/c/stack2.c.orig 2011-07-20 01:15:44.000000000 -0700
|
||||
+++ ./modules/core/src/c/stack2.c 2012-03-06 01:18:59.000000000 -0800
|
||||
@@ -667,7 +667,6 @@
|
||||
if (*lar != -1) C2F(cvstr1)(&MN, istk(*lr), cstk(*lar), &cx0, MN + 1);
|
||||
*lar = *lr;
|
||||
*lr = cadr(*lr);
|
||||
- M=MN; N= 1;
|
||||
break;
|
||||
case 'd' :
|
||||
if (! C2F(cremat)(fname, &lw1, &it, m, n, lr, &lcs, nlgh)) return FALSE;
|
||||
@@ -1259,6 +1258,12 @@
|
||||
*n = 1;
|
||||
if (! C2F(getsmat)(fname,&topk,&lw,&m1,&n1,&cx1,&cx1,lr,m, nlgh))
|
||||
return FALSE;
|
||||
+ if ((m1 != 1) || (n1 != 1))
|
||||
+ {
|
||||
+ /* bug 8768 check dimensions */
|
||||
+ Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname, *number);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
ix2 = *m * *n;
|
||||
/* in case where ix2 is 0 in2str adds the \0 char after the end of
|
||||
the storage of the variable, so it writes over the next variable
|
||||
@@ -1348,7 +1353,6 @@
|
||||
nn= (*m)*(*n);
|
||||
ScilabMStr2CM(istk(il1),&nn,istk(ild1),&items,&ierr);
|
||||
if ( ierr == 1) return FALSE;
|
||||
- Type = '$';
|
||||
/*
|
||||
* Warning : lr must have the proper size when calling getrhsvar
|
||||
* char **Str1; .... GetRhsVar(...., &lr)
|
||||
@@ -1621,7 +1625,6 @@
|
||||
Sp->icol = istk(icol);
|
||||
Sp->R = stk(lr1);
|
||||
Sp->I = stk(lc);
|
||||
- Type = '$';
|
||||
break;
|
||||
case 'I' :
|
||||
/* int matrices */
|
||||
@@ -1630,7 +1633,6 @@
|
||||
return FALSE;
|
||||
Im->m = *m ; Im->n = *n ; Im->it = it; Im->l = lr1;
|
||||
Im->D = istk(lr1);
|
||||
- Type = '$';
|
||||
break;
|
||||
case 'p' :
|
||||
if (! C2F(getlistpointer)(fname, &topk, &lw, number, lr, nlgh))
|
||||
@@ -2086,7 +2088,7 @@
|
||||
int ret = FALSE;
|
||||
int ifin = 0, ifun = 0, tops = 0, moutputs = 0;
|
||||
int id[nsiz];
|
||||
- int lf = 0, op = 0, ile = 0, ils = 0, nnn = thestring_len, ninputs = 0;
|
||||
+ int lf = 0, op = 0, ile = 0, ils = 0, nnn = thestring_len;
|
||||
|
||||
if (nnn <= 2)
|
||||
{
|
||||
@@ -2114,11 +2116,6 @@
|
||||
ils = iadr(lf) + 1;
|
||||
moutputs = *istk(ils);
|
||||
ile = ils + moutputs * nsiz + 1;
|
||||
- ninputs = *istk(ile);
|
||||
- /*
|
||||
- * ninputs=actual number of inputs, moutputs=actual number of outputs
|
||||
- * of thestring: checking mlhs=ninputs and mrhs=moutputs not done.
|
||||
- */
|
||||
ret = C2F(scifunction)(ifirst, &lf, mlhs, mrhs);
|
||||
}
|
||||
else
|
||||
@@ -2170,9 +2167,9 @@
|
||||
|
||||
int C2F(scibuiltin)(int *number,int *ifun,int *ifin,int *mlhs,int *mrhs)
|
||||
{
|
||||
- int srhs, slhs;
|
||||
- int ix, k, intop, lw, pt0;
|
||||
- int imode,ireftop;
|
||||
+ int srhs = 0, slhs = 0;
|
||||
+ int ix = 0, k = 0, intop = 0, lw = 0;
|
||||
+ int imode = 0, ireftop = 0;
|
||||
intop = Top;
|
||||
|
||||
if ( intersci_push() == 0 )
|
||||
@@ -2187,7 +2184,6 @@
|
||||
Lhs = *mlhs;
|
||||
Rhs = *mrhs;
|
||||
C2F(recu).krec = -1;
|
||||
- pt0 = C2F(recu).pt;
|
||||
++C2F(recu).niv;
|
||||
goto L90;
|
||||
/* ***************************** copied from callinter.h */
|
||||
@@ -2564,12 +2560,15 @@
|
||||
|
||||
for (k = 1; k <= Lhs; k++)
|
||||
{
|
||||
+ if (LhsVar(k))
|
||||
+ {
|
||||
plhsk=*Lstk(LhsVar(k)+Top-Rhs);
|
||||
if (*istk( iadr(plhsk) ) < 0) {
|
||||
if (*Lstk(Bot) > *Lstk(*istk(iadr (plhsk) +2)) )
|
||||
LhsVar(k)=*istk(iadr(plhsk)+2);
|
||||
/* lcres = 0 */
|
||||
}
|
||||
+ }
|
||||
}
|
||||
|
||||
if (Err > 0||C2F(errgst).err1> 0) return TRUE ;
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig 2011-07-20 01:16:12.000000000 -0700
|
||||
+++ ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java 2012-02-13 01:10:14.000000000 -0800
|
||||
@@ -61,7 +61,7 @@
|
||||
* Dependencies version
|
||||
*/
|
||||
private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
|
||||
- private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
|
||||
+ private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 6]", "[1, 8, 7]", "[1, 8, 8]", "[1, 8, 9]");
|
||||
private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
|
||||
|
||||
private static final String UNABLE_TO_LOAD_JGRAPHX =
|
||||
28
math/scilab/files/patch-xdg-open
Normal file
28
math/scilab/files/patch-xdg-open
Normal file
@ -0,0 +1,28 @@
|
||||
--- ./modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java.orig 2014-07-24 22:44:04.242274707 +0000
|
||||
+++ ./modules/gui/src/java/org/scilab/modules/gui/utils/WebBrowser.java 2014-07-24 22:50:25.305278583 +0000
|
||||
@@ -98,14 +98,14 @@
|
||||
// We have <pierre.marechal@scilab.org>
|
||||
String mail = "mailto:" + url.substring(1, url.length() - 1);
|
||||
if (webprefs.defaultMailer) {
|
||||
- Desktop.getDesktop().mail(new URI(mail));
|
||||
+ Runtime.getRuntime().exec("xdg-email " + new URI(mail).toString());
|
||||
} else {
|
||||
Runtime.getRuntime().exec(webprefs.cmdMailer + " " + new URI(mail).toString());
|
||||
}
|
||||
}
|
||||
} else if (protocol.equals("mailto")) {
|
||||
if (webprefs.defaultMailer) {
|
||||
- Desktop.getDesktop().mail(new URI(url));
|
||||
+ Runtime.getRuntime().exec("xdg-open " + new URI(url).toString());
|
||||
} else {
|
||||
Runtime.getRuntime().exec(webprefs.cmdMailer + " " + new URI(url).toString());
|
||||
}
|
||||
@@ -113,7 +113,7 @@
|
||||
if (webprefs.defaultBrowser) {
|
||||
// Under Windows, ShellExecute is called with the URI and under Linux it is gnome_url_show.
|
||||
// So to handle different protocol in URI, user must config its OS to handle them.
|
||||
- Desktop.getDesktop().browse(new URI(url));
|
||||
+ Runtime.getRuntime().exec("xdg-open " + new URI(url).toString());
|
||||
} else {
|
||||
Runtime.getRuntime().exec(webprefs.cmdBrowser + " " + new URI(url).toString());
|
||||
}
|
||||
18790
math/scilab/pkg-plist
18790
math/scilab/pkg-plist
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user