4 files changed, 106 insertions, 41 deletions

diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index 1c3fdb6f559a..a18eb367ab1f 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -6,36 +6,32 @@
 #
 
 PORTNAME=	swt
-PORTVERSION=	0.1.0.r3
-PORTREVISION=	2
+DISTVERSION=	0.1.0rc4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scwt
 PKGNAMEPREFIX=	scilab-toolbox-
-DISTNAME=	${PORTNAME}-0.1.0rc3
+DISTNAME=	${PORTNAME}${DISTVERSION}
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	Scilab 1-D and 2-D Wavelet Toolbox
 
-BUILD_DEPENDS+=	scilab:${PORTSDIR}/math/scilab
+BUILD_DEPENDS=	${LOCALBASE}/bin/scilab:${PORTSDIR}/math/scilab
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-WANT_FORTRAN=	yes #dummy but future use
-BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
-FC=		gfortran42
-F77=		gfortran42
-CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib/scilab/contrib/swt/lib
+SCI=		${LOCALBASE}/lib/scilab
+TOOLBOXDIR?=	lib/scilab/contrib/swt
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix=${PREFIX}/lib/scilab/contrib/swt
-TOOLBOXDIR=	lib/scilab/contrib/swt
+CONFIGURE_ARGS+=--prefix=${PREFIX}/${TOOLBOXDIR}
+CONFIGURE_ENV+=	SCI="${SCI}"
+USE_LDCONFIG=	${PREFIX}/${TOOLBOXDIR}
+
 PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR}
 
