From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 02:40:06 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A26A1065670 for ; Tue, 17 May 2011 02:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6ACAC8FC15 for ; Tue, 17 May 2011 02:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4H2e6wv025700 for ; Tue, 17 May 2011 02:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4H2e6t6025699; Tue, 17 May 2011 02:40:06 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2011 02:40:06 GMT Resent-Message-Id: <201105170240.p4H2e6t6025699@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rob Farmer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F5BE1065672 for ; Tue, 17 May 2011 02:37:40 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 754168FC0A for ; Tue, 17 May 2011 02:37:40 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p4H2beKu086179 for ; Tue, 17 May 2011 02:37:40 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p4H2bejV086178; Tue, 17 May 2011 02:37:40 GMT (envelope-from nobody) Message-Id: <201105170237.p4H2bejV086178@red.freebsd.org> Date: Tue, 17 May 2011 02:37:40 GMT From: Rob Farmer To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157101: [maintainer] [patch] math/scilab Update to 5.3.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2011 02:40:06 -0000 >Number: 157101 >Category: ports >Synopsis: [maintainer] [patch] math/scilab Update to 5.3.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 17 02:40:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Rob Farmer >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD turquoise.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Sat May 14 21:07:52 PDT 2011 rfarmer@turquoise.predatorlabs.net:/usr/obj/usr/src/sys/TURQUOISE amd64 >Description: -Update to 5.3.2 (bug fixes) -Upstream now ships desktop files, use those -Update a couple configure options Changelog: http://www.scilab.org/content/download/2264/23453/file/changes5.3.1-5.3.2.pdf >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/math/scilab/Makefile,v retrieving revision 1.76 diff -u -r1.76 Makefile --- Makefile 25 Apr 2011 20:48:49 -0000 1.76 +++ Makefile 17 May 2011 02:15:49 -0000 @@ -6,8 +6,7 @@ # PORTNAME= scilab -PORTVERSION= 5.3.1 -PORTREVISION= 1 +PORTVERSION= 5.3.2 CATEGORIES= math cad parallel java MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/:scilab \ http://www.predatorlabs.net/dl/:jgraphx \ @@ -80,6 +79,7 @@ CONFIGURE_ARGS+= --without-gui \ --without-javasci \ --without-hdf5 \ + --without-xcos \ --disable-build-help .else DISTFILES+= ${JGRAPHX_JAR}:jgraphx @@ -131,12 +131,6 @@ CONFIGURE_ARGS+= --with-jdk=${JAVA_HOME} \ --with-docbook=${LOCALBASE}/share/xsl/docbook \ --enable-build-help - -DESKTOP_ENTRIES= "SciLab" \ - "${COMMENT}" \ - "${DATADIR}/icons/scilab.xpm" "scilab" \ - "Application;Education;Math;" false - .endif .if !defined(WITHOUT_HELP) @@ -177,7 +171,7 @@ .endif .if defined(WITHOUT_OCAML) -CONFIGURE_ARGS+= --without-ocaml +CONFIGURE_ARGS+= --without-modelica PLIST_SUB+= OCAML="@comment " .else BUILD_DEPENDS+= ocaml:${PORTSDIR}/lang/ocaml @@ -225,6 +219,9 @@ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab \ ${WRKSRC}/bin/scilab-adv-cli ${WRKSRC}/bin/scilab-cli + @${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop + @${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \ + ${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop .endif pre-install: Index: distinfo =================================================================== RCS file: /home/ncvs/ports/math/scilab/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo 6 Mar 2011 22:00:14 -0000 1.20 +++ distinfo 16 May 2011 07:46:26 -0000 @@ -1,4 +1,4 @@ -SHA256 (scilab-5.3.1-src.tar.gz) = 24819e0f580f3aa9afb4c81e0d853ca0b80b271ca1b5cd818a14cb54f669e1c7 -SIZE (scilab-5.3.1-src.tar.gz) = 57559829 +SHA256 (scilab-5.3.2-src.tar.gz) = 6b33aace70b0889a71a417a28530ff58b96042ea35cb033c37bb1ac7c9a4ec15 +SIZE (scilab-5.3.2-src.tar.gz) = 47356102 SHA256 (jgraphx-1_4_1_0.jar) = 8c4bd7e63a5149b67373857c2cc3d45015463a9075d7b6f078d7307f6d1038ec SIZE (jgraphx-1_4_1_0.jar) = 503319 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/math/scilab/pkg-plist,v retrieving revision 1.21 diff -u -r1.21 pkg-plist --- pkg-plist 19 Dec 2010 08:51:20 -0000 1.21 +++ pkg-plist 17 May 2011 00:23:19 -0000 @@ -8,6 +8,11 @@ bin/scilab-cli bin/scilab-cli-bin libdata/pkgconfig/scilab.pc +share/applications/scilab-adv-cli.desktop +share/applications/scilab-cli.desktop +share/applications/scilab.desktop +%%DATADIR%%/contrib/toolbox_skeleton/DESCRIPTION +%%DATADIR%%/contrib/toolbox_skeleton/DESCRIPTION-FUNCTIONS %%DATADIR%%/contrib/toolbox_skeleton/builder.sce %%DATADIR%%/contrib/toolbox_skeleton/changelog.txt %%DATADIR%%/contrib/toolbox_skeleton/demos/c_sum.dem.sce @@ -21,6 +26,7 @@ %%DATADIR%%/contrib/toolbox_skeleton/help/en_US/build_help.sce %%DATADIR%%/contrib/toolbox_skeleton/help/en_US/c_sub.xml %%DATADIR%%/contrib/toolbox_skeleton/help/en_US/c_sum.xml +%%DATADIR%%/contrib/toolbox_skeleton/help/en_US/c_multiplybypi.xml %%DATADIR%%/contrib/toolbox_skeleton/help/en_US/fortran_sum.xml %%DATADIR%%/contrib/toolbox_skeleton/help/en_US/scilab_sum.xml %%DATADIR%%/contrib/toolbox_skeleton/help/fr_FR/build_help.sce @@ -30,12 +36,14 @@ %%DATADIR%%/contrib/toolbox_skeleton/help/fr_FR/scilab_sum.xml %%DATADIR%%/contrib/toolbox_skeleton/license.txt %%DATADIR%%/contrib/toolbox_skeleton/macros/buildmacros.sce +%%DATADIR%%/contrib/toolbox_skeleton/macros/cleanmacros.sce %%DATADIR%%/contrib/toolbox_skeleton/macros/scilab_sum.sci %%DATADIR%%/contrib/toolbox_skeleton/readme.txt %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/builder_gateway.sce %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/c/sci_csub.c %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/c/sci_csum.c +%%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/c/sci_multiplybypi.c %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/fortran/sci_fsum.c %%DATADIR%%/contrib/toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce @@ -43,20 +51,53 @@ %%DATADIR%%/contrib/toolbox_skeleton/src/builder_src.sce %%DATADIR%%/contrib/toolbox_skeleton/src/c/builder_c.sce %%DATADIR%%/contrib/toolbox_skeleton/src/c/csub.c -%%DATADIR%%/contrib/toolbox_skeleton/src/c/csum.c %%DATADIR%%/contrib/toolbox_skeleton/src/c/csub.h +%%DATADIR%%/contrib/toolbox_skeleton/src/c/csum.c %%DATADIR%%/contrib/toolbox_skeleton/src/c/csum.h +%%DATADIR%%/contrib/toolbox_skeleton/src/c/multiplybypi.c +%%DATADIR%%/contrib/toolbox_skeleton/src/c/multiplybypi.h +%%DATADIR%%/contrib/toolbox_skeleton/src/cleaner_src.sce %%DATADIR%%/contrib/toolbox_skeleton/src/fortran/builder_fortran.sce %%DATADIR%%/contrib/toolbox_skeleton/src/fortran/fsum.f +%%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests/c_sum.dia.ref %%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests/c_sum.tst +%%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests/fortran_sum.dia.ref %%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests/fortran_sum.tst +%%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests/scilab_sum.dia.ref %%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests/scilab_sum.tst -%%DATADIR%%/contrib/toolbox_skeleton/toolbox_skeleton.iss %%DATADIR%%/contrib/toolbox_skeleton/toolbox_skeleton_redist.iss -%%DATADIR%%/contrib/loader.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/builder.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/changelog.txt +%%DATADIR%%/contrib/xcos_toolbox_skeleton/demos/xcos_toolbox_skeleton.dem.gateway.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/DESCRIPTION +%%DATADIR%%/contrib/xcos_toolbox_skeleton/DESCRIPTION-FUNCTIONS +%%DATADIR%%/contrib/xcos_toolbox_skeleton/etc/xcos_toolbox_skeleton.quit +%%DATADIR%%/contrib/xcos_toolbox_skeleton/etc/xcos_toolbox_skeleton.start +%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/builder_help.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/cleaner_help.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/en_US/build_help.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/en_US/TBX_SUM_c.xml +%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/en_US/tbx_sum.xml +%%DATADIR%%/contrib/xcos_toolbox_skeleton/help/fr_FR/build_help.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_c.gif +%%DATADIR%%/contrib/xcos_toolbox_skeleton/images/svg/TBX_SUM_c.svg +%%DATADIR%%/contrib/xcos_toolbox_skeleton/license.txt +%%DATADIR%%/contrib/xcos_toolbox_skeleton/macros/buildmacros.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/macros/cleanmacros.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/macros/TBX_SUM_c.sci +%%DATADIR%%/contrib/xcos_toolbox_skeleton/sci_gateway/builder_gateway.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/sci_gateway/c/sci_tbx_sum.c +%%DATADIR%%/contrib/xcos_toolbox_skeleton/sci_gateway/loader_gateway.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/src/builder_src.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/src/c/block_sum.c +%%DATADIR%%/contrib/xcos_toolbox_skeleton/src/c/builder_c.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/src/c/business.h +%%DATADIR%%/contrib/xcos_toolbox_skeleton/src/c/business_sum.c +%%DATADIR%%/contrib/xcos_toolbox_skeleton/src/cleaner_src.sce +%%DATADIR%%/contrib/xcos_toolbox_skeleton/tests/unit_tests/tbx_sum.tst %%NLS%%share/locale/ca_ES/LC_MESSAGES/scilab.mo %%NLS%%share/locale/de_DE/LC_MESSAGES/scilab.mo -%%NLS%%share/locale/en_US/LC_MESSAGES/scilab.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/scilab.mo %%NLS%%share/locale/fr_FR/LC_MESSAGES/scilab.mo %%NLS%%share/locale/it_IT/LC_MESSAGES/scilab.mo @@ -67,6 +108,23 @@ %%NLS%%share/locale/uk_UA/LC_MESSAGES/scilab.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/scilab.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/scilab.mo +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/tests/unit_tests +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/tests +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/src/c +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/src +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/sci_gateway/c +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/sci_gateway +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/macros +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/images/svg +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/images/h5 +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/images/gif +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/images +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/help/fr_FR +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/help/en_US +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/help +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/etc +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton/demos +@dirrm %%DATADIR%%/contrib/xcos_toolbox_skeleton @dirrm %%DATADIR%%/contrib/toolbox_skeleton/tests/unit_tests @dirrm %%DATADIR%%/contrib/toolbox_skeleton/tests @dirrm %%DATADIR%%/contrib/toolbox_skeleton/src/fortran @@ -87,7 +145,6 @@ @dirrmtry %%DATADIR%%/.atoms %%NLS%%@dirrmtry share/locale/ca_ES/LC_MESSAGES %%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES %%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES @@ -98,7 +155,6 @@ %%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ca_ES %%NLS%%@dirrmtry share/locale/de_DE -%%NLS%%@dirrmtry share/locale/en_US %%NLS%%@dirrmtry share/locale/it_IT %%NLS%%@dirrmtry share/locale/ja_JP %%NLS%%@dirrmtry share/locale/pl_PL Index: files/patch-build.incl.xml =================================================================== RCS file: /home/ncvs/ports/math/scilab/files/patch-build.incl.xml,v retrieving revision 1.2 diff -u -r1.2 patch-build.incl.xml --- files/patch-build.incl.xml 19 Dec 2010 08:51:20 -0000 1.2 +++ files/patch-build.incl.xml 16 May 2011 08:29:40 -0000 @@ -1,11 +1,10 @@ ---- build.incl.xml.orig 2010-11-24 00:50:29.000000000 -0800 -+++ build.incl.xml 2010-12-15 02:55:11.000000000 -0800 -@@ -116,6 +116,8 @@ - +--- build.incl.xml.orig 2011-05-16 01:28:42.000000000 -0700 ++++ build.incl.xml 2011-05-16 01:29:23.000000000 -0700 +@@ -85,6 +85,7 @@ + + - + -+ - + Index: files/patch-desktop-scilab-adv-cli.desktop =================================================================== RCS file: files/patch-desktop-scilab-adv-cli.desktop diff -N files/patch-desktop-scilab-adv-cli.desktop --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-desktop-scilab-adv-cli.desktop 17 May 2011 01:15:03 -0000 @@ -0,0 +1,11 @@ +--- desktop/scilab-adv-cli.desktop.orig 2011-05-16 18:13:57.000000000 -0700 ++++ desktop/scilab-adv-cli.desktop 2011-05-16 18:14:10.000000000 -0700 +@@ -2,7 +2,7 @@ + Comment=Scientific software package for numerical computations + Comment[fr]=Logiciel scientifique de calcul numérique + Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen +-Exec=scilab-cli ++Exec=scilab-adv-cli + GenericName=Scientific Software Package + GenericName[fr]=Logiciel de calcul numérique + GenericName[de]=Wissenschaftssoftware Index: files/patch-modules-core-includes-version.h.in =================================================================== RCS file: files/patch-modules-core-includes-version.h.in diff -N files/patch-modules-core-includes-version.h.in --- files/patch-modules-core-includes-version.h.in 25 Apr 2011 20:48:49 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- modules/core/includes/version.h.in.orig 2011-03-03 07:30:19.000000000 -0800 -+++ modules/core/includes/version.h.in 2011-04-23 14:29:15.000000000 -0700 -@@ -15,7 +15,7 @@ - #define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@ - #define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@ - #define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@ --#define SCI_VERSION_STRING "scilab-branch-5.3" -+#define SCI_VERSION_STRING "scilab-5.3.1" - /* SCI_VERSION_REVISION --> hash key commit */ - #define SCI_VERSION_REVISION 0 - #define SCI_VERSION_TIMESTAMP 0 >Release-Note: >Audit-Trail: >Unformatted: