Date: Sun, 27 May 2012 15:54:35 -0700 (PDT) From: Don Lewis <truckman@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rfarmer@predatorlabs.net Subject: ports/168398: [patch] allow math/scilab to be built without textproc/saxon Message-ID: <201205272254.q4RMsZWI058023@mousie.catspoiler.org> Resent-Message-ID: <201205272300.q4RN07ow052535@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168398 >Category: ports >Synopsis: [patch] allow math/scilab to be built without textproc/saxon >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 27 23:00:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Don Lewis >Release: FreeBSD 8.3-STABLE i386 >Organization: FreeBSD Project >Environment: System: FreeBSD scratch.catspoiler.org 8.3-STABLE FreeBSD 8.3-STABLE #47: Sat May 26 02:46:21 PDT 2012 root@scratch.catspoiler.org:/usr/obj/usr/src/sys/GENERICDDB i386 >Description: The math/scilab port depends on the saxon.jar file from saxon-6.5.5 (textproc/saxon) in order to build its documentation. The scilab port is the only remaining port in the tree that depends on this old version of saxon. In particular, apache-openoffice-3.4.0_2 has been converted to depend on saxon-devel-9.1.0.7,1 (textproc/saxon-devel), which conflicts with saxon-6.5.5. That means that it is no longer possible to install both math/scilab and editors/openoffice-3 on the same host. >How-To-Repeat: >Fix: The following patch removes the scilab dependency of on the textproc/saxon port by unpacking the saxon.jar file from the saxon-6.5.5 distfile into the saxon thirdparty build directory. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/math/scilab/Makefile,v retrieving revision 1.88 diff -u -r1.88 Makefile --- Makefile 21 Mar 2012 00:34:23 -0000 1.88 +++ Makefile 27 May 2012 22:29:43 -0000 @@ -11,13 +11,18 @@ CATEGORIES= math cad parallel java MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/:scilab \ http://www.predatorlabs.net/dl/:jgraphx \ - http://www.bayofrum.net/dist/jgraphx/:jgraphx + http://www.bayofrum.net/dist/jgraphx/:jgraphx \ + SF/saxon/saxon6/${SAXON_VERSION}:saxon DISTFILES= ${DISTNAME}-src.tar.gz:scilab EXTRACT_ONLY= ${DISTNAME}-src.tar.gz MAINTAINER= rfarmer@predatorlabs.net COMMENT= Scientific software package for numerical computations +SAXON_VERSION= 6.5.5 +SAXON_DISTFILE= saxon${SAXON_VERSION:S/./-/g}.zip +DISTFILES+= ${SAXON_DISTFILE}:saxon + # A partial dependencies list can be found at: # http://wiki.scilab.org/Dependencies_of_Scilab_5.X LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ @@ -119,8 +124,7 @@ # Can't use USE_ANT because it overrides do-build target BUILD_DEPENDS+= ${GUI_DEPENDS} \ ant:${PORTSDIR}/devel/apache-ant \ - swig:${PORTSDIR}/devel/swig13 \ - ${LOCALBASE}/share/examples/saxon/data/books.dtd:${PORTSDIR}/textproc/saxon + swig:${PORTSDIR}/devel/swig13 RUN_DEPENDS+= ${GUI_DEPENDS} @@ -213,6 +217,8 @@ @# Run fixes @${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/etc/librarypath.xml + @${MKDIR} ${WRKSRC}/thirdparty + @${UNZIP_CMD} ${DISTDIR}/${SAXON_DISTFILE} saxon.jar -d ${WRKSRC}/thirdparty .if !defined(WITHOUT_GUI) @# Configure fixes @${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure @@ -222,7 +228,6 @@ @${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|jrosetta-API.jar|jrosetta-api.jar|' \ ${WRKSRC}/configure - @${MKDIR} ${WRKSRC}/thirdparty @${CP} ${DISTDIR}/${JGRAPHX_JAR} ${WRKSRC}/thirdparty/jgraphx.jar @# Run fixes @${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml Index: distinfo =================================================================== RCS file: /home/ncvs/ports/math/scilab/distinfo,v retrieving revision 1.22 diff -u -r1.22 distinfo --- distinfo 28 Jul 2011 18:07:09 -0000 1.22 +++ distinfo 27 May 2012 22:11:02 -0000 @@ -2,3 +2,5 @@ SIZE (scilab-5.3.3-src.tar.gz) = 47253497 SHA256 (jgraphx-1_4_1_0.jar) = 8c4bd7e63a5149b67373857c2cc3d45015463a9075d7b6f078d7307f6d1038ec SIZE (jgraphx-1_4_1_0.jar) = 503319 +SHA256 (saxon6-5-5.zip) = a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4 +SIZE (saxon6-5-5.zip) = 3346162 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205272254.q4RMsZWI058023>