- Update to 0.5.2 for scilab-5.x

- Mark IGNORE: touches ${LOCALBASE}/share/scilab when building under superuser

6 files changed, 113 insertions, 89 deletions

diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index d7906877f03a..95d20bb87977 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -6,37 +6,46 @@
 #
 
 PORTNAME=	sivp
-DISTVERSION=	0.4.3
-PORTREVISION=	5
+DISTVERSION=	0.5.2
 CATEGORIES=	math graphics multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}
 PKGNAMEPREFIX=	scilab-toolbox-
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Scilab Image and Video Processing Toolbox
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/scilab:${PORTSDIR}/math/scilab \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
 LIB_DEPENDS=	cv.2:${PORTSDIR}/graphics/opencv
-RUN_DEPENDS=	${LOCALBASE}/bin/scilab:${PORTSDIR}/math/scilab
+RUN_DEPENDS=	${SCILAB_CMD}:${PORTSDIR}/math/scilab
 
-BROKEN=		does not build
+IGNORE=		touches ${LOCALBASE}/share/scilab when building under superuser
 
-SCILABDIR?=	lib/scilab
-CONTRIBDIR?=	${SCILABDIR}/contrib
-TOOLBOXDIR?=	${CONTRIBDIR}/${PORTNAME}
+USE_ZIP=	yes
 
-USE_LDCONFIG=	${TOOLBOXDIR}
-USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix=${PREFIX}/${TOOLBOXDIR}
-CONFIGURE_ENV+=	SCI="${LOCALBASE}/${SCILABDIR}"
-
-PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR}
+SCILAB_CMD=	${LOCALBASE}/bin/scilab
+CONTRIBDIR?=	share/scilab/contrib
+TOOLBOXDIR_REL?=	${CONTRIBDIR}/${PORTNAME}
+TOOLBOXDIR=	${PREFIX}/${TOOLBOXDIR_REL}
+PLIST_SUB=	TOOLBOXDIR=${TOOLBOXDIR_REL}
 
 pre-everything::
 	@${ECHO_CMD}
 	@${ECHO_CMD} "If you want video support, OpenCV should be compiled with ffmpeg!"
 	@${ECHO_CMD}
 