-post-install@:
-	@${ECHO_MSG} "==========================================================="
-	@${ECHO_MSG} "NOTE: SWT should be recompiled whenever Scilab is upgraded."
-	@${ECHO_MSG} "==========================================================="
+post-install:
+	 @${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/math/scilab-toolbox-swt/distinfo b/math/scilab-toolbox-swt/distinfo
index abe3b9cf382d..d6ab81e881a1 100644
--- a/math/scilab-toolbox-swt/distinfo
+++ b/math/scilab-toolbox-swt/distinfo
@@ -1,3 +1,3 @@
-MD5 (swt-0.1.0rc3.tar.gz) = 13e4d0c8a8dbf4a3e95998e0e16d46d2
-SHA256 (swt-0.1.0rc3.tar.gz) = 84bd6675cdd5ba85dec1f2b0fbbe703a4e38d06ee4158cfc01d1cc3d7211ca0d
-SIZE (swt-0.1.0rc3.tar.gz) = 650022
+MD5 (swt0.1.0rc4.tar.gz) = f89f7e7adae739a08628a389f1ee2ef6
+SHA256 (swt0.1.0rc4.tar.gz) = c7ab7ef0f216cd2b093921517705636c0188bb0948702586028f3d60ee6f4ca5
+SIZE (swt0.1.0rc4.tar.gz) = 998748
diff --git a/math/scilab-toolbox-swt/pkg-message b/math/scilab-toolbox-swt/pkg-message
new file mode 100644
index 000000000000..ce41273491c5
--- /dev/null
+++ b/math/scilab-toolbox-swt/pkg-message
@@ -0,0 +1,5 @@
+
+===========================================================
+NOTE: SWT should be recompiled whenever Scilab is upgraded.
+===========================================================
+
diff --git a/math/scilab-toolbox-swt/pkg-plist b/math/scilab-toolbox-swt/pkg-plist
index 8d49eb8e79fa..1a6bff6c73be 100644
--- a/math/scilab-toolbox-swt/pkg-plist
+++ b/math/scilab-toolbox-swt/pkg-plist
@@ -1,54 +1,118 @@
 %%TOOLBOXDIR%%/builder.sce
-%%TOOLBOXDIR%%/data/image/woman.bmp
-%%TOOLBOXDIR%%/data/image/yang.jpg
-%%TOOLBOXDIR%%/data/signal/de.mat
-%%TOOLBOXDIR%%/data/signal/ultra.mat
-%%TOOLBOXDIR%%/lib/libswt-0.1.0-rc3.so
-%%TOOLBOXDIR%%/lib/libswt-0.1.0-rc3.so.0
+%%TOOLBOXDIR%%/demos/image.sce
+%%TOOLBOXDIR%%/demos/swt.dem
+%%TOOLBOXDIR%%/demos/swt1d.sce
+%%TOOLBOXDIR%%/demos/swt2d.sce
+%%TOOLBOXDIR%%/image/woman.bmp
+%%TOOLBOXDIR%%/lib/libswt-0.1.0-rc4.so
+%%TOOLBOXDIR%%/lib/libswt-0.1.0-rc4.so.0
 %%TOOLBOXDIR%%/lib/libswt.la
 %%TOOLBOXDIR%%/lib/libswt.so
 %%TOOLBOXDIR%%/loader.sce
+%%TOOLBOXDIR%%/loader_include.sce
 %%TOOLBOXDIR%%/man/appcoef.htm
+%%TOOLBOXDIR%%/man/appcoef.xml
 %%TOOLBOXDIR%%/man/appcoef2.htm
-%%TOOLBOXDIR%%/man/cat.htm
+%%TOOLBOXDIR%%/man/appcoef2.xml
+%%TOOLBOXDIR%%/man/biorfilt.htm
+%%TOOLBOXDIR%%/man/biorfilt.xml
+%%TOOLBOXDIR%%/man/biorwavf.htm
+%%TOOLBOXDIR%%/man/biorwavf.xml
+%%TOOLBOXDIR%%/man/coifwavf.htm
+%%TOOLBOXDIR%%/man/coifwavf.xml
 %%TOOLBOXDIR%%/man/conv.htm
+%%TOOLBOXDIR%%/man/conv.xml
+%%TOOLBOXDIR%%/man/dbwavf.htm
+%%TOOLBOXDIR%%/man/dbwavf.xml
 %%TOOLBOXDIR%%/man/detcoef.htm
+%%TOOLBOXDIR%%/man/detcoef.xml
 %%TOOLBOXDIR%%/man/detcoef2.htm
-%%TOOLBOXDIR%%/man/down2.htm
+%%TOOLBOXDIR%%/man/detcoef2.xml
 %%TOOLBOXDIR%%/man/dwt.htm
+%%TOOLBOXDIR%%/man/dwt.xml
 %%TOOLBOXDIR%%/man/dwt2.htm
+%%TOOLBOXDIR%%/man/dwt2.xml
+%%TOOLBOXDIR%%/man/dwtmode.htm
+%%TOOLBOXDIR%%/man/dwtmode.xml
+%%TOOLBOXDIR%%/man/dyaddown.htm
+%%TOOLBOXDIR%%/man/dyaddown.xml
+%%TOOLBOXDIR%%/man/dyadup.htm
+%%TOOLBOXDIR%%/man/dyadup.xml
 %%TOOLBOXDIR%%/man/idwt.htm
+%%TOOLBOXDIR%%/man/idwt.xml
 %%TOOLBOXDIR%%/man/idwt2.htm
+%%TOOLBOXDIR%%/man/idwt2.xml
 %%TOOLBOXDIR%%/man/orthfilt.htm
+%%TOOLBOXDIR%%/man/orthfilt.xml
 %%TOOLBOXDIR%%/man/qmf.htm
-%%TOOLBOXDIR%%/man/up2.htm
-%%TOOLBOXDIR%%/man/wave.htm
+%%TOOLBOXDIR%%/man/qmf.xml
+%%TOOLBOXDIR%%/man/symwavf.htm
+%%TOOLBOXDIR%%/man/symwavf.xml
+%%TOOLBOXDIR%%/man/upcoef.htm
+%%TOOLBOXDIR%%/man/upcoef.xml
+%%TOOLBOXDIR%%/man/upcoef2.htm
+%%TOOLBOXDIR%%/man/upcoef2.xml
+%%TOOLBOXDIR%%/man/upwlev.htm
+%%TOOLBOXDIR%%/man/upwlev.xml
+%%TOOLBOXDIR%%/man/upwlev2.htm
+%%TOOLBOXDIR%%/man/upwlev2.xml
 %%TOOLBOXDIR%%/man/wavedec.htm
+%%TOOLBOXDIR%%/man/wavedec.xml
 %%TOOLBOXDIR%%/man/wavedec2.htm
+%%TOOLBOXDIR%%/man/wavedec2.xml
 %%TOOLBOXDIR%%/man/waverec.htm
+%%TOOLBOXDIR%%/man/waverec.xml
 %%TOOLBOXDIR%%/man/waverec2.htm
+%%TOOLBOXDIR%%/man/waverec2.xml
+%%TOOLBOXDIR%%/man/wenergy.htm
+%%TOOLBOXDIR%%/man/wenergy.xml
+%%TOOLBOXDIR%%/man/wenergy2.htm
+%%TOOLBOXDIR%%/man/wenergy2.xml
 %%TOOLBOXDIR%%/man/wextend.htm
-%%TOOLBOXDIR%%/man/wextend2.htm
+%%TOOLBOXDIR%%/man/wextend.xml
+%%TOOLBOXDIR%%/man/wfilters.htm
+%%TOOLBOXDIR%%/man/wfilters.xml
 %%TOOLBOXDIR%%/man/whatis.htm
 %%TOOLBOXDIR%%/man/wkeep.htm
-%%TOOLBOXDIR%%/man/wkeep2.htm
+%%TOOLBOXDIR%%/man/wkeep.xml
 %%TOOLBOXDIR%%/man/wmaxlev.htm
+%%TOOLBOXDIR%%/man/wmaxlev.xml
 %%TOOLBOXDIR%%/man/wrcoef.htm
+%%TOOLBOXDIR%%/man/wrcoef.xml
 %%TOOLBOXDIR%%/man/wrcoef2.htm
+%%TOOLBOXDIR%%/man/wrcoef2.xml
 %%TOOLBOXDIR%%/man/wrev.htm
+%%TOOLBOXDIR%%/man/wrev.xml
 %%TOOLBOXDIR%%/src/Makefile.am
 %%TOOLBOXDIR%%/src/Makefile.in
-%%TOOLBOXDIR%%/src/builder.sce
-%%TOOLBOXDIR%%/src/filter_int.c
+%%TOOLBOXDIR%%/src/bior.c
+%%TOOLBOXDIR%%/src/coiflets.c
+%%TOOLBOXDIR%%/src/daubechies.c
+%%TOOLBOXDIR%%/src/dwt.h
+%%TOOLBOXDIR%%/src/dwt1d.c
+%%TOOLBOXDIR%%/src/dwt1d_int.c
+%%TOOLBOXDIR%%/src/dwt2d.c
+%%TOOLBOXDIR%%/src/dwt2d_int.c
+%%TOOLBOXDIR%%/src/dwt_int.c
+%%TOOLBOXDIR%%/src/dwt_validate.c
+%%TOOLBOXDIR%%/src/haar.c
 %%TOOLBOXDIR%%/src/libswt.c
-%%TOOLBOXDIR%%/src/loader.sce
-%%TOOLBOXDIR%%/src/swt.h
-%%TOOLBOXDIR%%/src/swt2d.c
-%%TOOLBOXDIR%%/src/swtdwt.c
+%%TOOLBOXDIR%%/src/swt_common.h
+%%TOOLBOXDIR%%/src/symlets.c
+%%TOOLBOXDIR%%/src/utility.c
+%%TOOLBOXDIR%%/src/utility_int.c
+%%TOOLBOXDIR%%/src/utility_validate.c
+%%TOOLBOXDIR%%/src/validate.c
+%%TOOLBOXDIR%%/test/Data.mat
+%%TOOLBOXDIR%%/test/dwt1d_test.sce
+%%TOOLBOXDIR%%/test/dwt2d_test.sce
+%%TOOLBOXDIR%%/test/dwt2d_test2.sce
+%%TOOLBOXDIR%%/test/filter_test.sce
+%%TOOLBOXDIR%%/test/utility_test.sce
+@dirrm %%TOOLBOXDIR%%/test
 @dirrm %%TOOLBOXDIR%%/src
 @dirrm %%TOOLBOXDIR%%/man
 @dirrm %%TOOLBOXDIR%%/lib
-@dirrm %%TOOLBOXDIR%%/data/signal
-@dirrm %%TOOLBOXDIR%%/data/image
-@dirrm %%TOOLBOXDIR%%/data
+@dirrm %%TOOLBOXDIR%%/image
+@dirrm %%TOOLBOXDIR%%/demos
 @dirrm %%TOOLBOXDIR%%