Index: head/math/yacas/files/patch-src_yacasmain.cpp =================================================================== --- head/math/yacas/files/patch-src_yacasmain.cpp (revision 410098) +++ head/math/yacas/files/patch-src_yacasmain.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/yacasmain.cpp.orig 2014-11-25 15:18:46 UTC -+++ src/yacasmain.cpp -@@ -1083,7 +1083,9 @@ int main(int argc, char** argv) - unsigned char first_stack_var = 0; - the_first_stack_var = &first_stack_var; - --#if defined (__APPLE__) -+#if defined (__FreeBSD__) || defined (__DragonFly__) -+ root_dir = "%%DATADIR%%/scripts"; -+#elif defined (__APPLE__) - char buf[PATH_MAX]; - uint32_t size = sizeof (buf); - _NSGetExecutablePath(buf, &size); Property changes on: head/math/yacas/files/patch-src_yacasmain.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/yacas/files/patch-scripts_Makefile.am =================================================================== --- head/math/yacas/files/patch-scripts_Makefile.am (revision 410098) +++ head/math/yacas/files/patch-scripts_Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- scripts/Makefile.am.orig 2014-02-03 10:39:12.000000000 +0100 -+++ scripts/Makefile.am 2014-02-03 10:39:21.000000000 +0100 -@@ -164,7 +164,7 @@ - @(diff scripts-listed-in-makefile.txt contents-of-tree.txt; \ - rm -f scripts-listed-in-makefile.txt contents-of-tree.txt; \ - RV=$$?; \ -- if [[ $$RV == 0 ]] ; \ -+ if [ $$RV = 0 ] ; \ - then echo " ... ok"; \ - else \ - false; \ Property changes on: head/math/yacas/files/patch-scripts_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/yacas/files/patch-scripts_Makefile.in =================================================================== --- head/math/yacas/files/patch-scripts_Makefile.in (revision 410098) +++ head/math/yacas/files/patch-scripts_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- scripts/Makefile.in.orig 2014-02-03 10:37:08.000000000 +0100 -+++ scripts/Makefile.in 2014-02-03 10:38:36.000000000 +0100 -@@ -562,7 +562,7 @@ - @(diff scripts-listed-in-makefile.txt contents-of-tree.txt; \ - rm -f scripts-listed-in-makefile.txt contents-of-tree.txt; \ - RV=$$?; \ -- if [[ $$RV == 0 ]] ; \ -+ if [ $$RV = 0 ] ; \ - then echo " ... ok"; \ - else \ - false; \ Property changes on: head/math/yacas/files/patch-scripts_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/yacas/Makefile =================================================================== --- head/math/yacas/Makefile (revision 410098) +++ head/math/yacas/Makefile (revision 410099) @@ -1,50 +1,38 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= yacas -PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= math -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION:R}/ +DISTVERSIONPREFIX= v -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gahr@FreeBSD.org COMMENT= Yet Another Computer Algebra System LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lib libtool -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} -INSTALL_TARGET= install-strip +TEST_DEPENDS= bash:${PORTSDIR}/shells/bash + +USES= cmake:outsource compiler:c++11-lib USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= grzegorzmazur -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -DOCS_USES= perl5 -DOCS_USE= perl5=build -DOCS_CONFIGURE_ENABLE= html-doc - .include .if ${CHOSEN_COMPILER_TYPE} == "gcc" CPPFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: - @${REINPLACE_CMD} -e \ - 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/yacasmain.cpp # Can't use USES=shebangfix here, cause the path appears several # times in the file. @${REINPLACE_CMD} -e \ 's| /bin/bash| ${LOCALBASE}/bin/bash|g' \ ${WRKSRC}/tests/test-yacas -regression-test: build -# This requires bash. I don't add it as a dependency to the port, as -# it's not needed for the general use. - @(cd ${WRKSRC} && ${DO_MAKE_BUILD} check) +do-test: + cd ${BUILD_WRKSRC} && ${MAKE} test .include Index: head/math/yacas/distinfo =================================================================== --- head/math/yacas/distinfo (revision 410098) +++ head/math/yacas/distinfo (revision 410099) @@ -1,2 +1,2 @@ -SHA256 (yacas-1.3.6.tar.gz) = c59a0456439833dfce3e5660f848b45c5560621a70e0ce4f4ec69718d24b3638 -SIZE (yacas-1.3.6.tar.gz) = 1585826 +SHA256 (grzegorzmazur-yacas-v1.4.0_GH0.tar.gz) = 3c39c2cb98889a30b5a82413d233c0b0a25892d4740f1fb93b99e44ecbb4c08b +SIZE (grzegorzmazur-yacas-v1.4.0_GH0.tar.gz) = 2032216 Index: head/math/yacas/pkg-descr =================================================================== --- head/math/yacas/pkg-descr (revision 410098) +++ head/math/yacas/pkg-descr (revision 410099) @@ -1,10 +1,10 @@ Yacas (Yet Another Computer Algebra System) is a small and highly flexible general-purpose computer algebra language. The syntax uses a infix-operator grammar parser. The distribution contains a small library of mathematical functions, but its real strength is in the language in which you can easily write your own symbolic manipulation algorithms. The core engine supports arbitrary precision arithmetic (although it can optionally be linked with the library "libgmp3") and is able to execute symbolic manipulations on various mathematical objects by following user-defined rules. -WWW: http://yacas.sourceforge.net/ +WWW: http://www.yacas.org/ Index: head/math/yacas/pkg-plist =================================================================== --- head/math/yacas/pkg-plist (revision 410098) +++ head/math/yacas/pkg-plist (revision 410099) @@ -1,263 +1,268 @@ bin/yacas -bin/ytxt2tex include/yacas/GPL_stuff.h include/yacas/anumber.h include/yacas/anumber.inl include/yacas/arggetter.h include/yacas/arrayclass.h +include/yacas/associationclass.h include/yacas/choices.h include/yacas/commandline.h include/yacas/core_yacasmain.h include/yacas/corefunctions.h include/yacas/debugmem.h include/yacas/deffile.h include/yacas/errors.h include/yacas/evalfunc.h include/yacas/genericobject.h include/yacas/genericstructs.h include/yacas/infixparser.h include/yacas/lispatom.h -include/yacas/lispcleanupstack.h include/yacas/lispenvironment.h include/yacas/lisperror.h include/yacas/lispeval.h include/yacas/lispevalhash.h include/yacas/lispglobals.h include/yacas/lisphash.h include/yacas/lispio.h include/yacas/lispobject.h include/yacas/lispobject.inl include/yacas/lispparser.h include/yacas/lispstring.h include/yacas/lisptype.h include/yacas/lispuserfunc.h include/yacas/mathcommands.h include/yacas/mathuserfunc.h include/yacas/noncopyable.h include/yacas/numbers.h include/yacas/patcher.h include/yacas/patternclass.h include/yacas/patterns.h include/yacas/platfileio.h include/yacas/platmath.h include/yacas/refcount.h include/yacas/standard.h include/yacas/standard.inl include/yacas/stdcommandline.h include/yacas/stdfileio.h +include/yacas/string_utils.h include/yacas/stringio.h include/yacas/stubs.h include/yacas/substitute.h include/yacas/tokenizer.h include/yacas/unixcommandline.h +include/yacas/utf8.h +include/yacas/utf8/checked.h +include/yacas/utf8/core.h +include/yacas/utf8/unchecked.h +include/yacas/win32commandline.h include/yacas/xmltokenizer.h include/yacas/yacas.h include/yacas/yacas_version.h include/yacas/yacasbase.h include/yacas/yacasprivate.h lib/libyacas.a lib/libyacas.so -lib/libyacas.so.1 lib/libyacas.so.1.0.0 -%%DATADIR%%/documentation/hints -%%DATADIR%%/manmake/book2TeX.sh -%%DATADIR%%/manmake/book2TeX.ys -%%DATADIR%%/manmake/txt2yacasdoc.pl +%%DATADIR%%/scripts/Makefile.am %%DATADIR%%/scripts/array.rep/code.ys %%DATADIR%%/scripts/array.rep/code.ys.def %%DATADIR%%/scripts/assoc.rep/code.ys %%DATADIR%%/scripts/assoc.rep/code.ys.def %%DATADIR%%/scripts/base.rep/math.ys %%DATADIR%%/scripts/base.rep/math.ys.def %%DATADIR%%/scripts/c_form.rep/code.ys %%DATADIR%%/scripts/c_form.rep/code.ys.def %%DATADIR%%/scripts/calendar.rep/code.ys %%DATADIR%%/scripts/calendar.rep/code.ys.def %%DATADIR%%/scripts/complex.rep/code.ys %%DATADIR%%/scripts/complex.rep/code.ys.def %%DATADIR%%/scripts/complex.rep/om.ys %%DATADIR%%/scripts/constants.rep/code.ys %%DATADIR%%/scripts/constants.rep/code.ys.def %%DATADIR%%/scripts/constants.rep/om.ys %%DATADIR%%/scripts/controlflow.rep/code.ys %%DATADIR%%/scripts/controlflow.rep/code.ys.def -%%DATADIR%%/scripts/corefunctions.ys %%DATADIR%%/scripts/debug.rep/code.ys %%DATADIR%%/scripts/debug.rep/code.ys.def %%DATADIR%%/scripts/deffunc.rep/code.ys %%DATADIR%%/scripts/deffunc.rep/code.ys.def %%DATADIR%%/scripts/deriv.rep/code.ys %%DATADIR%%/scripts/deriv.rep/code.ys.def %%DATADIR%%/scripts/example.rep/code.ys %%DATADIR%%/scripts/example.rep/code.ys.def %%DATADIR%%/scripts/examples/ABIN.ys %%DATADIR%%/scripts/examples/MinimumSpanningTree.ys %%DATADIR%%/scripts/examples/benchbuild.ys %%DATADIR%%/scripts/examples/benchmark.ys %%DATADIR%%/scripts/examples/benchmark2.ys %%DATADIR%%/scripts/examples/findsum.ys %%DATADIR%%/scripts/examples/goldbach.ys %%DATADIR%%/scripts/examples/pi.ys %%DATADIR%%/scripts/examples/queens.ys %%DATADIR%%/scripts/examples/series.ys %%DATADIR%%/scripts/examples/wordproblems.ys %%DATADIR%%/scripts/factors.rep/binaryfactors.ys %%DATADIR%%/scripts/factors.rep/binaryfactors.ys.def %%DATADIR%%/scripts/factors.rep/code.ys %%DATADIR%%/scripts/factors.rep/code.ys.def %%DATADIR%%/scripts/functional.rep/code.ys %%DATADIR%%/scripts/functional.rep/code.ys.def %%DATADIR%%/scripts/functional.rep/om.ys %%DATADIR%%/scripts/graph.rep/code.ys %%DATADIR%%/scripts/graph.rep/code.ys.def %%DATADIR%%/scripts/html.rep/code.ys %%DATADIR%%/scripts/html.rep/code.ys.def %%DATADIR%%/scripts/integrate.rep/code.ys %%DATADIR%%/scripts/integrate.rep/code.ys.def %%DATADIR%%/scripts/integrate.rep/om.ys %%DATADIR%%/scripts/io.rep/code.ys %%DATADIR%%/scripts/io.rep/code.ys.def %%DATADIR%%/scripts/io.rep/defaultprint.ys %%DATADIR%%/scripts/io.rep/defaultprint.ys.def %%DATADIR%%/scripts/io.rep/errors.ys %%DATADIR%%/scripts/io.rep/formula.ys %%DATADIR%%/scripts/io.rep/print.ys %%DATADIR%%/scripts/limit.rep/code.ys %%DATADIR%%/scripts/limit.rep/code.ys.def %%DATADIR%%/scripts/limit.rep/om.ys %%DATADIR%%/scripts/linalg.rep/code.ys %%DATADIR%%/scripts/linalg.rep/code.ys.def %%DATADIR%%/scripts/lists.rep/code.ys %%DATADIR%%/scripts/lists.rep/code.ys.def %%DATADIR%%/scripts/lists.rep/scopestack.ys %%DATADIR%%/scripts/lists.rep/scopestack.ys.def %%DATADIR%%/scripts/localrules.rep/code.ys %%DATADIR%%/scripts/localrules.rep/code.ys.def %%DATADIR%%/scripts/logic.rep/code.ys %%DATADIR%%/scripts/logic.rep/code.ys.def %%DATADIR%%/scripts/logic.rep/om.ys +%%DATADIR%%/scripts/maketest %%DATADIR%%/scripts/multivar.rep/code.ys %%DATADIR%%/scripts/multivar.rep/code.ys.def %%DATADIR%%/scripts/multivar.rep/makemulti.ys %%DATADIR%%/scripts/multivar.rep/sparsenomial.ys %%DATADIR%%/scripts/multivar.rep/sparsetree.ys %%DATADIR%%/scripts/multivar.rep/sparsetree.ys.def %%DATADIR%%/scripts/newly.rep/code.ys %%DATADIR%%/scripts/newly.rep/code.ys.def +%%DATADIR%%/scripts/nintegrate.rep/code.ys +%%DATADIR%%/scripts/nintegrate.rep/code.ys.def %%DATADIR%%/scripts/numbers.rep/GaussianIntegers.ys %%DATADIR%%/scripts/numbers.rep/GaussianIntegers.ys.def %%DATADIR%%/scripts/numbers.rep/NumberTheory.ys %%DATADIR%%/scripts/numbers.rep/NumberTheory.ys.def %%DATADIR%%/scripts/numbers.rep/code.ys %%DATADIR%%/scripts/numbers.rep/code.ys.def %%DATADIR%%/scripts/numbers.rep/nthroot.ys %%DATADIR%%/scripts/numbers.rep/nthroot.ys.def %%DATADIR%%/scripts/numbers.rep/om.ys %%DATADIR%%/scripts/odesolver.rep/code.ys %%DATADIR%%/scripts/odesolver.rep/code.ys.def %%DATADIR%%/scripts/openmath.rep/code.ys %%DATADIR%%/scripts/openmath.rep/code.ys.def %%DATADIR%%/scripts/orthopoly.rep/code.ys %%DATADIR%%/scripts/orthopoly.rep/code.ys.def %%DATADIR%%/scripts/packages.ys %%DATADIR%%/scripts/padic.rep/code.ys %%DATADIR%%/scripts/padic.rep/code.ys.def %%DATADIR%%/scripts/patterns.rep/code.ys %%DATADIR%%/scripts/patterns.rep/code.ys.def %%DATADIR%%/scripts/plots.rep/backends-2d.ys %%DATADIR%%/scripts/plots.rep/backends-3d.ys %%DATADIR%%/scripts/plots.rep/code.ys %%DATADIR%%/scripts/plots.rep/code.ys.def %%DATADIR%%/scripts/plots.rep/plot2d.ys %%DATADIR%%/scripts/plots.rep/plot2d.ys.def %%DATADIR%%/scripts/plots.rep/plot3d.ys %%DATADIR%%/scripts/plots.rep/plot3d.ys.def %%DATADIR%%/scripts/predicates.rep/code.ys %%DATADIR%%/scripts/predicates.rep/code.ys.def %%DATADIR%%/scripts/probability.rep/code.ys %%DATADIR%%/scripts/probability.rep/code.ys.def %%DATADIR%%/scripts/pslq.rep/code.ys %%DATADIR%%/scripts/pslq.rep/code.ys.def %%DATADIR%%/scripts/rabinmiller.rep/code.ys %%DATADIR%%/scripts/rabinmiller.rep/code.ys.def %%DATADIR%%/scripts/radsimp.rep/code.ys %%DATADIR%%/scripts/radsimp.rep/code.ys.def %%DATADIR%%/scripts/random.rep/code.ys %%DATADIR%%/scripts/random.rep/code.ys.def +%%DATADIR%%/scripts/rational.rep/code.ys +%%DATADIR%%/scripts/rational.rep/code.ys.def %%DATADIR%%/scripts/simplify.rep/code.ys %%DATADIR%%/scripts/simplify.rep/code.ys.def %%DATADIR%%/scripts/simplify.rep/factorial.ys %%DATADIR%%/scripts/simplify.rep/factorial.ys.def %%DATADIR%%/scripts/solve.rep/code.ys %%DATADIR%%/scripts/solve.rep/code.ys.def %%DATADIR%%/scripts/specfunc.rep/bernou.ys %%DATADIR%%/scripts/specfunc.rep/bernou.ys.def %%DATADIR%%/scripts/specfunc.rep/bessel.ys %%DATADIR%%/scripts/specfunc.rep/bessel.ys.def %%DATADIR%%/scripts/specfunc.rep/code.ys %%DATADIR%%/scripts/specfunc.rep/code.ys.def %%DATADIR%%/scripts/specfunc.rep/gamma.ys %%DATADIR%%/scripts/specfunc.rep/gamma.ys.def %%DATADIR%%/scripts/specfunc.rep/gammaconst.ys %%DATADIR%%/scripts/specfunc.rep/gammaconst.ys.def %%DATADIR%%/scripts/specfunc.rep/om.ys %%DATADIR%%/scripts/specfunc.rep/zeta.ys %%DATADIR%%/scripts/specfunc.rep/zeta.ys.def %%DATADIR%%/scripts/standard.ys %%DATADIR%%/scripts/standard.ys.def %%DATADIR%%/scripts/statistics.rep/distributions.ys %%DATADIR%%/scripts/statistics.rep/distributions.ys.def %%DATADIR%%/scripts/statistics.rep/hypothesystest.ys %%DATADIR%%/scripts/statistics.rep/hypothesystest.ys.def %%DATADIR%%/scripts/statistics.rep/incompletegamma.ys %%DATADIR%%/scripts/statistics.rep/incompletegamma.ys.def %%DATADIR%%/scripts/statistics.rep/randomtest.ys %%DATADIR%%/scripts/statistics.rep/regression.ys %%DATADIR%%/scripts/statistics.rep/regression.ys.def %%DATADIR%%/scripts/statistics.rep/statistics.ys %%DATADIR%%/scripts/statistics.rep/statistics.ys.def %%DATADIR%%/scripts/stats.rep/code.ys %%DATADIR%%/scripts/stats.rep/code.ys.def %%DATADIR%%/scripts/stdarith.ys %%DATADIR%%/scripts/stdarith.ys.def %%DATADIR%%/scripts/stdfuncs.rep/code.ys %%DATADIR%%/scripts/stdfuncs.rep/code.ys.def %%DATADIR%%/scripts/stdfuncs.rep/elemfuncs.ys %%DATADIR%%/scripts/stdfuncs.rep/elemfuncs.ys.def %%DATADIR%%/scripts/stdfuncs.rep/numerical.ys %%DATADIR%%/scripts/stdfuncs.rep/numerical.ys.def %%DATADIR%%/scripts/stdfuncs.rep/nummethods.ys %%DATADIR%%/scripts/stdfuncs.rep/nummethods.ys.def %%DATADIR%%/scripts/stdfuncs.rep/om.ys %%DATADIR%%/scripts/stdopers.ys %%DATADIR%%/scripts/stubs.rep/code.ys %%DATADIR%%/scripts/stubs.rep/code.ys.def %%DATADIR%%/scripts/stubs.rep/om.ys %%DATADIR%%/scripts/substitute.rep/code.ys %%DATADIR%%/scripts/substitute.rep/code.ys.def %%DATADIR%%/scripts/sums.rep/code.ys %%DATADIR%%/scripts/sums.rep/code.ys.def %%DATADIR%%/scripts/sums.rep/om.ys %%DATADIR%%/scripts/sums.rep/taylor.ys %%DATADIR%%/scripts/sums.rep/taylor.ys.def %%DATADIR%%/scripts/sums.rep/taylor3.ys %%DATADIR%%/scripts/sums.rep/taylor3.ys.def %%DATADIR%%/scripts/tensor.rep/code.ys %%DATADIR%%/scripts/tensor.rep/code.ys.def %%DATADIR%%/scripts/testers.rep/code.ys %%DATADIR%%/scripts/testers.rep/code.ys.def %%DATADIR%%/scripts/texform.rep/code.ys %%DATADIR%%/scripts/texform.rep/code.ys.def %%DATADIR%%/scripts/transforms.rep/code.ys %%DATADIR%%/scripts/transforms.rep/code.ys.def %%DATADIR%%/scripts/trigsimp.rep/code.ys %%DATADIR%%/scripts/trigsimp.rep/code.ys.def %%DATADIR%%/scripts/univar.rep/Cyclotomic.ys %%DATADIR%%/scripts/univar.rep/Cyclotomic.ys.def %%DATADIR%%/scripts/univar.rep/code.ys %%DATADIR%%/scripts/univar.rep/code.ys.def %%DATADIR%%/scripts/univar.rep/sparse.ys %%DATADIR%%/scripts/univar.rep/sparse.ys.def %%DATADIR%%/scripts/univar.rep/sturm.ys %%DATADIR%%/scripts/univar.rep/sturm.ys.def %%DATADIR%%/scripts/yacasinit.ys