+do-build:
+	cd ${WRKSRC} && ${SCILAB_CMD} -nogui -f builder.sce
+
+do-install:
+	${MKDIR} ${TOOLBOXDIR}/sci_gateway/c
+	${INSTALL_DATA} ${WRKSRC}/loader.sce ${TOOLBOXDIR}
+	${INSTALL_DATA} ${WRKSRC}/sci_gateway/loader_gateway.sce \
+		${TOOLBOXDIR}/sci_gateway
+	cd ${WRKSRC}/sci_gateway/c && \
+	${INSTALL_DATA} loader.sce ${TOOLBOXDIR}/sci_gateway/c && \
+	${INSTALL_PROGRAM} libsivp.so ${TOOLBOXDIR}/sci_gateway/c
+.for d in demos etc images jar macros
+	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${TOOLBOXDIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/math/scilab-toolbox-sivp/distinfo b/math/scilab-toolbox-sivp/distinfo
index 47c83d522310..bfd2f0e762e3 100644
--- a/math/scilab-toolbox-sivp/distinfo
+++ b/math/scilab-toolbox-sivp/distinfo
@@ -1,3 +1,3 @@
-MD5 (sivp-0.4.3.tar.gz) = d49d4d6503a1026867145428c6374183
-SHA256 (sivp-0.4.3.tar.gz) = 2d0e4129daf2ccd2631040a602247fe5083e973a9569cb869b024ee4cbef578a
-SIZE (sivp-0.4.3.tar.gz) = 2551217
+MD5 (sivp-0.5.2.zip) = bfcd9c4d5c45f8759018e97dacecc046
+SHA256 (sivp-0.5.2.zip) = cf3106d42861d54e434806840170f370cfbc3e023602d095c20032c3de8957a4
+SIZE (sivp-0.5.2.zip) = 5769590
diff --git a/math/scilab-toolbox-sivp/files/patch-builder.sce b/math/scilab-toolbox-sivp/files/patch-builder.sce
new file mode 100644
index 000000000000..7685e3fba925
--- /dev/null
+++ b/math/scilab-toolbox-sivp/files/patch-builder.sce
@@ -0,0 +1,16 @@
+--- ./builder.sce.orig	2010-01-31 15:21:14.000000000 +0300
++++ ./builder.sce	2010-07-10 19:24:17.021776380 +0400
+@@ -33,7 +33,6 @@
+ tbx_builder_macros(toolbox_dir);

+ //tbx_builder_src(toolbox_dir);

+ tbx_builder_gateway(toolbox_dir);

+-tbx_builder_help(toolbox_dir);

+ tbx_build_loader(TOOLBOX_NAME, toolbox_dir);

+ tbx_build_cleaner(TOOLBOX_NAME, toolbox_dir);

+ 

+@@ -41,3 +40,5 @@
+ // =============================================================================

+ 

+ clear toolbox_dir TOOLBOX_NAME TOOLBOX_TITLE;

++

++quit

diff --git a/math/scilab-toolbox-sivp/files/patch-configure b/math/scilab-toolbox-sivp/files/patch-configure
deleted file mode 100644
index ee696c7800f3..000000000000
--- a/math/scilab-toolbox-sivp/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2007-05-19 13:29:59.000000000 +0400
-+++ ./configure	2007-09-15 17:49:25.000000000 +0400
-@@ -19741,8 +19741,6 @@
- 
- if test "x$prefix"  = xNONE; then
-    prefix="${SCIDIR}/contrib/${PACKAGE_NAME}-${PACKAGE_VERSION}"
--else
--   prefix="${prefix}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
- fi
- 
- TOOLBOXDIR=$prefix
diff --git a/math/scilab-toolbox-sivp/pkg-descr b/math/scilab-toolbox-sivp/pkg-descr
index 1a4b365d81e6..7c45a28be97b 100644
--- a/math/scilab-toolbox-sivp/pkg-descr
+++ b/math/scilab-toolbox-sivp/pkg-descr
@@ -3,4 +3,5 @@ intends to do image processing and video processing tasks. SIVP is
 meant to be a useful, efficient, and free image and video processing
 toolbox for Scilab.
 
-WWW:    http://sivp.sourceforge.net/
+WWW:	http://sivp.sourceforge.net/
+WWW:	http://atoms.scilab.org/toolboxes/SIVP
diff --git a/math/scilab-toolbox-sivp/pkg-plist b/math/scilab-toolbox-sivp/pkg-plist
index 8914a257c98b..7fd0622fc876 100644
--- a/math/scilab-toolbox-sivp/pkg-plist
+++ b/math/scilab-toolbox-sivp/pkg-plist
@@ -1,108 +1,117 @@
-%%TOOLBOXDIR%%/builder.sce
+%%TOOLBOXDIR%%/demos/bgfg.sce
 %%TOOLBOXDIR%%/demos/camera.sce
+%%TOOLBOXDIR%%/demos/camshift.sce
 %%TOOLBOXDIR%%/demos/canny.sce
+%%TOOLBOXDIR%%/demos/eye.sce
+%%TOOLBOXDIR%%/demos/face.sce
 %%TOOLBOXDIR%%/demos/image.sce
 %%TOOLBOXDIR%%/demos/noise.sce
-%%TOOLBOXDIR%%/demos/sivp.dem
+%%TOOLBOXDIR%%/demos/sivp.dem.gateway.sce
 %%TOOLBOXDIR%%/demos/video.sce
+%%TOOLBOXDIR%%/etc/SIVP.start
+%%TOOLBOXDIR%%/etc/haarcascade_frontalface_alt2.xml
+%%TOOLBOXDIR%%/etc/lefteye.xml
+%%TOOLBOXDIR%%/etc/righteye.xml
 %%TOOLBOXDIR%%/images/baboon.png
 %%TOOLBOXDIR%%/images/lena.png
+%%TOOLBOXDIR%%/images/people.jpg
 %%TOOLBOXDIR%%/images/peppers.png
+%%TOOLBOXDIR%%/images/red-car-video.avi
 %%TOOLBOXDIR%%/images/video.avi
-%%TOOLBOXDIR%%/lib/libsivp-0.4.3.so
-%%TOOLBOXDIR%%/lib/libsivp-0.4.3.so.0
-%%TOOLBOXDIR%%/lib/libsivp.la
-%%TOOLBOXDIR%%/lib/libsivp.so
+%%TOOLBOXDIR%%/jar/scilab_en_US_help.jar
 %%TOOLBOXDIR%%/loader.sce
+%%TOOLBOXDIR%%/macros/buildmacros.sce
 %%TOOLBOXDIR%%/macros/corr2.bin
+%%TOOLBOXDIR%%/macros/corr2.sci
+%%TOOLBOXDIR%%/macros/detectfaces.bin
+%%TOOLBOXDIR%%/macros/detectfaces.sci
+%%TOOLBOXDIR%%/macros/detectlefteyes.bin
+%%TOOLBOXDIR%%/macros/detectlefteyes.sci
+%%TOOLBOXDIR%%/macros/detectrighteyes.bin
+%%TOOLBOXDIR%%/macros/detectrighteyes.sci
 %%TOOLBOXDIR%%/macros/edge.bin
+%%TOOLBOXDIR%%/macros/edge.sci
 %%TOOLBOXDIR%%/macros/fspecial.bin
-%%TOOLBOXDIR%%/macros/genlib
+%%TOOLBOXDIR%%/macros/fspecial.sci
 %%TOOLBOXDIR%%/macros/hsv2rgb.bin
+%%TOOLBOXDIR%%/macros/hsv2rgb.sci
 %%TOOLBOXDIR%%/macros/im2bw.bin
+%%TOOLBOXDIR%%/macros/im2bw.sci
 %%TOOLBOXDIR%%/macros/im2double.bin
+%%TOOLBOXDIR%%/macros/im2double.sci
 %%TOOLBOXDIR%%/macros/im2int16.bin
+%%TOOLBOXDIR%%/macros/im2int16.sci
 %%TOOLBOXDIR%%/macros/im2int32.bin
+%%TOOLBOXDIR%%/macros/im2int32.sci
 %%TOOLBOXDIR%%/macros/im2int8.bin
+%%TOOLBOXDIR%%/macros/im2int8.sci
 %%TOOLBOXDIR%%/macros/im2uint16.bin
+%%TOOLBOXDIR%%/macros/im2uint16.sci
 %%TOOLBOXDIR%%/macros/im2uint8.bin
+%%TOOLBOXDIR%%/macros/im2uint8.sci
 %%TOOLBOXDIR%%/macros/imabsdiff.bin
+%%TOOLBOXDIR%%/macros/imabsdiff.sci
 %%TOOLBOXDIR%%/macros/imadd.bin
+%%TOOLBOXDIR%%/macros/imadd.sci
 %%TOOLBOXDIR%%/macros/imcomplement.bin
+%%TOOLBOXDIR%%/macros/imcomplement.sci
 %%TOOLBOXDIR%%/macros/imcrop.bin
+%%TOOLBOXDIR%%/macros/imcrop.sci
 %%TOOLBOXDIR%%/macros/imdivide.bin
+%%TOOLBOXDIR%%/macros/imdivide.sci
 %%TOOLBOXDIR%%/macros/imhist.bin
+%%TOOLBOXDIR%%/macros/imhist.sci
 %%TOOLBOXDIR%%/macros/imlincomb.bin
+%%TOOLBOXDIR%%/macros/imlincomb.sci
 %%TOOLBOXDIR%%/macros/immultiply.bin
+%%TOOLBOXDIR%%/macros/immultiply.sci
 %%TOOLBOXDIR%%/macros/imnoise.bin
+%%TOOLBOXDIR%%/macros/imnoise.sci
 %%TOOLBOXDIR%%/macros/imresize.bin
+%%TOOLBOXDIR%%/macros/imresize.sci
 %%TOOLBOXDIR%%/macros/imshow.bin
+%%TOOLBOXDIR%%/macros/imshow.sci
 %%TOOLBOXDIR%%/macros/imshow.tcl
 %%TOOLBOXDIR%%/macros/imsubtract.bin
+%%TOOLBOXDIR%%/macros/imsubtract.sci
 %%TOOLBOXDIR%%/macros/imwrite.bin
+%%TOOLBOXDIR%%/macros/imwrite.sci
+%%TOOLBOXDIR%%/macros/isbw.bin
+%%TOOLBOXDIR%%/macros/isbw.sci
 %%TOOLBOXDIR%%/macros/lib
 %%TOOLBOXDIR%%/macros/mat2gray.bin
+%%TOOLBOXDIR%%/macros/mat2gray.sci
 %%TOOLBOXDIR%%/macros/mean2.bin
+%%TOOLBOXDIR%%/macros/mean2.sci
 %%TOOLBOXDIR%%/macros/names
 %%TOOLBOXDIR%%/macros/ntsc2rgb.bin
+%%TOOLBOXDIR%%/macros/ntsc2rgb.sci
+%%TOOLBOXDIR%%/macros/rectangle.bin
+%%TOOLBOXDIR%%/macros/rectangle.sci
 %%TOOLBOXDIR%%/macros/rgb2gray.bin
+%%TOOLBOXDIR%%/macros/rgb2gray.sci
 %%TOOLBOXDIR%%/macros/rgb2hsv.bin
+%%TOOLBOXDIR%%/macros/rgb2hsv.sci
 %%TOOLBOXDIR%%/macros/rgb2ntsc.bin
+%%TOOLBOXDIR%%/macros/rgb2ntsc.sci
 %%TOOLBOXDIR%%/macros/rgb2ycbcr.bin
+%%TOOLBOXDIR%%/macros/rgb2ycbcr.sci
 %%TOOLBOXDIR%%/macros/std2.bin
+%%TOOLBOXDIR%%/macros/std2.sci
+%%TOOLBOXDIR%%/macros/stdev2.bin
+%%TOOLBOXDIR%%/macros/stdev2.sci
 %%TOOLBOXDIR%%/macros/xs2im.bin
+%%TOOLBOXDIR%%/macros/xs2im.sci
 %%TOOLBOXDIR%%/macros/ycbcr2rgb.bin
-%%TOOLBOXDIR%%/man/addframe.htm
-%%TOOLBOXDIR%%/man/aviclose.htm
-%%TOOLBOXDIR%%/man/avicloseall.htm
-%%TOOLBOXDIR%%/man/avifile.htm
-%%TOOLBOXDIR%%/man/aviinfo.htm
-%%TOOLBOXDIR%%/man/avilistopened.htm
-%%TOOLBOXDIR%%/man/aviopen.htm
-%%TOOLBOXDIR%%/man/avireadframe.htm
-%%TOOLBOXDIR%%/man/camopen.htm
-%%TOOLBOXDIR%%/man/corr2.htm
-%%TOOLBOXDIR%%/man/edge.htm
-%%TOOLBOXDIR%%/man/filter2.htm
-%%TOOLBOXDIR%%/man/fspecial.htm
-%%TOOLBOXDIR%%/man/hsv2rgb.htm
-%%TOOLBOXDIR%%/man/im2bw.htm
-%%TOOLBOXDIR%%/man/im2double.htm
-%%TOOLBOXDIR%%/man/im2int16.htm
-%%TOOLBOXDIR%%/man/im2int32.htm
-%%TOOLBOXDIR%%/man/im2int8.htm
-%%TOOLBOXDIR%%/man/im2uint16.htm
-%%TOOLBOXDIR%%/man/im2uint8.htm
-%%TOOLBOXDIR%%/man/imabsdiff.htm
-%%TOOLBOXDIR%%/man/imadd.htm
-%%TOOLBOXDIR%%/man/imcomplement.htm
-%%TOOLBOXDIR%%/man/imcrop.htm
-%%TOOLBOXDIR%%/man/imdivide.htm
-%%TOOLBOXDIR%%/man/imfilter.htm
-%%TOOLBOXDIR%%/man/imfinfo.htm
-%%TOOLBOXDIR%%/man/imhist.htm
-%%TOOLBOXDIR%%/man/imlincomb.htm
-%%TOOLBOXDIR%%/man/immultiply.htm
-%%TOOLBOXDIR%%/man/imnoise.htm
-%%TOOLBOXDIR%%/man/imread.htm
-%%TOOLBOXDIR%%/man/imresize.htm
-%%TOOLBOXDIR%%/man/imshow.htm
-%%TOOLBOXDIR%%/man/imsubtract.htm
-%%TOOLBOXDIR%%/man/imwrite.htm
-%%TOOLBOXDIR%%/man/mat2gray.htm
-%%TOOLBOXDIR%%/man/mean2.htm
-%%TOOLBOXDIR%%/man/ntsc2rgb.htm
-%%TOOLBOXDIR%%/man/rgb2gray.htm
-%%TOOLBOXDIR%%/man/rgb2hsv.htm
-%%TOOLBOXDIR%%/man/rgb2ntsc.htm
-%%TOOLBOXDIR%%/man/rgb2ycbcr.htm
-%%TOOLBOXDIR%%/man/std2.htm
-%%TOOLBOXDIR%%/man/whatis.htm
-%%TOOLBOXDIR%%/man/xs2im.htm
-%%TOOLBOXDIR%%/man/ycbcr2rgb.htm
-@dirrm %%TOOLBOXDIR%%/man
+%%TOOLBOXDIR%%/macros/ycbcr2rgb.sci
+%%TOOLBOXDIR%%/sci_gateway/c/libsivp.so
+%%TOOLBOXDIR%%/sci_gateway/c/loader.sce
+%%TOOLBOXDIR%%/sci_gateway/loader_gateway.sce
+@dirrm %%TOOLBOXDIR%%/sci_gateway/c
+@dirrm %%TOOLBOXDIR%%/sci_gateway
 @dirrm %%TOOLBOXDIR%%/macros
-@dirrm %%TOOLBOXDIR%%/lib
+@dirrm %%TOOLBOXDIR%%/jar
 @dirrm %%TOOLBOXDIR%%/images
+@dirrm %%TOOLBOXDIR%%/etc
 @dirrm %%TOOLBOXDIR%%/demos
 @dirrm %%TOOLBOXDIR%%