Index: head/math/scilab-toolbox-swt/Makefile
===================================================================
--- head/math/scilab-toolbox-swt/Makefile	(revision 536813)
+++ head/math/scilab-toolbox-swt/Makefile	(revision 536814)
@@ -1,71 +1,67 @@
 # $FreeBSD$
 
 PORTNAME=	swt
-PORTVERSION=	0.1.20
-PORTREVISION=	6
+PORTVERSION=	0.3.1
 CATEGORIES=	math
 MASTER_SITES=	http://atoms.scilab.org/toolboxes/swt/${PORTVERSION}/files/
 PKGNAMEPREFIX=	scilab-toolbox-
-DISTFILES=	${DISTNAME}-3-src${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-3-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scilab 1-D and 2-D Wavelet Toolbox
 
 BUILD_DEPENDS=	${SCILAB_CMD}:math/scilab
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+USES=		dos2unix zip
+USE_LOCALE=	en_US.UTF-8
+
 SCILAB_CMD=	${LOCALBASE}/bin/scilab-adv-cli
 SCILAB_ARGS=	-noatomsautoload -nb -nouserstartup
 MAKE_ENV=	SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1
+DOS2UNIX_FILES=	etc/swt.start
 
 CONTRIBDIR?=	share/scilab/contrib
 TOOLBOXDIR_REL?=	${CONTRIBDIR}/${PORTNAME}
 TOOLBOXDIR=	${PREFIX}/${TOOLBOXDIR_REL}
 PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR_REL}
 TOOLBOX_SUBDIRS=	demos etc macros
 
 OPTIONS_DEFINE=	HELP
 OPTIONS_DEFAULT=	HELP
 OPTIONS_SUB=	yes
 
 HELP_DESC=	Build help files (requires scilab with gui support)
 
 WRKSRC=		${WRKDIR}/swt
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MHELP}
 SCILAB_ARGS+=	-nwni
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-etc__swt.start
 .else
 TOOLBOX_SUBDIRS+=	jar
 .endif
 
 post-patch:
 .if !${PORT_OPTIONS:MHELP}
 	${REINPLACE_CMD} -e '/tbx_builder_help/d' ${WRKSRC}/builder.sce
 .endif
