diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2016-05-06 21:45:19 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2016-05-06 21:45:19 +0000 |
| commit | 9068f977ebe8ca8bd8ccaa0ac7c49877b2f1200f (patch) | |
| tree | e1ec7b8e8911dcd7b96cae5da3ffa38b471be2c4 /math | |
| parent | 643b1116efcca57619b7814de753523e6d144407 (diff) | |
Notes
Diffstat (limited to 'math')
4 files changed, 44 insertions, 1 deletions
diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 4cec89047d39..5c927da21c01 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -27,6 +27,8 @@ USES= cpe desktop-file-utils fortran gettext gmake iconv \ libtool pathfix pkgconfig shared-mime-info GNU_CONFIGURE= yes +INSTALLS_ICONS= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gfortran \ @@ -118,7 +120,7 @@ CONFIGURE_ARGS+= --without-openmp .include <bsd.port.pre.mk> -.if ${JAVA_PORT_VERSION:M1.8.*} +.if ${PORT_OPTIONS:MGUI} && ${JAVA_PORT_VERSION:M1.8.*} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif diff --git a/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h b/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h new file mode 100644 index 000000000000..dc5764331998 --- /dev/null +++ b/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h @@ -0,0 +1,19 @@ +--- modules/hdf5/includes/HDF5Objects.h.orig 2015-03-31 09:31:29 UTC ++++ modules/hdf5/includes/HDF5Objects.h +@@ -13,15 +13,13 @@ + #ifndef __HDF5OBJECTS_H__ + #define __HDF5OBJECTS_H__ + +-#define H5_NO_DEPRECATED_SYMBOLS + #undef H5_USE_16_API ++#define H5_USE_18_API + + #define H5Eset_auto_vers 2 + #include <hdf5.h> + #include <hdf5_hl.h> + +-#undef H5_NO_DEPRECATED_SYMBOLS +- + //#define __HDF5OBJECTS_DEBUG__ + //#define __HDF5ERROR_PRINT__ + diff --git a/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c b/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c new file mode 100644 index 000000000000..eef7c45dc2ef --- /dev/null +++ b/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c @@ -0,0 +1,11 @@ +--- modules/hdf5/src/c/h5_readDataFromFile.c.orig 2015-03-31 09:31:29 UTC ++++ modules/hdf5/src/c/h5_readDataFromFile.c +@@ -10,7 +10,7 @@ + * + */ + +-#define H5_NO_DEPRECATED_SYMBOLS ++#define H5_USE_18_API + + #ifndef _MSC_VER + #include <sys/time.h> diff --git a/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c b/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c new file mode 100644 index 000000000000..e6ba74babe17 --- /dev/null +++ b/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c @@ -0,0 +1,11 @@ +--- modules/hdf5/src/c/h5_readDataFromFile_v1.c.orig 2015-03-31 09:31:29 UTC ++++ modules/hdf5/src/c/h5_readDataFromFile_v1.c +@@ -10,7 +10,7 @@ + * + */ + +-#define H5_NO_DEPRECATED_SYMBOLS ++#define H5_USE_18_API + + #ifndef _MSC_VER + #include <sys/time.h> |