Date: Thu, 4 Sep 2014 18:21:50 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367297 - in head/math/scilab-toolbox-sivp: . files Message-ID: <201409041821.s84ILogA071948@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Thu Sep 4 18:21:49 2014 New Revision: 367297 URL: http://svnweb.freebsd.org/changeset/ports/367297 QAT: https://qat.redports.org/buildarchive/r367297/ Log: math/scilab-toolbox-sivp: - Add patch from upstream to fix build with scilab-5.5 - Don't require X for documentation building - Convert echos to pkg-message Added: head/math/scilab-toolbox-sivp/files/patch-r287 (contents, props changed) head/math/scilab-toolbox-sivp/pkg-message (contents, props changed) Modified: head/math/scilab-toolbox-sivp/Makefile head/math/scilab-toolbox-sivp/pkg-descr Modified: head/math/scilab-toolbox-sivp/Makefile ============================================================================== --- head/math/scilab-toolbox-sivp/Makefile Thu Sep 4 18:21:20 2014 (r367296) +++ head/math/scilab-toolbox-sivp/Makefile Thu Sep 4 18:21:49 2014 (r367297) @@ -2,7 +2,7 @@ PORTNAME= sivp DISTVERSION= 1.0.0.r286 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math graphics multimedia MASTER_SITES= LOCAL/makc PKGNAMEPREFIX= scilab-toolbox- @@ -15,9 +15,14 @@ LIB_DEPENDS= libopencv_legacy.so:${PORTS RUN_DEPENDS= ${SCILAB_CMD}:${PORTSDIR}/math/scilab USES= dos2unix pkgconfig tar:xz -DOS2UNIX_FILES= etc/SIVP.start +DOS2UNIX_FILES= etc/SIVP.start \ + sci_gateway/cpp/builder_gateway_cpp.sce \ + sci_gateway/cpp/sivp_init.cpp + +SCILAB_CMD= ${LOCALBASE}/bin/scilab-adv-cli +SCILAB_ARGS= -noatomsautoload -nb -nouserstartup +MAKE_ENV= LC_ALL="C" SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 -SCILAB_CMD= ${LOCALBASE}/bin/scilab CONTRIBDIR?= share/scilab/contrib TOOLBOXDIR_REL?= ${CONTRIBDIR}/${PORTNAME} TOOLBOXDIR= ${PREFIX}/${TOOLBOXDIR_REL} @@ -25,26 +30,21 @@ PLIST_SUB= TOOLBOXDIR=${TOOLBOXDIR_REL} TOOLBOX_SUBDIRS= demos etc images macros OPTIONS_DEFINE= HELP -OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +OPTIONS_DEFAULT= HELP +OPTIONS_SUB= yes HELP_DESC= Build help files (requires scilab with gui support) .include <bsd.port.options.mk> .if !${PORT_OPTIONS:MHELP} -SCILAB_ARGS= -nogui -PLIST_SUB+= HELP="@comment " +SCILAB_ARGS+= -nwni EXTRA_PATCHES+= ${FILESDIR}/extrapatch-etc__SIVP.start .else -USES+= display:build -MAKE_ENV= LC_ALL="C" -PLIST_SUB+= HELP="" TOOLBOX_SUBDIRS+= jar .endif pre-everything:: - @${ECHO_CMD} - @${ECHO_CMD} "If you want video support, OpenCV should be compiled with ffmpeg!" - @${ECHO_CMD} + @${CAT} ${PKGMESSAGE} post-patch: .if !${PORT_OPTIONS:MHELP} Added: head/math/scilab-toolbox-sivp/files/patch-r287 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab-toolbox-sivp/files/patch-r287 Thu Sep 4 18:21:49 2014 (r367297) @@ -0,0 +1,31 @@ +Index: sci_gateway/cpp/builder_gateway_cpp.sce +=================================================================== +--- sci_gateway/cpp/builder_gateway_cpp.sce (revision 286) ++++ sci_gateway/cpp/builder_gateway_cpp.sce (revision 287) +@@ -120,7 +120,8 @@ + opencv_libs = []; + end + +- ++ inter_cflags = inter_cflags + ' -D__USE_DEPRECATED_STACK_FUNCTIONS__'; ++ + tbx_build_gateway('gw_sivp', .. + gw_cpp_table, .. + gw_cpp_files, .. +Index: sci_gateway/cpp/sivp_init.cpp +=================================================================== +--- sci_gateway/cpp/sivp_init.cpp (revision 286) ++++ sci_gateway/cpp/sivp_init.cpp (revision 287) +@@ -18,11 +18,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ***********************************************************************/ + /*--------------------------------------------------------------------------*/ +-#include "api_scilab.h" + #include "localization.h" + #include "Scierror.h" + #include "common.h" + #include "gw_sivp.h" ++#include "api_scilab.h" + /*--------------------------------------------------------------------------*/ + char sSIVP_PATH[MAX_FILENAME_LENGTH]; + /*--------------------------------------------------------------------------*/ Modified: head/math/scilab-toolbox-sivp/pkg-descr ============================================================================== --- head/math/scilab-toolbox-sivp/pkg-descr Thu Sep 4 18:21:20 2014 (r367296) +++ head/math/scilab-toolbox-sivp/pkg-descr Thu Sep 4 18:21:49 2014 (r367297) @@ -3,5 +3,5 @@ intends to do image processing and video meant to be a useful, efficient, and free image and video processing toolbox for Scilab. -WWW: http://sivp.sourceforge.net/ -WWW: http://atoms.scilab.org/toolboxes/SIVP +WWW: http://sivp.sourceforge.net/ +WWW: http://atoms.scilab.org/toolboxes/SIVP Added: head/math/scilab-toolbox-sivp/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab-toolbox-sivp/pkg-message Thu Sep 4 18:21:49 2014 (r367297) @@ -0,0 +1,5 @@ +========================================================================= + + For video support graphics/opencv must be compiled with ffmpeg option. + +=========================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409041821.s84ILogA071948>