-	${REINPLACE_CMD} -e '/#include <malloc.h>/d' \
-		${WRKSRC}/sci_gateway/c/kiss_fft.h
 	${ECHO_CMD} quit >> ${WRKSRC}/builder.sce
 
 pre-build:
 	${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete
 
 do-build:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce
 
 do-install:
-	${MKDIR} ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c
-	${INSTALL_DATA} ${WRKSRC}/loader.sce ${STAGEDIR}${TOOLBOXDIR}
-	${INSTALL_DATA} ${WRKSRC}/sci_gateway/loader_gateway.sce \
-		${STAGEDIR}${TOOLBOXDIR}/sci_gateway
-	cd ${WRKSRC}/sci_gateway/c && \
-	${INSTALL_DATA} loader.sce ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c && \
-	${INSTALL_PROGRAM} libswt_c.so ${STAGEDIR}${TOOLBOXDIR}/sci_gateway/c
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TOOLBOXDIR} "-name *\.so -or -name loader*\.sce"
 .for d in ${TOOLBOX_SUBDIRS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${TOOLBOXDIR}
 .endfor
+	${FIND} ${STAGEDIR}${TOOLBOXDIR} -name *\.so -exec ${STRIP_CMD} {} \;
 
 .include <bsd.port.mk>
Index: head/math/scilab-toolbox-swt/distinfo
===================================================================
--- head/math/scilab-toolbox-swt/distinfo	(revision 536813)
+++ head/math/scilab-toolbox-swt/distinfo	(revision 536814)
@@ -1,2 +1,3 @@
-SHA256 (swt-0.1.20-3-src.tar.gz) = a0edfd25c4a5831d2953c45fdb9289fbba006149a6581dad84a8803293aaffeb
-SIZE (swt-0.1.20-3-src.tar.gz) = 945095
+TIMESTAMP = 1590664412
+SHA256 (swt-0.3.1-3-src.zip) = da2fb4a6c0a74a7bbae3f3aaa5134584d39ab293dfd23787a707318c8cc21eed
+SIZE (swt-0.3.1-3-src.zip) = 1177314
Index: head/math/scilab-toolbox-swt/files/patch-clang
===================================================================
--- head/math/scilab-toolbox-swt/files/patch-clang	(revision 536813)
+++ head/math/scilab-toolbox-swt/files/patch-clang	(nonexistent)
@@ -1,118 +0,0 @@
---- ./sci_gateway/c/swt_common.h.orig
-+++ ./sci_gateway/c/swt_common.h
-@@ -323,10 +323,10 @@
- //extern int is_scalar (int row, int col);
- //extern int is_vector (int row, int col);
- //extern int is_matrix (int row, int col);
--extern void void_check (int number, int *type);
--extern void scalar_check (int number, int *type);
--extern void vector_check (int number, int *type);
--extern void matrix_check (int number, int *type);
-+extern int void_check (int number, int *type);
-+extern int scalar_check (int number, int *type);
-+extern int vector_check (int number, int *type);
-+extern int matrix_check (int number, int *type);
- extern void real_or_complex (int number, int *type);
- extern int sci_matrix_vector_real (int number);
- extern int sci_matrix_vector_complex (int number);
-@@ -341,8 +341,8 @@
- extern int scalar_string_check(char *l, char c);
- extern int length_check(int number, int leng);
- extern int vector_length_check(int number1, int number2);
--extern void vector_length_compare(int number, int leng, int *res);
--extern void matrix_length_compare(int number, int rowLeng, 
-+extern int vector_length_compare(int number, int leng, int *res);
-+extern int matrix_length_compare(int number, int rowLeng, 
- 				  int colLeng, int *resRow, 
- 				  int *resCol);
- extern int matrix_length_check (int number1, int number2);
---- ./sci_gateway/c/validate.c.orig
-+++ ./sci_gateway/c/validate.c
-@@ -42,7 +42,7 @@
- /*-------------------------------------------
-  * Dimension Checking
-  *-----------------------------------------*/
--void void_check (int number, int *type)
-+int void_check (int number, int *type)
- {
-   int row, col;
-   GetMatrixdims(number,&row,&col);
-@@ -50,10 +50,10 @@
-     *type = 1;
-   else
-     *type = 0;
--  //return;
-+  return 1;
- }
- 
--void scalar_check (int number, int *type)
-+int scalar_check (int number, int *type)
- {
-   int row, col;
-   GetMatrixdims(number,&row,&col);
-@@ -61,10 +61,10 @@
-     *type = 1;
-   else
-     *type = 0;
--  //return;
-+  return 1;
- }
- 
--void vector_check (int number, int *type)
-+int vector_check (int number, int *type)
- {
-   int row, col;
-   GetMatrixdims(number,&row,&col);
-@@ -74,10 +74,10 @@
-     *type = 1;
-   else
-     *type = 0;
--  //return;
-+  return 1;
- }
- 
--void matrix_check (int number, int *type)
-+int matrix_check (int number, int *type)
- {
-   int row, col;
-   GetMatrixdims(number,&row,&col);
-@@ -85,7 +85,7 @@
-     *type = 1;
-   else
-     *type = 0;
--  //return;
-+  return 1;
- }
- 
- void real_or_complex (int number, int *type)
-@@ -234,7 +234,7 @@
-     return 0;
- }
- 
--void vector_length_compare(int number, int leng, int *res)
-+int vector_length_compare(int number, int leng, int *res)
- {
-   int row, col;
-   GetMatrixdims(number,&row,&col);
-@@ -244,10 +244,10 @@
-     *res = 1;
-   else
-     *res = -1;
--  return;
-+  return 1;
- }
- 
--void matrix_length_compare(int number, int rowLeng, int colLeng, 
-+int matrix_length_compare(int number, int rowLeng, int colLeng, 
- 			   int *resRow, int *resCol)
- {
-   int row, col;
-@@ -264,7 +264,7 @@
-     *resCol = 1;
-   else
-     *resCol = -1;
--  return;
-+  return 1;
- }
- 
- int 

Property changes on: head/math/scilab-toolbox-swt/files/patch-clang
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/math/scilab-toolbox-swt/pkg-descr
===================================================================
--- head/math/scilab-toolbox-swt/pkg-descr	(revision 536813)
+++ head/math/scilab-toolbox-swt/pkg-descr	(revision 536814)
@@ -1,17 +1,17 @@
 Scilab Wavelet Toolbox (SWT)
 
 Wavelet is a powerful signal processing tool developed and developing
 in the last two decades. Scilab Wavelet Toolbox is a free software package
 to enable you using wavelet analysis tools freely in Scilab on most OSes
 including GNU/Linux, BSD and Windows. Scilab Wavelet Toolbox is designed
 to work with any Scilab Image Processing Toolbox like SIP
 for displaying 2-D results.
 
 What Scilab Wavelet Toolbox supposed to do:
 Discrete Fast Wavelet Transform, daubechies wavelets
 1-D single level signal decomposition and reconstruction
 1-D multi-level signal decomposition and reconstruction
 2-D single level image decomposition and reconstruction
 2-D multi-level image decomposition and reconstruction.
 
-WWW: http://atoms.scilab.org/toolboxes/swt
+WWW: https://atoms.scilab.org/toolboxes/swt
Index: head/math/scilab-toolbox-swt/pkg-plist
===================================================================
--- head/math/scilab-toolbox-swt/pkg-plist	(revision 536813)
+++ head/math/scilab-toolbox-swt/pkg-plist	(revision 536814)
@@ -1,147 +1,153 @@
 %%TOOLBOXDIR%%/demos/cowt1d.sce
 %%TOOLBOXDIR%%/demos/cowt2d.sce
 %%TOOLBOXDIR%%/demos/cwt.sce
 %%TOOLBOXDIR%%/demos/cwt_chirp.sce
 %%TOOLBOXDIR%%/demos/diff_cwt.dem.sce
 %%TOOLBOXDIR%%/demos/dwtmode.dem.sce
 %%TOOLBOXDIR%%/demos/image.sce
 %%TOOLBOXDIR%%/demos/image/woman.bmp
 %%TOOLBOXDIR%%/demos/image/woman.dat
+%%TOOLBOXDIR%%/demos/imageDenoising.sce
 %%TOOLBOXDIR%%/demos/rwt.sce
 %%TOOLBOXDIR%%/demos/scale2freq.dem.sce
+%%TOOLBOXDIR%%/demos/semibalance.sce
 %%TOOLBOXDIR%%/demos/smoothness_wav.dem.sce
 %%TOOLBOXDIR%%/demos/swt.dem.gateway.sce
 %%TOOLBOXDIR%%/demos/swt1d.sce
 %%TOOLBOXDIR%%/demos/swt2d.sce
 %%TOOLBOXDIR%%/demos/swt3d.sce
 %%TOOLBOXDIR%%/demos/swtswt.sce
 %%TOOLBOXDIR%%/demos/wavedec.dem.sce
 %%TOOLBOXDIR%%/demos/wavelet_fam.dem.sce
 %%TOOLBOXDIR%%/demos/wavelet_scale.dem.sce
 %%TOOLBOXDIR%%/demos/wden.dem.sce
 %%TOOLBOXDIR%%/etc/swt.quit
 %%TOOLBOXDIR%%/etc/swt.start
 %%HELP%%%%TOOLBOXDIR%%/jar/scilab_en_US_help.jar
 %%TOOLBOXDIR%%/loader.sce
 %%TOOLBOXDIR%%/macros/buildmacros.sce
 %%TOOLBOXDIR%%/macros/centfrq.bin
 %%TOOLBOXDIR%%/macros/centfrq.sci
 %%TOOLBOXDIR%%/macros/cleanmacros.sce
 %%TOOLBOXDIR%%/macros/cwtplot.bin
 %%TOOLBOXDIR%%/macros/cwtplot.sci
 %%TOOLBOXDIR%%/macros/ddencmp.bin
 %%TOOLBOXDIR%%/macros/ddencmp.sci
 %%TOOLBOXDIR%%/macros/dwtplot.bin
 %%TOOLBOXDIR%%/macros/dwtplot.sci
 %%TOOLBOXDIR%%/macros/get_swt_path.bin
 %%TOOLBOXDIR%%/macros/get_swt_path.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/DOGauss.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/FSfarras.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/appcoef.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/appcoef2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/biorfilt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/biorwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/cauwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/cgauwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/cmorwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/coifwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/cplxdual2D.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/cwt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dbwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/detcoef.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/detcoef2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dualfilt1.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dualtree.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dualtree2D.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dwt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dwt2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dwt3.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dwtmode.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dyaddown.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/dyadup.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/fbspwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/gauswavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/iconv.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/icplxdual2D.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/idualtree.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/idualtree2D.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/idwt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/idwt2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/idwt3.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/ind2rgb.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/iswt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/iswt2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/legdwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/mexihat.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/morlet.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/orthfilt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/poisson.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/qmf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/rbiorwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/shanwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/sinus.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/swt.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/swt2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/symwavf.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/upcoef.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/upcoef2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/upwlev.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/upwlev2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wavedec.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wavedec2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wavefun.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wavefun2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/waveletfamilies.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/waverec.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/waverec2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wcodemat.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wenergy.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wenergy2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wextend.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wfilters.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wkeep.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wmaxlev.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wnorm.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wrcoef.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wrcoef2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wrev.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wrev2.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wrev3.sci
 %%TOOLBOXDIR%%/macros/help_from_sci/wrot3.sci
 %%TOOLBOXDIR%%/macros/indwt.bin
 %%TOOLBOXDIR%%/macros/indwt.sci
 %%TOOLBOXDIR%%/macros/indwt2.bin
 %%TOOLBOXDIR%%/macros/indwt2.sci
 %%TOOLBOXDIR%%/macros/lib
 %%TOOLBOXDIR%%/macros/meyer.bin
 %%TOOLBOXDIR%%/macros/meyer.sci
 %%TOOLBOXDIR%%/macros/names
 %%TOOLBOXDIR%%/macros/ndwt.bin
 %%TOOLBOXDIR%%/macros/ndwt.sci
 %%TOOLBOXDIR%%/macros/ndwt2.bin
 %%TOOLBOXDIR%%/macros/ndwt2.sci
 %%TOOLBOXDIR%%/macros/scal2frq.bin
 %%TOOLBOXDIR%%/macros/scal2frq.sci
 %%TOOLBOXDIR%%/macros/thselect.bin
 %%TOOLBOXDIR%%/macros/thselect.sci
 %%TOOLBOXDIR%%/macros/wavedecplot.bin
 %%TOOLBOXDIR%%/macros/wavedecplot.sci
 %%TOOLBOXDIR%%/macros/wbmpen.bin
 %%TOOLBOXDIR%%/macros/wbmpen.sci
 %%TOOLBOXDIR%%/macros/wden.bin
 %%TOOLBOXDIR%%/macros/wden.sci
 %%TOOLBOXDIR%%/macros/wdencmp.bin
 %%TOOLBOXDIR%%/macros/wdencmp.sci
 %%TOOLBOXDIR%%/macros/wentropy.bin
 %%TOOLBOXDIR%%/macros/wentropy.sci
 %%TOOLBOXDIR%%/macros/wnoise.bin
 %%TOOLBOXDIR%%/macros/wnoise.sci
 %%TOOLBOXDIR%%/macros/wnoisest.bin
 %%TOOLBOXDIR%%/macros/wnoisest.sci
 %%TOOLBOXDIR%%/macros/wthresh.bin
 %%TOOLBOXDIR%%/macros/wthresh.sci
 %%TOOLBOXDIR%%/macros/wthrmngr.bin
 %%TOOLBOXDIR%%/macros/wthrmngr.sci
 %%TOOLBOXDIR%%/sci_gateway/c/libswt_c.so
 %%TOOLBOXDIR%%/sci_gateway/c/loader.sce
 %%TOOLBOXDIR%%/sci_gateway/loader_gateway.sce
+%%TOOLBOXDIR%%/src/c/libswtlib.so
+%%TOOLBOXDIR%%/src/c/loader.sce
+%%TOOLBOXDIR%%/src/gwsupport/libswt_gwsupport.so
+%%TOOLBOXDIR%%/src/gwsupport/loader.sce