diff options
Diffstat (limited to 'math')
173 files changed, 2079 insertions, 1637 deletions
diff --git a/math/Makefile b/math/Makefile index be3a709af0ad..c8e420fe3125 100644 --- a/math/Makefile +++ b/math/Makefile @@ -144,11 +144,13 @@ SUBDIR += bitwise SUBDIR += blacs SUBDIR += blas + SUBDIR += blasfeo SUBDIR += blaze SUBDIR += blazeiterative SUBDIR += blis SUBDIR += blitz++ SUBDIR += blocksolve95 + SUBDIR += bonmin SUBDIR += boolector SUBDIR += bsdnt SUBDIR += btor2tools @@ -157,6 +159,7 @@ SUBDIR += calcoo SUBDIR += calctool SUBDIR += cantor + SUBDIR += casadi SUBDIR += cbc SUBDIR += cblas SUBDIR += ccmath @@ -186,6 +189,8 @@ SUBDIR += concorde SUBDIR += convertall SUBDIR += coq + SUBDIR += couenne + SUBDIR += cppad SUBDIR += crlibm SUBDIR += cryptominisat SUBDIR += curv @@ -224,7 +229,6 @@ SUBDIR += fftw3-float SUBDIR += fftw3-long SUBDIR += fftw3-quad - SUBDIR += fityk SUBDIR += flann SUBDIR += flint2 SUBDIR += flintqs @@ -276,6 +280,7 @@ SUBDIR += hexcalc SUBDIR += hipmcl SUBDIR += hmat-oss + SUBDIR += hpipm SUBDIR += hs-Agda SUBDIR += hs-semigroups SUBDIR += ignition-math @@ -401,10 +406,8 @@ SUBDIR += octave-forge-dicom SUBDIR += octave-forge-divand SUBDIR += octave-forge-doctest - SUBDIR += octave-forge-econometrics SUBDIR += octave-forge-fenv SUBDIR += octave-forge-financial - SUBDIR += octave-forge-fits SUBDIR += octave-forge-fpl SUBDIR += octave-forge-fuzzy-logic-toolkit SUBDIR += octave-forge-ga @@ -421,11 +424,9 @@ SUBDIR += octave-forge-io SUBDIR += octave-forge-irsa SUBDIR += octave-forge-level-set - SUBDIR += octave-forge-linear-algebra SUBDIR += octave-forge-lssa SUBDIR += octave-forge-ltfat SUBDIR += octave-forge-mapping - SUBDIR += octave-forge-mechanics SUBDIR += octave-forge-miscellaneous SUBDIR += octave-forge-missing-functions SUBDIR += octave-forge-msh @@ -445,7 +446,6 @@ SUBDIR += octave-forge-optim SUBDIR += octave-forge-optiminterp SUBDIR += octave-forge-outliers - SUBDIR += octave-forge-parallel SUBDIR += octave-forge-plot SUBDIR += octave-forge-quaternion SUBDIR += octave-forge-queueing @@ -461,19 +461,17 @@ SUBDIR += octave-forge-splines SUBDIR += octave-forge-statistics SUBDIR += octave-forge-stk - SUBDIR += octave-forge-strings SUBDIR += octave-forge-struct SUBDIR += octave-forge-symband SUBDIR += octave-forge-symbolic SUBDIR += octave-forge-tcl-octave - SUBDIR += octave-forge-tisean SUBDIR += octave-forge-tsa - SUBDIR += octave-forge-video SUBDIR += octave-forge-zenity SUBDIR += octave-forge-zeromq SUBDIR += octomap SUBDIR += ogdf SUBDIR += oleo + SUBDIR += onnx SUBDIR += openblas SUBDIR += openfst SUBDIR += openlibm @@ -665,8 +663,6 @@ SUBDIR += prng SUBDIR += proofgeneral SUBDIR += pspp - SUBDIR += pure-mpfr - SUBDIR += pure-rational SUBDIR += py-CyLP SUBDIR += py-Diofant SUBDIR += py-GridDataFormats @@ -732,6 +728,7 @@ SUBDIR += py-numexpr SUBDIR += py-numpy SUBDIR += py-nzmath + SUBDIR += py-onnx SUBDIR += py-osqp SUBDIR += py-pandas SUBDIR += py-pandas-datareader @@ -759,6 +756,7 @@ SUBDIR += py-pyodesys SUBDIR += py-pysparse SUBDIR += py-pysym + SUBDIR += py-pystan SUBDIR += py-python-louvain SUBDIR += py-pyvtk SUBDIR += py-quadprog @@ -786,7 +784,6 @@ SUBDIR += py-uncertainties SUBDIR += py-vincenty SUBDIR += py-viper - SUBDIR += py-yt SUBDIR += py-z3-solver SUBDIR += qalculate SUBDIR += qd @@ -851,6 +848,7 @@ SUBDIR += superlu SUBDIR += superlu_mt SUBDIR += symmetrica + SUBDIR += symphony SUBDIR += tablix SUBDIR += taucs SUBDIR += tblis @@ -864,10 +862,12 @@ SUBDIR += triangle SUBDIR += trlan SUBDIR += truthtable + SUBDIR += tvm SUBDIR += tvmet SUBDIR += ump SUBDIR += units SUBDIR += unuran + SUBDIR += vampire SUBDIR += viennacl SUBDIR += visualpolylib SUBDIR += vowpal_wabbit diff --git a/math/R-cran-coda/Makefile b/math/R-cran-coda/Makefile index 317a38299eaa..5ab67a836faa 100644 --- a/math/R-cran-coda/Makefile +++ b/math/R-cran-coda/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= coda -DISTVERSION= 0.19-2 -PORTREVISION= 2 +DISTVERSION= 0.19-3 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/math/R-cran-coda/distinfo b/math/R-cran-coda/distinfo index 1709c791942b..17dbbf04a2be 100644 --- a/math/R-cran-coda/distinfo +++ b/math/R-cran-coda/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539082540 -SHA256 (coda_0.19-2.tar.gz) = 678a7e6a87a2723089daeb780ea37ac3d4319b37eabe26928ea3fa9c9b1eda0d -SIZE (coda_0.19-2.tar.gz) = 73530 +TIMESTAMP = 1567325332 +SHA256 (coda_0.19-3.tar.gz) = d3df1fc848bcf1af8fae13d61eeab60e99a3d4b4db384bec4326f909f502c5d6 +SIZE (coda_0.19-3.tar.gz) = 73555 diff --git a/math/amath/Makefile b/math/amath/Makefile index 687c18851841..9eeb82dbe3dc 100644 --- a/math/amath/Makefile +++ b/math/amath/Makefile @@ -13,9 +13,6 @@ COMMENT= Simple command line calculator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe -NOT_FOR_ARCHS_REASON= Must define endianness - USES= gmake USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} HAS_CONFIGURE= yes diff --git a/math/amath/files/patch-src_real_prim.h b/math/amath/files/patch-src_real_prim.h new file mode 100644 index 000000000000..341e46b6f933 --- /dev/null +++ b/math/amath/files/patch-src_real_prim.h @@ -0,0 +1,11 @@ +--- src/real/prim.h.orig 2019-07-18 20:14:48 UTC ++++ src/real/prim.h +@@ -106,7 +106,7 @@ int __kernel_rem_pio2(double* x, double* y, int e0, in + /* Detect other BE CPUs */ + #if !defined(__IEEE_LITTLE_ENDIAN) && !defined(__IEEE_BIG_ENDIAN) + #if defined(PPCCPU) || defined(__PPC__) || \ +- defined(__powerpc__) || defined(__powerpc64__) \ ++ defined(__powerpc__) || defined(__powerpc64__) || \ + defined(__mips__) || defined(__mips) + #define __IEEE_BIG_ENDIAN + #endif diff --git a/math/analitza/distinfo b/math/analitza/distinfo index 2e38167a3b12..8c5e0c93299a 100644 --- a/math/analitza/distinfo +++ b/math/analitza/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555679 -SHA256 (KDE/applications/19.08.0/analitza-19.08.0.tar.xz) = 516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003 -SIZE (KDE/applications/19.08.0/analitza-19.08.0.tar.xz) = 332240 +TIMESTAMP = 1567537251 +SHA256 (KDE/applications/19.08.1/analitza-19.08.1.tar.xz) = f963a8abe31d4c0d2b0e0a7e78ec78ced8eb7a0af60df1620ccc2f2409df6a91 +SIZE (KDE/applications/19.08.1/analitza-19.08.1.tar.xz) = 332244 diff --git a/math/bcal/Makefile b/math/bcal/Makefile index 8956417f1a68..5eb26af4ec46 100644 --- a/math/bcal/Makefile +++ b/math/bcal/Makefile @@ -3,7 +3,7 @@ PORTNAME= bcal DISTVERSIONPREFIX= v DISTVERSION= 2.1-12 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g6867abd CATEGORIES= math @@ -22,7 +22,7 @@ USES= gmake python:test,3.5+ readline USE_GITHUB= yes GH_ACCOUNT= jarun -MAKE_ARGS= MANDIR=${STAGEDIR}${MAN1PREFIX}/man/man1 +MAKE_ARGS= CFLAGS_OPTIMIZATION= MANDIR=${STAGEDIR}${MAN1PREFIX}/man/man1 PLIST_FILES= bin/bcal \ man/man1/bcal.1.gz diff --git a/math/blasfeo/Makefile b/math/blasfeo/Makefile new file mode 100644 index 000000000000..46d4aac6396d --- /dev/null +++ b/math/blasfeo/Makefile @@ -0,0 +1,38 @@ +# $FreeBSD$ + +PORTNAME= blasfeo +DISTVERSION= 0.1.1 +PORTREVISION= 2 +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Basic Linear Algebra Subroutines For Embedded Optimization + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +USES= cmake +USE_GITHUB= yes +GH_ACCOUNT= giaf + +CMAKE_ARGS= -DTARGET:STRING=GENERIC +CMAKE_ON= BUILD_SHARED_LIBS + +OPTIONS_SINGLE= ${OPTIONS_SINGLE_${ARCH}} +OPTIONS_SINGLE_amd64= TARGETAMD64 +OPTIONS_SINGLE_TARGETAMD64= GENERIC X64_INTEL_HASWELL X64_INTEL_SANDY_BRIDGE X64_INTEL_CORE X64_AMD_BULLDOZER +OPTIONS_DEFAULT_amd64= GENERIC +# TODO ARM also has SIMD acceleration + +GENERIC_DESC= Generic C code without SIMD acceleration +X64_INTEL_HASWELL_DESC= x86_64 architecture with AVX2 and FMA ISA (64 bit OS) +X64_INTEL_SANDY_BRIDGE_DESC= x86_64 architecture with AVX ISA (64 bit OS) +X64_INTEL_CORE_DESC= x86_64 architecture with SSE3 (64 bit OS) +X64_AMD_BULLDOZER_DESC= x86_64 architecture with AVX and FMA ISA (64 bit OS) + +X64_INTEL_HASWELL_CMAKE_ON= -DTARGET:STRING=X64_INTEL_HASWELL +X64_INTEL_SANDY_BRIDGE_CMAKE_ON= -DTARGET:STRING=X64_INTEL_SANDY_BRIDGE +X64_INTEL_CORE_CMAKE_ON= -DTARGET:STRING=X64_INTEL_CORE +X64_AMD_BULLDOZER_CMAKE_ON= -DTARGET:STRING=X64_AMD_BULLDOZER + +.include <bsd.port.mk> diff --git a/math/blasfeo/distinfo b/math/blasfeo/distinfo new file mode 100644 index 000000000000..375a83d955f8 --- /dev/null +++ b/math/blasfeo/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566689393 +SHA256 (giaf-blasfeo-0.1.1_GH0.tar.gz) = a52169306dfcc43d0aa41b031b98f1d63a4fd0ec7e8139bf95f14dc270ec3b72 +SIZE (giaf-blasfeo-0.1.1_GH0.tar.gz) = 1235604 diff --git a/math/blasfeo/files/patch-CMakeLists.txt b/math/blasfeo/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..6eba634bd39f --- /dev/null +++ b/math/blasfeo/files/patch-CMakeLists.txt @@ -0,0 +1,29 @@ +--- CMakeLists.txt.orig 2019-02-04 20:56:09 UTC ++++ CMakeLists.txt +@@ -95,7 +95,7 @@ configure_file(${PROJECT_SOURCE_DIR}/blasfeo_target.h. + #set(BUILD_SHARED_LIBS ON CACHE STRING "Build shared libraries") + + # installation directory +-if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") ++if(FALSE AND CMAKE_INSTALL_PREFIX MATCHES "/usr/local") + set(CMAKE_INSTALL_PREFIX "/opt/blasfeo") + endif() + +@@ -171,7 +171,7 @@ if(${MACRO_LEVEL} MATCHES 2) + endif() + + # +-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|DragonFly") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOS_LINUX") + set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -DOS_LINUX") + endif() +@@ -827,7 +827,7 @@ install(TARGETS blasfeo EXPORT blasfeoConfig + RUNTIME DESTINATION bin) + + +-install(EXPORT blasfeoConfig DESTINATION cmake) ++install(EXPORT blasfeoConfig DESTINATION lib/cmake) + + file(GLOB_RECURSE BLASFEO_HEADERS "include/*.h") + install(FILES ${BLASFEO_HEADERS} DESTINATION ${BLASFEO_HEADERS_INSTALLATION_DIRECTORY}) diff --git a/math/blasfeo/pkg-descr b/math/blasfeo/pkg-descr new file mode 100644 index 000000000000..89d8fc260267 --- /dev/null +++ b/math/blasfeo/pkg-descr @@ -0,0 +1,5 @@ +BLASFEO provides a set of basic linear algebra routines, performance-optimized +for matrices fitting in cache (i.e. generally up to a couple hundreds size in +each dimension), as typically encountered in embedded optimization application. + +WWW: https://github.com/giaf/blasfeo diff --git a/math/blasfeo/pkg-plist b/math/blasfeo/pkg-plist new file mode 100644 index 000000000000..dedb3356fcf0 --- /dev/null +++ b/math/blasfeo/pkg-plist @@ -0,0 +1,38 @@ +include/blasfeo.h +include/blasfeo_block_size.h +include/blasfeo_common.h +include/blasfeo_d_aux.h +include/blasfeo_d_aux_ext_dep.h +include/blasfeo_d_aux_ext_dep_ref.h +include/blasfeo_d_aux_old.h +include/blasfeo_d_aux_ref.h +include/blasfeo_d_aux_test.h +include/blasfeo_d_blas.h +include/blasfeo_d_blas_api.h +include/blasfeo_d_blasfeo_api.h +include/blasfeo_d_blasfeo_api_ref.h +include/blasfeo_d_kernel.h +include/blasfeo_i_aux_ext_dep.h +include/blasfeo_m_aux.h +include/blasfeo_naming.h +include/blasfeo_s_aux.h +include/blasfeo_s_aux_ext_dep.h +include/blasfeo_s_aux_ext_dep_ref.h +include/blasfeo_s_aux_old.h +include/blasfeo_s_aux_ref.h +include/blasfeo_s_aux_test.h +include/blasfeo_s_blas.h +include/blasfeo_s_blas_api.h +include/blasfeo_s_blasfeo_api.h +include/blasfeo_s_blasfeo_api_ref.h +include/blasfeo_s_kernel.h +include/blasfeo_target.h +include/blasfeo_timing.h +include/blasfeo_v_aux_ext_dep.h +include/d_blas.h +include/d_blas_64.h +include/s_blas.h +include/s_blas_64.h +lib/cmake/blasfeoConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/blasfeoConfig.cmake +lib/libblasfeo.so diff --git a/math/bonmin/Makefile b/math/bonmin/Makefile new file mode 100644 index 000000000000..2f943de9bcac --- /dev/null +++ b/math/bonmin/Makefile @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= bonmin +DISTVERSIONPREFIX= releases/ +DISTVERSION= 1.8.7 +CATEGORIES= math +PKGNAMEPREFIX= coin-or- + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Basic Open-source Nonlinear Mixed INteger programming + +LICENSE= EPL +LICENSE_FILE= ${WRKSRC}/Bonmin/LICENSE + +LIB_DEPENDS= libCbc.so:math/coinmp \ + libipopt.so:math/ipopt + +USES= blaslapack:netlib gmake libtool pkgconfig +GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= coin-or +GH_PROJECT= Bonmin +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip + +TEST_TARGET= test + +.include <bsd.port.mk> diff --git a/math/bonmin/distinfo b/math/bonmin/distinfo new file mode 100644 index 000000000000..d5a9e319bfb5 --- /dev/null +++ b/math/bonmin/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566692976 +SHA256 (coin-or-Bonmin-releases-1.8.7_GH0.tar.gz) = b7ff716b5b69055b9a4f0a6083d5805adde95aeb7678d2c349d3499881343b3a +SIZE (coin-or-Bonmin-releases-1.8.7_GH0.tar.gz) = 1335974 diff --git a/math/bonmin/pkg-descr b/math/bonmin/pkg-descr new file mode 100644 index 000000000000..c4d94cfd1991 --- /dev/null +++ b/math/bonmin/pkg-descr @@ -0,0 +1,5 @@ +Bonmin (Basic Open-source Nonlinear Mixed INteger programming) is an +experimental open-source C++ code for solving general MINLP (Mixed Integer +NonLinear Programming) problems. + +WWW: https://projects.coin-or.org/Bonmin diff --git a/math/bonmin/pkg-plist b/math/bonmin/pkg-plist new file mode 100644 index 000000000000..9b2c6215a2dc --- /dev/null +++ b/math/bonmin/pkg-plist @@ -0,0 +1,67 @@ +include/coin/BonArraysHelpers.hpp +include/coin/BonAuxInfos.hpp +include/coin/BonBabInfos.hpp +include/coin/BonBabSetupBase.hpp +include/coin/BonBonminSetup.hpp +include/coin/BonBranchingTQP.hpp +include/coin/BonCbc.hpp +include/coin/BonCbcLpStrategy.hpp +include/coin/BonCbcNlpStrategy.hpp +include/coin/BonCbcNode.hpp +include/coin/BonChooseVariable.hpp +include/coin/BonCurvBranchingSolver.hpp +include/coin/BonCutStrengthener.hpp +include/coin/BonDiver.hpp +include/coin/BonDummyHeuristic.hpp +include/coin/BonDummyPump.hpp +include/coin/BonEcpCuts.hpp +include/coin/BonExitCodes.hpp +include/coin/BonFixAndSolveHeuristic.hpp +include/coin/BonGuessHeuristic.hpp +include/coin/BonHeuristicDive.hpp +include/coin/BonHeuristicDiveFractional.hpp +include/coin/BonHeuristicDiveMIP.hpp +include/coin/BonHeuristicDiveMIPFractional.hpp +include/coin/BonHeuristicDiveMIPVectorLength.hpp +include/coin/BonHeuristicDiveVectorLength.hpp +include/coin/BonHeuristicFPump.hpp +include/coin/BonHeuristicLocalBranching.hpp +include/coin/BonHeuristicRINS.hpp +include/coin/BonIpoptInteriorWarmStarter.hpp +include/coin/BonIpoptSolver.hpp +include/coin/BonIpoptWarmStart.hpp +include/coin/BonLinearCutsGenerator.hpp +include/coin/BonLocalSolverBasedHeuristic.hpp +include/coin/BonLpBranchingSolver.hpp +include/coin/BonMilpRounding.hpp +include/coin/BonOACutGenerator2.hpp +include/coin/BonOAMessages.hpp +include/coin/BonOaDecBase.hpp +include/coin/BonOaFeasChecker.hpp +include/coin/BonOaNlpOptim.hpp +include/coin/BonOsiTMINLPInterface.hpp +include/coin/BonOuterApprox.hpp +include/coin/BonPseudoCosts.hpp +include/coin/BonPumpForMinlp.hpp +include/coin/BonQuadCut.hpp +include/coin/BonQuadRow.hpp +include/coin/BonRegisteredOptions.hpp +include/coin/BonStrongBranchingSolver.hpp +include/coin/BonSubMipSolver.hpp +include/coin/BonTMINLP.hpp +include/coin/BonTMINLP2OsiLP.hpp +include/coin/BonTMINLP2Quad.hpp +include/coin/BonTMINLP2TNLP.hpp +include/coin/BonTMINLPLinObj.hpp +include/coin/BonTMatrix.hpp +include/coin/BonTNLP2FPNLP.hpp +include/coin/BonTNLPSolver.hpp +include/coin/BonTypes.hpp +include/coin/BonminConfig.h +lib/libbonmin.so +lib/libbonmin.so.4 +lib/libbonmin.so.4.8.7 +libdata/pkgconfig/bonmin.pc +share/coin/doc/Bonmin/AUTHORS +share/coin/doc/Bonmin/LICENSE +share/coin/doc/Bonmin/README diff --git a/math/cantor/distinfo b/math/cantor/distinfo index 75fd545672f9..fe2addfbc823 100644 --- a/math/cantor/distinfo +++ b/math/cantor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555679 -SHA256 (KDE/applications/19.08.0/cantor-19.08.0.tar.xz) = b1d1a735e83ca03d51b79f1fc59612153e94b274d716d65ff3fa94ffdd2f3adc -SIZE (KDE/applications/19.08.0/cantor-19.08.0.tar.xz) = 2536776 +TIMESTAMP = 1567537251 +SHA256 (KDE/applications/19.08.1/cantor-19.08.1.tar.xz) = 93b43426c3383718e6ff7b62f073e3c39371a519b98e890c2b7c15cb5086c039 +SIZE (KDE/applications/19.08.1/cantor-19.08.1.tar.xz) = 2539272 diff --git a/math/casadi/Makefile b/math/casadi/Makefile new file mode 100644 index 000000000000..0db06204c310 --- /dev/null +++ b/math/casadi/Makefile @@ -0,0 +1,68 @@ +# $FreeBSD$ + +PORTNAME= casadi +DISTVERSION= 3.4.5-49 +DISTVERSIONSUFFIX= -g6b0de13ac +PORTREVISION= 1 +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Symbolic framework for numeric optimization + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +USES= cmake pkgconfig +USE_GITHUB= yes +USE_LDCONFIG= yes + +CFLAGS+= -fPIC +CXXFLAGS+= -fPIC + +CMAKE_OFF= WITH_DEEPBIND WITH_BUILD_BLASFEO + +OPTIONS_DEFINE= BLASFEO BONMIN CLANG IPOPT LAPACK QPOASES +OPTIONS_DEFAULT= BLASFEO BONMIN IPOPT LAPACK QPOASES +OPTIONS_SUB= yes + +BLASFEO_DESC= Build with BLASFEO +BLASFEO_CMAKE_BOOL= WITH_BLASFEO +BLASFEO_BUILD_DEPENDS= blasfeo>0:math/blasfeo + +BONMIN_DESC= Build with Bonmin +BONMIN_CMAKE_BOOL= WITH_BONMIN +BONMIN_USES= blaslapack:netlib fortran +BONMIN_LIB_DEPENDS= libbonmin.so:math/bonmin \ + libCbcSolver.so:math/coinmp \ + libipopt.so:math/ipopt + +CLANG_DESC= Build with clang for JIT +CLANG_CMAKE_BOOL= WITH_CLANG +CLANG_BROKEN= Fails to find clang + +IPOPT_DESC= Build with IPopt +IPOPT_CMAKE_BOOL= WITH_IPOPT +IPOPT_USES= blaslapack:netlib fortran +IPOPT_LIB_DEPENDS= libipopt.so:math/ipopt + +LAPACK_DESC= Build with LAPACK +LAPACK_CMAKE_BOOL= WITH_LAPACK +LAPACK_USES= blaslapack:openblas + +QPOASES_DESC= Build with qpOASES +QPOASES_CMAKE_BOOL= WITH_QPOASES +QPOASES_LIB_DEPENDS= libopenblas.so:math/openblas +QPOASES_IMPLIES= LAPACK + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MCLANG} +# use clang from ports because cmake can't find base llvm for JIT +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +RUN_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CPP= clang-cpp${LLVM_DEFAULT} +CC= clang${LLVM_DEFAULT} +CXX= clang++${LLVM_DEFAULT} +.endif + +.include <bsd.port.mk> diff --git a/math/casadi/distinfo b/math/casadi/distinfo new file mode 100644 index 000000000000..43d27ffa9b53 --- /dev/null +++ b/math/casadi/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566688181 +SHA256 (casadi-casadi-3.4.5-49-g6b0de13ac_GH0.tar.gz) = 38e130753a849f569f38e8dfb5f83f2b3f4d606f36450b2cbf31fc18961b586b +SIZE (casadi-casadi-3.4.5-49-g6b0de13ac_GH0.tar.gz) = 3602120 diff --git a/math/casadi/pkg-descr b/math/casadi/pkg-descr new file mode 100644 index 000000000000..7e1a32a1aa14 --- /dev/null +++ b/math/casadi/pkg-descr @@ -0,0 +1,8 @@ +CasADi is an open-source tool for nonlinear optimization and algorithmic +differentiation. + +It facilitates rapid, yet efficient, implementation of different methods for +numerical optimal control, both in an offline context and for nonlinear model +predictive control (NMPC). + +WWW: https://web.casadi.org/ diff --git a/math/casadi/pkg-plist b/math/casadi/pkg-plist new file mode 100644 index 000000000000..70c59b9df60b --- /dev/null +++ b/math/casadi/pkg-plist @@ -0,0 +1,156 @@ +include/casadi/casadi.hpp +include/casadi/config.h +include/casadi/core/calculus.hpp +include/casadi/core/callback.hpp +include/casadi/core/casadi_common.hpp +include/casadi/core/casadi_export.h +include/casadi/core/casadi_interrupt.hpp +include/casadi/core/casadi_limits.hpp +include/casadi/core/casadi_logger.hpp +include/casadi/core/casadi_meta.hpp +include/casadi/core/casadi_misc.hpp +include/casadi/core/casadi_types.hpp +include/casadi/core/code_generator.hpp +include/casadi/core/conic.hpp +include/casadi/core/core.hpp +include/casadi/core/dae_builder.hpp +include/casadi/core/dple.hpp +include/casadi/core/exception.hpp +include/casadi/core/expm.hpp +include/casadi/core/external.hpp +include/casadi/core/function.hpp +include/casadi/core/generic_expression.hpp +include/casadi/core/generic_matrix.hpp +include/casadi/core/generic_type.hpp +include/casadi/core/global_options.hpp +include/casadi/core/importer.hpp +include/casadi/core/integration_tools.hpp +include/casadi/core/integrator.hpp +include/casadi/core/interpolant.hpp +include/casadi/core/linsol.hpp +include/casadi/core/matrix.hpp +include/casadi/core/mx.hpp +include/casadi/core/nlp_builder.hpp +include/casadi/core/nlpsol.hpp +include/casadi/core/nonzeros.hpp +include/casadi/core/options.hpp +include/casadi/core/optistack.hpp +include/casadi/core/polynomial.hpp +include/casadi/core/printable.hpp +include/casadi/core/rootfinder.hpp +include/casadi/core/runtime/casadi_axpy.hpp +include/casadi/core/runtime/casadi_bfgs.hpp +include/casadi/core/runtime/casadi_bilin.hpp +include/casadi/core/runtime/casadi_copy.hpp +include/casadi/core/runtime/casadi_de_boor.hpp +include/casadi/core/runtime/casadi_densify.hpp +include/casadi/core/runtime/casadi_dot.hpp +include/casadi/core/runtime/casadi_fill.hpp +include/casadi/core/runtime/casadi_finite_diff.hpp +include/casadi/core/runtime/casadi_flip.hpp +include/casadi/core/runtime/casadi_getu.hpp +include/casadi/core/runtime/casadi_iamax.hpp +include/casadi/core/runtime/casadi_interpn.hpp +include/casadi/core/runtime/casadi_interpn_grad.hpp +include/casadi/core/runtime/casadi_interpn_interpolate.hpp +include/casadi/core/runtime/casadi_interpn_weights.hpp +include/casadi/core/runtime/casadi_ldl.hpp +include/casadi/core/runtime/casadi_low.hpp +include/casadi/core/runtime/casadi_max_viol.hpp +include/casadi/core/runtime/casadi_minmax.hpp +include/casadi/core/runtime/casadi_mtimes.hpp +include/casadi/core/runtime/casadi_mv.hpp +include/casadi/core/runtime/casadi_mv_dense.hpp +include/casadi/core/runtime/casadi_nd_boor_eval.hpp +include/casadi/core/runtime/casadi_newton.hpp +include/casadi/core/runtime/casadi_norm_1.hpp +include/casadi/core/runtime/casadi_norm_2.hpp +include/casadi/core/runtime/casadi_norm_inf.hpp +include/casadi/core/runtime/casadi_norm_inf_mul.hpp +include/casadi/core/runtime/casadi_polyval.hpp +include/casadi/core/runtime/casadi_project.hpp +include/casadi/core/runtime/casadi_qp.hpp +include/casadi/core/runtime/casadi_qr.hpp +include/casadi/core/runtime/casadi_rank1.hpp +include/casadi/core/runtime/casadi_regularize.hpp +include/casadi/core/runtime/casadi_runtime.hpp +include/casadi/core/runtime/casadi_scal.hpp +include/casadi/core/runtime/casadi_sparsify.hpp +include/casadi/core/runtime/casadi_sum_viol.hpp +include/casadi/core/runtime/casadi_swap.hpp +include/casadi/core/runtime/casadi_trans.hpp +include/casadi/core/runtime/shared.hpp +include/casadi/core/shared_object.hpp +include/casadi/core/slice.hpp +include/casadi/core/sparsity.hpp +include/casadi/core/sparsity_interface.hpp +include/casadi/core/submatrix.hpp +include/casadi/core/sx.hpp +include/casadi/core/sx_elem.hpp +include/casadi/core/timing.hpp +include/casadi/core/variable.hpp +include/casadi/core/xml_file.hpp +include/casadi/core/xml_node.hpp +include/casadi/mem.h +lib/cmake/casadi/casadi-config-version.cmake +lib/cmake/casadi/casadi-config.cmake +lib/cmake/casadi/casadi-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/casadi/casadi-targets.cmake +lib/libcasadi.so +lib/libcasadi.so.3.5 +lib/libcasadi_conic_nlpsol.so +lib/libcasadi_conic_nlpsol.so.3.5 +%%QPOASES%%lib/libcasadi_conic_qpoases.so +%%QPOASES%%lib/libcasadi_conic_qpoases.so.3.5 +lib/libcasadi_conic_qrqp.so +lib/libcasadi_conic_qrqp.so.3.5 +lib/libcasadi_importer_shell.so +lib/libcasadi_importer_shell.so.3.5 +lib/libcasadi_integrator_collocation.so +lib/libcasadi_integrator_collocation.so.3.5 +lib/libcasadi_integrator_cvodes.so +lib/libcasadi_integrator_cvodes.so.3.5 +lib/libcasadi_integrator_idas.so +lib/libcasadi_integrator_idas.so.3.5 +lib/libcasadi_integrator_rk.so +lib/libcasadi_integrator_rk.so.3.5 +lib/libcasadi_interpolant_bspline.so +lib/libcasadi_interpolant_bspline.so.3.5 +lib/libcasadi_interpolant_linear.so +lib/libcasadi_interpolant_linear.so.3.5 +lib/libcasadi_linsol_csparse.so +lib/libcasadi_linsol_csparse.so.3.5 +lib/libcasadi_linsol_csparsecholesky.so +lib/libcasadi_linsol_csparsecholesky.so.3.5 +%%LAPACK%%lib/libcasadi_linsol_lapacklu.so +%%LAPACK%%lib/libcasadi_linsol_lapacklu.so.3.5 +%%LAPACK%%lib/libcasadi_linsol_lapackqr.so +%%LAPACK%%lib/libcasadi_linsol_lapackqr.so.3.5 +lib/libcasadi_linsol_ldl.so +lib/libcasadi_linsol_ldl.so.3.5 +lib/libcasadi_linsol_lsqr.so +lib/libcasadi_linsol_lsqr.so.3.5 +lib/libcasadi_linsol_qr.so +lib/libcasadi_linsol_qr.so.3.5 +lib/libcasadi_linsol_symbolicqr.so +lib/libcasadi_linsol_symbolicqr.so.3.5 +%%BONMIN%%lib/libcasadi_nlpsol_bonmin.so +%%BONMIN%%lib/libcasadi_nlpsol_bonmin.so.3.5 +%%IPOPT%%lib/libcasadi_nlpsol_ipopt.so +%%IPOPT%%lib/libcasadi_nlpsol_ipopt.so.3.5 +lib/libcasadi_nlpsol_scpgen.so +lib/libcasadi_nlpsol_scpgen.so.3.5 +lib/libcasadi_nlpsol_sqpmethod.so +lib/libcasadi_nlpsol_sqpmethod.so.3.5 +lib/libcasadi_rootfinder_fast_newton.so +lib/libcasadi_rootfinder_fast_newton.so.3.5 +lib/libcasadi_rootfinder_kinsol.so +lib/libcasadi_rootfinder_kinsol.so.3.5 +lib/libcasadi_rootfinder_newton.so +lib/libcasadi_rootfinder_newton.so.3.5 +lib/libcasadi_rootfinder_nlpsol.so +lib/libcasadi_rootfinder_nlpsol.so.3.5 +lib/libcasadi_sundials_common.so +lib/libcasadi_sundials_common.so.3.5 +lib/libcasadi_xmlfile_tinyxml.so +lib/libcasadi_xmlfile_tinyxml.so.3.5 diff --git a/math/couenne/Makefile b/math/couenne/Makefile new file mode 100644 index 000000000000..0112c36f187a --- /dev/null +++ b/math/couenne/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= couenne +DISTVERSIONPREFIX= releases/ +DISTVERSION= 0.5.7 +CATEGORIES= math +PKGNAMEPREFIX= coin-or- + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Convex Over and Under Envelopes for NonliNear Estimation + +LICENSE= EPL +LICENSE_FILE= ${WRKSRC}/Couenne/LICENSE + +LIB_DEPENDS= libbonmin.so:math/bonmin \ + libCbc.so:math/coinmp \ + libipopt.so:math/ipopt + +USES= blaslapack:netlib fortran gmake libtool pkgconfig +GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= coin-or +GH_PROJECT= Couenne +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip + +.include <bsd.port.mk> diff --git a/math/couenne/distinfo b/math/couenne/distinfo new file mode 100644 index 000000000000..726b2276bf27 --- /dev/null +++ b/math/couenne/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566695137 +SHA256 (coin-or-Couenne-releases-0.5.7_GH0.tar.gz) = 61e3d1ccfff545d509261ecb5867ac4aeb12cf03a27011b926475ef60066901c +SIZE (coin-or-Couenne-releases-0.5.7_GH0.tar.gz) = 1320614 diff --git a/math/couenne/pkg-descr b/math/couenne/pkg-descr new file mode 100644 index 000000000000..9bbeebe352a7 --- /dev/null +++ b/math/couenne/pkg-descr @@ -0,0 +1,5 @@ +Couenne (Convex Over and Under ENvelopes for Nonlinear Estimation) is +a branch&bound algorithm to solve Mixed-Integer Nonlinear Programming (MINLP) +problems. + +WWW: https://projects.coin-or.org/Couenne diff --git a/math/couenne/pkg-plist b/math/couenne/pkg-plist new file mode 100644 index 000000000000..a1372d02b292 --- /dev/null +++ b/math/couenne/pkg-plist @@ -0,0 +1,92 @@ +include/coin/BonCouenneInfo.hpp +include/coin/BonCouenneInterface.hpp +include/coin/BonCouenneSetup.hpp +include/coin/BonInitHeuristic.hpp +include/coin/BonNlpHeuristic.hpp +include/coin/CouExpr.hpp +include/coin/CouenneAggrProbing.hpp +include/coin/CouenneBTPerfIndicator.hpp +include/coin/CouenneBab.hpp +include/coin/CouenneBranchingObject.hpp +include/coin/CouenneChooseStrong.hpp +include/coin/CouenneChooseVariable.hpp +include/coin/CouenneComplBranchingObject.hpp +include/coin/CouenneComplObject.hpp +include/coin/CouenneConfig.h +include/coin/CouenneCrossConv.hpp +include/coin/CouenneCutGenerator.hpp +include/coin/CouenneDepGraph.hpp +include/coin/CouenneDisjCuts.hpp +include/coin/CouenneDomain.hpp +include/coin/CouenneExprAbs.hpp +include/coin/CouenneExprAux.hpp +include/coin/CouenneExprBCos.hpp +include/coin/CouenneExprBDiv.hpp +include/coin/CouenneExprBMul.hpp +include/coin/CouenneExprBSin.hpp +include/coin/CouenneExprBound.hpp +include/coin/CouenneExprClone.hpp +include/coin/CouenneExprConst.hpp +include/coin/CouenneExprCopy.hpp +include/coin/CouenneExprCos.hpp +include/coin/CouenneExprDiv.hpp +include/coin/CouenneExprExp.hpp +include/coin/CouenneExprGroup.hpp +include/coin/CouenneExprHess.hpp +include/coin/CouenneExprIVar.hpp +include/coin/CouenneExprIf.hpp +include/coin/CouenneExprInv.hpp +include/coin/CouenneExprJac.hpp +include/coin/CouenneExprLog.hpp +include/coin/CouenneExprMax.hpp +include/coin/CouenneExprMin.hpp +include/coin/CouenneExprMul.hpp +include/coin/CouenneExprNorm.hpp +include/coin/CouenneExprOp.hpp +include/coin/CouenneExprOpp.hpp +include/coin/CouenneExprPWLinear.hpp +include/coin/CouenneExprPow.hpp +include/coin/CouenneExprQuad.hpp +include/coin/CouenneExprSin.hpp +include/coin/CouenneExprStore.hpp +include/coin/CouenneExprSub.hpp +include/coin/CouenneExprSum.hpp +include/coin/CouenneExprTrilinear.hpp +include/coin/CouenneExprUnary.hpp +include/coin/CouenneExprVar.hpp +include/coin/CouenneExpression.hpp +include/coin/CouenneFeasPump.hpp +include/coin/CouenneFixPoint.hpp +include/coin/CouenneFunTriplets.hpp +include/coin/CouenneGlobalCutOff.hpp +include/coin/CouenneJournalist.hpp +include/coin/CouenneLQelems.hpp +include/coin/CouenneMINLPInterface.hpp +include/coin/CouenneMatrix.hpp +include/coin/CouenneObject.hpp +include/coin/CouenneOrbitBranchingObj.hpp +include/coin/CouenneOrbitObj.hpp +include/coin/CouennePSDcon.hpp +include/coin/CouennePrecisions.hpp +include/coin/CouenneProblem.hpp +include/coin/CouenneProblemElem.hpp +include/coin/CouenneProjections.hpp +include/coin/CouenneRecordBestSol.hpp +include/coin/CouenneRootQ.hpp +include/coin/CouenneSOSObject.hpp +include/coin/CouenneSdpCuts.hpp +include/coin/CouenneSolverInterface.hpp +include/coin/CouenneTNLP.hpp +include/coin/CouenneThreeWayBranchObj.hpp +include/coin/CouenneTwoImplied.hpp +include/coin/CouenneTypes.hpp +include/coin/CouenneVTObject.hpp +include/coin/CouenneVarObject.hpp +lib/libCouenne.so +lib/libCouenne.so.1 +lib/libCouenne.so.1.4.7 +libdata/pkgconfig/couenne.pc +share/coin/doc/Couenne/AUTHORS +share/coin/doc/Couenne/LICENSE +share/coin/doc/Couenne/README +share/coin/doc/Couenne/couenne_addlibs.txt diff --git a/math/cppad/Makefile b/math/cppad/Makefile new file mode 100644 index 000000000000..6e21d70b5ba6 --- /dev/null +++ b/math/cppad/Makefile @@ -0,0 +1,22 @@ +# $FreeBSD$ + +PORTNAME= cppad +DISTVERSION= 20190200.4 +CATEGORIES= math +PKGNAMEPREFIX= coin-or- + +MAINTAINER= yuri@FreeBSD.org +COMMENT= C++ Algorithmic Differentiation package + +LICENSE= EPL + +USES= cmake eigen:3,run +USE_GITHUB= yes +GH_ACCOUNT= coin-or +GH_PROJECT= CppAD + +CMAKE_ARGS= -Dcppad_prefix=${PREFIX} + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/math/cppad/distinfo b/math/cppad/distinfo new file mode 100644 index 000000000000..7f5a59b89659 --- /dev/null +++ b/math/cppad/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566716449 +SHA256 (coin-or-CppAD-20190200.4_GH0.tar.gz) = 6b50da5918bb10b3921792adfc9331b737c4a08aa608512345ffbcc83f7de808 +SIZE (coin-or-CppAD-20190200.4_GH0.tar.gz) = 1510909 diff --git a/math/cppad/pkg-descr b/math/cppad/pkg-descr new file mode 100644 index 000000000000..2633b96c4977 --- /dev/null +++ b/math/cppad/pkg-descr @@ -0,0 +1,4 @@ +CppAD (C++ algorithmic differentiation package) computes derivative values from +an algorithm that computes function values. + +WWW: https://coin-or.github.io/CppAD/doc/cppad.htm diff --git a/math/cppad/pkg-plist b/math/cppad/pkg-plist new file mode 100644 index 000000000000..aa3daeb83b06 --- /dev/null +++ b/math/cppad/pkg-plist @@ -0,0 +1,312 @@ +include/cppad/base_require.hpp +include/cppad/configure.hpp +include/cppad/core/abort_recording.hpp +include/cppad/core/abs.hpp +include/cppad/core/abs_normal_fun.hpp +include/cppad/core/acosh.hpp +include/cppad/core/ad.hpp +include/cppad/core/ad_assign.hpp +include/cppad/core/ad_binary.hpp +include/cppad/core/ad_ctor.hpp +include/cppad/core/ad_fun.hpp +include/cppad/core/ad_io.hpp +include/cppad/core/ad_to_string.hpp +include/cppad/core/ad_type.hpp +include/cppad/core/ad_valued.hpp +include/cppad/core/add.hpp +include/cppad/core/add_eq.hpp +include/cppad/core/arithmetic.hpp +include/cppad/core/asinh.hpp +include/cppad/core/atan2.hpp +include/cppad/core/atanh.hpp +include/cppad/core/atomic/atomic_one.hpp +include/cppad/core/atomic/atomic_three.hpp +include/cppad/core/atomic/atomic_two.hpp +include/cppad/core/atomic/three_afun.hpp +include/cppad/core/atomic/three_ctor.hpp +include/cppad/core/atomic/three_for_type.hpp +include/cppad/core/atomic/three_forward.hpp +include/cppad/core/atomic/three_hes_sparsity.hpp +include/cppad/core/atomic/three_jac_sparsity.hpp +include/cppad/core/atomic/three_rev_depend.hpp +include/cppad/core/atomic/three_reverse.hpp +include/cppad/core/atomic/two_afun.hpp +include/cppad/core/atomic/two_clear.hpp +include/cppad/core/atomic/two_ctor.hpp +include/cppad/core/atomic/two_for_sparse_hes.hpp +include/cppad/core/atomic/two_for_sparse_jac.hpp +include/cppad/core/atomic/two_forward.hpp +include/cppad/core/atomic/two_option.hpp +include/cppad/core/atomic/two_rev_depend.hpp +include/cppad/core/atomic/two_rev_sparse_hes.hpp +include/cppad/core/atomic/two_rev_sparse_jac.hpp +include/cppad/core/atomic/two_reverse.hpp +include/cppad/core/azmul.hpp +include/cppad/core/base2ad.hpp +include/cppad/core/base_complex.hpp +include/cppad/core/base_cond_exp.hpp +include/cppad/core/base_double.hpp +include/cppad/core/base_float.hpp +include/cppad/core/base_hash.hpp +include/cppad/core/base_limits.hpp +include/cppad/core/base_std_math.hpp +include/cppad/core/base_to_string.hpp +include/cppad/core/bender_quad.hpp +include/cppad/core/bool_fun.hpp +include/cppad/core/bool_valued.hpp +include/cppad/core/capacity_order.hpp +include/cppad/core/check_for_nan.hpp +include/cppad/core/chkpoint_one/chkpoint_one.hpp +include/cppad/core/chkpoint_one/ctor.hpp +include/cppad/core/chkpoint_one/for_sparse_jac.hpp +include/cppad/core/chkpoint_one/forward.hpp +include/cppad/core/chkpoint_one/rev_sparse_hes.hpp +include/cppad/core/chkpoint_one/rev_sparse_jac.hpp +include/cppad/core/chkpoint_one/reverse.hpp +include/cppad/core/chkpoint_one/set_hes_sparse_bool.hpp +include/cppad/core/chkpoint_one/set_hes_sparse_set.hpp +include/cppad/core/chkpoint_one/set_jac_sparse_bool.hpp +include/cppad/core/chkpoint_one/set_jac_sparse_set.hpp +include/cppad/core/chkpoint_two/chkpoint_two.hpp +include/cppad/core/chkpoint_two/ctor.hpp +include/cppad/core/chkpoint_two/dynamic.hpp +include/cppad/core/chkpoint_two/for_type.hpp +include/cppad/core/chkpoint_two/forward.hpp +include/cppad/core/chkpoint_two/hes_sparsity.hpp +include/cppad/core/chkpoint_two/jac_sparsity.hpp +include/cppad/core/chkpoint_two/rev_depend.hpp +include/cppad/core/chkpoint_two/reverse.hpp +include/cppad/core/compare.hpp +include/cppad/core/compound_assign.hpp +include/cppad/core/con_dyn_var.hpp +include/cppad/core/cond_exp.hpp +include/cppad/core/convert.hpp +include/cppad/core/cppad_assert.hpp +include/cppad/core/dependent.hpp +include/cppad/core/discrete.hpp +include/cppad/core/div.hpp +include/cppad/core/div_eq.hpp +include/cppad/core/drivers.hpp +include/cppad/core/epsilon.hpp +include/cppad/core/equal_op_seq.hpp +include/cppad/core/erf.hpp +include/cppad/core/expm1.hpp +include/cppad/core/for_hes_sparsity.hpp +include/cppad/core/for_jac_sparsity.hpp +include/cppad/core/for_one.hpp +include/cppad/core/for_sparse_hes.hpp +include/cppad/core/for_sparse_jac.hpp +include/cppad/core/for_two.hpp +include/cppad/core/forward.hpp +include/cppad/core/fun_check.hpp +include/cppad/core/fun_construct.hpp +include/cppad/core/fun_eval.hpp +include/cppad/core/hash_code.hpp +include/cppad/core/hessian.hpp +include/cppad/core/identical.hpp +include/cppad/core/independent.hpp +include/cppad/core/integer.hpp +include/cppad/core/jacobian.hpp +include/cppad/core/log1p.hpp +include/cppad/core/lu_ratio.hpp +include/cppad/core/mul.hpp +include/cppad/core/mul_eq.hpp +include/cppad/core/near_equal_ext.hpp +include/cppad/core/new_dynamic.hpp +include/cppad/core/num_skip.hpp +include/cppad/core/numeric_limits.hpp +include/cppad/core/omp_max_thread.hpp +include/cppad/core/opt_val_hes.hpp +include/cppad/core/optimize.hpp +include/cppad/core/ordered.hpp +include/cppad/core/parallel_ad.hpp +include/cppad/core/pow.hpp +include/cppad/core/print_for.hpp +include/cppad/core/rev_hes_sparsity.hpp +include/cppad/core/rev_jac_sparsity.hpp +include/cppad/core/rev_one.hpp +include/cppad/core/rev_sparse_hes.hpp +include/cppad/core/rev_sparse_jac.hpp +include/cppad/core/rev_two.hpp +include/cppad/core/reverse.hpp +include/cppad/core/sign.hpp +include/cppad/core/sparse.hpp +include/cppad/core/sparse_hes.hpp +include/cppad/core/sparse_hessian.hpp +include/cppad/core/sparse_jac.hpp +include/cppad/core/sparse_jacobian.hpp +include/cppad/core/standard_math.hpp +include/cppad/core/std_math_98.hpp +include/cppad/core/sub.hpp +include/cppad/core/sub_eq.hpp +include/cppad/core/subgraph_jac_rev.hpp +include/cppad/core/subgraph_reverse.hpp +include/cppad/core/subgraph_sparsity.hpp +include/cppad/core/tape_link.hpp +include/cppad/core/test_vector.hpp +include/cppad/core/testvector.hpp +include/cppad/core/unary_minus.hpp +include/cppad/core/unary_plus.hpp +include/cppad/core/undef.hpp +include/cppad/core/user_ad.hpp +include/cppad/core/value.hpp +include/cppad/core/var2par.hpp +include/cppad/core/vec_ad.hpp +include/cppad/core/zdouble.hpp +include/cppad/cppad.hpp +include/cppad/example/base_adolc.hpp +include/cppad/example/cppad_eigen.hpp +include/cppad/example/eigen_cholesky.hpp +include/cppad/example/eigen_mat_inv.hpp +include/cppad/example/eigen_mat_mul.hpp +include/cppad/example/eigen_plugin.hpp +include/cppad/example/mat_mul.hpp +include/cppad/ipopt/solve.hpp +include/cppad/ipopt/solve_callback.hpp +include/cppad/ipopt/solve_result.hpp +include/cppad/local/abs_op.hpp +include/cppad/local/acos_op.hpp +include/cppad/local/acosh_op.hpp +include/cppad/local/ad_tape.hpp +include/cppad/local/add_op.hpp +include/cppad/local/asin_op.hpp +include/cppad/local/asinh_op.hpp +include/cppad/local/atan_op.hpp +include/cppad/local/atanh_op.hpp +include/cppad/local/atom_state.hpp +include/cppad/local/atomic_index.hpp +include/cppad/local/color_general.hpp +include/cppad/local/color_symmetric.hpp +include/cppad/local/comp_op.hpp +include/cppad/local/cond_op.hpp +include/cppad/local/cos_op.hpp +include/cppad/local/cosh_op.hpp +include/cppad/local/cppad_colpack.hpp +include/cppad/local/cskip_op.hpp +include/cppad/local/csum_op.hpp +include/cppad/local/declare_ad.hpp +include/cppad/local/define.hpp +include/cppad/local/discrete_op.hpp +include/cppad/local/div_op.hpp +include/cppad/local/erf_op.hpp +include/cppad/local/exp_op.hpp +include/cppad/local/expm1_op.hpp +include/cppad/local/hash_code.hpp +include/cppad/local/independent.hpp +include/cppad/local/is_pod.hpp +include/cppad/local/load_op.hpp +include/cppad/local/log1p_op.hpp +include/cppad/local/log_op.hpp +include/cppad/local/mul_op.hpp +include/cppad/local/op.hpp +include/cppad/local/op_code.hpp +include/cppad/local/op_code_dyn.hpp +include/cppad/local/optimize/cexp_info.hpp +include/cppad/local/optimize/csum_op_info.hpp +include/cppad/local/optimize/csum_stacks.hpp +include/cppad/local/optimize/get_cexp_info.hpp +include/cppad/local/optimize/get_dyn_previous.hpp +include/cppad/local/optimize/get_op_previous.hpp +include/cppad/local/optimize/get_op_usage.hpp +include/cppad/local/optimize/get_par_usage.hpp +include/cppad/local/optimize/hash_code.hpp +include/cppad/local/optimize/match_op.hpp +include/cppad/local/optimize/optimize_run.hpp +include/cppad/local/optimize/record_csum.hpp +include/cppad/local/optimize/record_pv.hpp +include/cppad/local/optimize/record_vp.hpp +include/cppad/local/optimize/record_vv.hpp +include/cppad/local/optimize/size_pair.hpp +include/cppad/local/optimize/usage.hpp +include/cppad/local/parameter_op.hpp +include/cppad/local/play/addr_enum.hpp +include/cppad/local/play/atom_op_info.hpp +include/cppad/local/play/player.hpp +include/cppad/local/play/random_iterator.hpp +include/cppad/local/play/random_setup.hpp +include/cppad/local/play/sequential_iterator.hpp +include/cppad/local/play/subgraph_iterator.hpp +include/cppad/local/pod_vector.hpp +include/cppad/local/pow_op.hpp +include/cppad/local/print_op.hpp +include/cppad/local/prototype_op.hpp +include/cppad/local/recorder.hpp +include/cppad/local/set_get_in_parallel.hpp +include/cppad/local/sign_op.hpp +include/cppad/local/sin_op.hpp +include/cppad/local/sinh_op.hpp +include/cppad/local/sparse_binary_op.hpp +include/cppad/local/sparse_internal.hpp +include/cppad/local/sparse_list.hpp +include/cppad/local/sparse_pack.hpp +include/cppad/local/sparse_sizevec.hpp +include/cppad/local/sparse_unary_op.hpp +include/cppad/local/sqrt_op.hpp +include/cppad/local/std_set.hpp +include/cppad/local/store_op.hpp +include/cppad/local/sub_op.hpp +include/cppad/local/subgraph/arg_variable.hpp +include/cppad/local/subgraph/entire_call.hpp +include/cppad/local/subgraph/get_rev.hpp +include/cppad/local/subgraph/info.hpp +include/cppad/local/subgraph/init_rev.hpp +include/cppad/local/subgraph/sparsity.hpp +include/cppad/local/sweep/call_atomic.hpp +include/cppad/local/sweep/dynamic.hpp +include/cppad/local/sweep/for_hes.hpp +include/cppad/local/sweep/for_jac.hpp +include/cppad/local/sweep/forward0.hpp +include/cppad/local/sweep/forward1.hpp +include/cppad/local/sweep/forward2.hpp +include/cppad/local/sweep/rev_hes.hpp +include/cppad/local/sweep/rev_jac.hpp +include/cppad/local/sweep/reverse.hpp +include/cppad/local/tan_op.hpp +include/cppad/local/tanh_op.hpp +include/cppad/local/zmul_op.hpp +include/cppad/speed/det_33.hpp +include/cppad/speed/det_by_lu.hpp +include/cppad/speed/det_by_minor.hpp +include/cppad/speed/det_grad_33.hpp +include/cppad/speed/det_of_minor.hpp +include/cppad/speed/mat_sum_sq.hpp +include/cppad/speed/ode_evaluate.hpp +include/cppad/speed/sparse_hes_fun.hpp +include/cppad/speed/sparse_jac_fun.hpp +include/cppad/speed/uniform_01.hpp +include/cppad/utility.hpp +include/cppad/utility/check_numeric_type.hpp +include/cppad/utility/check_simple_vector.hpp +include/cppad/utility/elapsed_seconds.hpp +include/cppad/utility/error_handler.hpp +include/cppad/utility/index_sort.hpp +include/cppad/utility/lu_factor.hpp +include/cppad/utility/lu_invert.hpp +include/cppad/utility/lu_solve.hpp +include/cppad/utility/memory_leak.hpp +include/cppad/utility/nan.hpp +include/cppad/utility/near_equal.hpp +include/cppad/utility/ode_err_control.hpp +include/cppad/utility/ode_gear.hpp +include/cppad/utility/ode_gear_control.hpp +include/cppad/utility/omp_alloc.hpp +include/cppad/utility/poly.hpp +include/cppad/utility/pow_int.hpp +include/cppad/utility/romberg_mul.hpp +include/cppad/utility/romberg_one.hpp +include/cppad/utility/rosen_34.hpp +include/cppad/utility/runge_45.hpp +include/cppad/utility/set_union.hpp +include/cppad/utility/sparse2eigen.hpp +include/cppad/utility/sparse_rc.hpp +include/cppad/utility/sparse_rcv.hpp +include/cppad/utility/speed_test.hpp +include/cppad/utility/test_boolofvoid.hpp +include/cppad/utility/thread_alloc.hpp +include/cppad/utility/time_test.hpp +include/cppad/utility/to_string.hpp +include/cppad/utility/track_new_del.hpp +include/cppad/utility/vector.hpp +include/cppad/wno_conversion.hpp +libdata/pkgconfig/cppad.pc +share/pkgconfig/cppad.pc diff --git a/math/diehard/Makefile b/math/diehard/Makefile index 259bdc40004c..30bf0531cc59 100644 --- a/math/diehard/Makefile +++ b/math/diehard/Makefile @@ -3,6 +3,7 @@ PORTNAME= diehard PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://stat.fsu.edu/pub/diehard/ DISTNAME= die-c diff --git a/math/diehard/files/patch-cdbday.c b/math/diehard/files/patch-cdbday.c new file mode 100644 index 000000000000..f49eaf5df2d5 --- /dev/null +++ b/math/diehard/files/patch-cdbday.c @@ -0,0 +1,31 @@ +--- cdbday.c.orig 2019-08-03 11:00:43 UTC ++++ cdbday.c +@@ -83,8 +83,8 @@ void bday(char *filename) + puts("\t|------------------------------------------------------------ |\n"); + + printf("\t\tRESULTS OF BIRTHDAY SPACINGS TEST FOR %s\n", filename); +- printf("\t(no_bdays=%d, no_days/yr=2^%d,",no_bday, no_bits); +- printf(" lambda=%.2f, sample size=%d)\n\n", lambda, no_obs); ++ printf("\t(no_bdays=%lu, no_days/yr=2^%lu,",no_bday, no_bits); ++ printf(" lambda=%.2f, sample size=%lu)\n\n", lambda, no_obs); + printf("\tBits used\tmean\t\tchisqr\t\tp-value\n"); + + obs=(counter*)malloc(no_obs*sizeof(counter)); +@@ -121,7 +121,7 @@ void bday(char *filename) + + p[rt]=P_fit(lambda, obs, no_obs); + +- printf("\t %d to %d", 33-no_bits-rt,32-rt); ++ printf("\t %lu to %d", 33-no_bits-rt,32-rt); + printf("\t%.2f\t\t%.4f\t\t%f\n", (real)sum/no_obs, chi_fit, p[rt]); + + } +@@ -134,7 +134,7 @@ void bday(char *filename) + + printf("\n\t\t\tdegree of freedoms is: %d\n", dgf); + puts("\t---------------------------------------------------------------"); +- printf("\t\tp-value for KStest on those %d p-values: %f",32-no_bits+1,pvalue); ++ printf("\t\tp-value for KStest on those %lu p-values: %f",32-no_bits+1,pvalue); + puts("\n"); + + free(p); diff --git a/math/diehard/files/patch-cdbinrnk.c b/math/diehard/files/patch-cdbinrnk.c new file mode 100644 index 000000000000..69d00a34d8e0 --- /dev/null +++ b/math/diehard/files/patch-cdbinrnk.c @@ -0,0 +1,20 @@ +--- cdbinrnk.c.orig 2019-08-03 09:50:12 UTC ++++ cdbinrnk.c +@@ -13,6 +13,8 @@ typedef struct binmatrix { + + } binmatrix; + ++#include <string.h> ++ + /*print the title*/ + void rnk_ttl(char *fn, char *test) + { +@@ -162,7 +164,7 @@ real rnk_stat(char *fn, counter no_mtr, + Ef=no_mtr* ( *(p+i) ); + tmp=(f[i]-Ef)*(f[i]-Ef)/Ef; + chsq+=tmp; +- printf("\t%s%d\t%-12d\t%-12.1f", cat[MIN(1,i)], i+llim, f[i], Ef); ++ printf("\t%s%lu\t%-12lu\t%-12.1f", cat[MIN(1,i)], i+llim, f[i], Ef); + printf("\t%-12.3f\t%-12.3f\n", tmp, chsq); + } + uni("close"); diff --git a/math/diehard/files/patch-cdbitst.c b/math/diehard/files/patch-cdbitst.c new file mode 100644 index 000000000000..bef849517aab --- /dev/null +++ b/math/diehard/files/patch-cdbitst.c @@ -0,0 +1,22 @@ +--- cdbitst.c.orig 2019-08-03 10:34:33 UTC ++++ cdbitst.c +@@ -41,8 +41,8 @@ void bitst(char *filename) + puts("\t|-------------------------------------------------------------|\n"); + + printf("\t\tTHE OVERLAPPING 20-TUPLES BITSTREAM TEST for %s\n", filename); +- printf("\t (%d bits/word, %d words", nb_pw, no_wds); +- printf(" %d bitstreams.", no_obs ); ++ printf("\t (%lu bits/word, %lu words", nb_pw, no_wds); ++ printf(" %lu bitstreams.", no_obs ); + printf(" No. missing words \n\t should average %.2f", mean); + printf(" with sigma=%.2f.)\n", std); + puts("\t----------------------------------------------------------------"); +@@ -80,7 +80,7 @@ void bitst(char *filename) + } + + z=(no_mswds-mean)/std; +- printf("\t %d\t\t%d \t\t\t% .2f\t\t%f\n", i, no_mswds, z, 1-Phi(z)); ++ printf("\t %lu\t\t%lu \t\t\t% .2f\t\t%f\n", i, no_mswds, z, 1-Phi(z)); + } + + uni("close"); diff --git a/math/diehard/files/patch-cdomso.c b/math/diehard/files/patch-cdomso.c index 154111f8d6e5..319ee6f56227 100644 --- a/math/diehard/files/patch-cdomso.c +++ b/math/diehard/files/patch-cdomso.c @@ -1,11 +1,34 @@ ---- cdomso.c.orig 1998-04-02 15:29:02 UTC +--- cdomso.c.orig 2019-08-03 10:18:08 UTC +++ cdomso.c -@@ -89,7 +89,7 @@ unsigned long get_w(char *fn, short bits - } +@@ -138,7 +138,7 @@ real monky_stat(char *filename, char *te + } + z=(no_mswds-mean)/std; +- printf("\t%d to %d \t\t%d ", 33-rt-bits_pl, 32-rt, no_mswds); ++ printf("\t%lu to %lu \t\t%lu ", 33-rt-bits_pl, 32-rt, no_mswds); + printf("\t\t% .4f\t\t%f\n", z, 1-Phi(z)); + } + +@@ -151,11 +151,11 @@ real monky_stat(char *filename, char *te + printf("\t------------------------------"); + printf("-----------------------------------\n"); + +- return; ++ return 0; + } --real monky_stat(char *filename, char *test, int no_tests) -+void monky_stat(char *filename, char *test, int no_tests) + /* type "OPSO" for OPSO test and so on */ +-void monky(char *filename, char *test) ++int monky(char *filename, char *test) { - const real bits_pw=20, mean=pow(2, bits_pw)*exp(-2); - const counter dim=pow(2, bits_pw-5); + const int no_tests=1; + +@@ -165,7 +165,7 @@ void monky(char *filename, char *test) + + monky_stat(filename, test, no_tests); + +- return; ++ return 0; + + } + diff --git a/math/diehard/files/patch-cdoperm5.c b/math/diehard/files/patch-cdoperm5.c new file mode 100644 index 000000000000..4aecb4c1f2b6 --- /dev/null +++ b/math/diehard/files/patch-cdoperm5.c @@ -0,0 +1,27 @@ +--- cdoperm5.c.orig 2019-08-03 10:52:40 UTC ++++ cdoperm5.c +@@ -71,21 +71,21 @@ void operm5(char *filename) + puts("\t|rank 99). This version uses 1,000,000 integers, twice. |"); + puts("\t|-------------------------------------------------------------|\n"); + +- printf("\t\t\tOPERM5 test for file \n", filename); ++ printf("%s \t\t\tOPERM5 test for file \n", filename); + puts("\t\t (For samples of 1,000,000 consecutive 5-tuples)\n"); + + infile=fopen("operm5.cov", "r"); + + for(i=0; i<60; ++i){ + for(j=i; j<60; ++j){ +- fscanf(infile, "%d", &A[i][j]); ++ fscanf(infile, "%lu", &A[i][j]); + A[j][i]=A[i][j]; + } + } + + for(i=0; i<60; ++i){ + for(j=i; j<60; ++j){ +- fscanf(infile, "%d", &B[i][j]); ++ fscanf(infile, "%lu", &B[i][j]); + B[j][i]=B[i][j]; + } + } diff --git a/math/diehard/files/patch-cdosum.c b/math/diehard/files/patch-cdosum.c new file mode 100644 index 000000000000..8fa2b825088e --- /dev/null +++ b/math/diehard/files/patch-cdosum.c @@ -0,0 +1,20 @@ +--- cdosum.c.orig 2019-08-03 10:56:11 UTC ++++ cdosum.c +@@ -64,7 +64,7 @@ void osum(char *filename) + } + + pv[i-1]=KStest(p, no_num); +- printf("\t\t\t %d \t\t\t%f\n", i, pv[i-1]); ++ printf("\t\t\t %lu \t\t\t%f\n", i, pv[i-1]); + } + uni("close"); + +@@ -75,7 +75,7 @@ void osum(char *filename) + tmp=KStest(pv, no_obs); + free(pv); + +- printf("\t\tp-value for %d kstests on %d kstests:%f\n", no_obs, no_sum, tmp); ++ printf("\t\tp-value for %lu kstests on %lu kstests:%f\n", no_obs, no_sum, tmp); + + return; + } diff --git a/math/diehard/files/patch-cdpark.c b/math/diehard/files/patch-cdpark.c new file mode 100644 index 000000000000..0e1a133644ed --- /dev/null +++ b/math/diehard/files/patch-cdpark.c @@ -0,0 +1,36 @@ +--- cdpark.c.orig 2019-08-03 10:37:50 UTC ++++ cdpark.c +@@ -36,8 +36,8 @@ void park(char *filename) + puts("\t|ble, provides input to a KSTEST based on a sample of 10. |"); + puts("\t|-------------------------------------------------------------|\n"); + +- printf("\t\tCDPARK: result of %d tests on file %s\n", no_obs, filename); +- printf("\t (Of %d tries, the average no. of successes", no_trials); ++ printf("\t\tCDPARK: result of %lu tests on file %s\n", no_obs, filename); ++ printf("\t (Of %lu tries, the average no. of successes", no_trials); + printf(" should be \n\t %.1f with sigma=%.1f)\n\n", mu, sigma); + printf("\t No. succeses\t\tz-score\t\tp-value\n"); + +@@ -79,7 +79,7 @@ void park(char *filename) + z=(no_succ-mu)/sigma; + p[i-1]=1-Phi(z); + +- printf("\t\t%d\t\t% .4f\t\t%f\n", no_succ, z, p[i-1]); ++ printf("\t\t%lu\t\t% .4f\t\t%f\n", no_succ, z, p[i-1]); + } + uni("close"); + +@@ -88,11 +88,11 @@ void park(char *filename) + mean=(real)sum/no_obs; + var=(real)ss/no_obs-mean*mean; + +- printf("\t Square side=%d, avg. no. parked=%.2f", side, mean); ++ printf("\t Square side=%lu, avg. no. parked=%.2f", side, mean); + printf(" sample std.=%.2f\n", sqrt(var)); + + pvalue=KStest(p, no_obs); +- printf("\t p-value of the KSTEST for those %d", no_obs); ++ printf("\t p-value of the KSTEST for those %lu", no_obs); + printf(" p-values: %f\n\n", pvalue); + + return; diff --git a/math/diehard/files/patch-cnt1s b/math/diehard/files/patch-cnt1s new file mode 100644 index 000000000000..a7c0b648d066 --- /dev/null +++ b/math/diehard/files/patch-cnt1s @@ -0,0 +1,17 @@ +--- cnt1s.c.orig 2019-08-03 10:00:05 UTC ++++ cnt1s.c +@@ -1,4 +1,5 @@ + #include "header.h" ++#include <string.h> + + typedef enum {A,B,C,D,E} letters; + +@@ -192,7 +193,7 @@ void cnt1s(char *filename, char *test) + + cnt_ttl(filename, test); + +- printf("\t (Degrees of freedom: 5^4-5^3=2500; sample size: %d)\n\n", no_wds); ++ printf("\t (Degrees of freedom: 5^4-5^3=2500; sample size: %lu)\n\n", no_wds); + printf("\t%s\tchisquare\tz-score\t\tp-value\n", s); + + do{ diff --git a/math/diehard/files/patch-craptest.c b/math/diehard/files/patch-craptest.c new file mode 100644 index 000000000000..5a8fff5d3bbf --- /dev/null +++ b/math/diehard/files/patch-craptest.c @@ -0,0 +1,20 @@ +--- craptest.c.orig 2019-08-03 10:04:26 UTC ++++ craptest.c +@@ -77,7 +77,7 @@ void craptest(char *filename) + + printf("\t\tRESULTS OF CRAPS TEST FOR %s \n", filename); + printf("\tNo. of wins: Observed\tExpected\n"); +- printf("\t %d %f\n", no_win, mean); ++ printf("\t %lu %f\n", no_win, mean); + + pvalue_w=1-Phi(t); + printf("\t\tz-score=%6.3f, pvalue=%7.5f\n", t, pvalue_w); +@@ -93,7 +93,7 @@ void craptest(char *filename) + mean=no_games*Ef[i]; + t=(f[i]-mean)*(f[i]-mean)/mean; + sum+=t; +- printf("\t%d\t%d\t\t%.1f",i+1, f[i], mean); ++ printf("\t%lu\t%lu\t\t%.1f",i+1, f[i], mean); + printf("\t\t%.3f\t\t%.3f\n", t, sum); + } + diff --git a/math/diehard/files/patch-d3sphere.c b/math/diehard/files/patch-d3sphere.c new file mode 100644 index 000000000000..79ce1f730fe0 --- /dev/null +++ b/math/diehard/files/patch-d3sphere.c @@ -0,0 +1,20 @@ +--- d3sphere.c.orig 2019-08-03 10:59:28 UTC ++++ d3sphere.c +@@ -61,7 +61,7 @@ void sphere(char *filename) + + r3=dmin*sqrt(dmin); + p[i-1]=1-exp(-MIN(r3/30., 20)); +- printf("\t\t %d\t\t%.3f\t\t%f\n", i, r3, p[i-1]); ++ printf("\t\t %lu\t\t%.3f\t\t%f\n", i, r3, p[i-1]); + } + uni("close"); + +@@ -69,7 +69,7 @@ void sphere(char *filename) + + puts("\t--------------------------------------------------------------"); + pvalue=KStest(p,no_obs); +- printf("\t\tp-value for KS test on those %d p-values: %f", no_obs, pvalue); ++ printf("\t\tp-value for KS test on those %lu p-values: %f", no_obs, pvalue); + puts("\n"); + + free(p); diff --git a/math/diehard/files/patch-diehard.c b/math/diehard/files/patch-diehard.c index 3086a3d71247..3f237846c0ba 100644 --- a/math/diehard/files/patch-diehard.c +++ b/math/diehard/files/patch-diehard.c @@ -1,5 +1,14 @@ ---- diehard.c.orig 1998-04-02 15:29:40 UTC +--- diehard.c.orig 2019-09-01 17:00:11 UTC +++ diehard.c +@@ -117,7 +117,7 @@ void diehard() + + ungetc(c, stdin); + +- gets(fn); ++ fgets(fn,100,stdin); + + puts("\n\t\tHERE ARE YOUR CHOICES:\n"); + puts("\t\t1 Birthday Spacings"); @@ -153,5 +153,5 @@ main() { diehard(); diff --git a/math/exprtk/Makefile b/math/exprtk/Makefile index 2f4b67ddabee..f75ad854b327 100644 --- a/math/exprtk/Makefile +++ b/math/exprtk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= exprtk -DISTVERSION= g20190630 +DISTVERSION= g20190717 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= MIT USE_GITHUB= yes GH_ACCOUNT= ArashPartow -GH_TAGNAME= 7ccb123 +GH_TAGNAME= 6f0a967 NO_BUILD= yes NO_ARCH= yes @@ -21,4 +21,7 @@ PLIST_FILES= include/exprtk.hpp do-install: ${INSTALL_DATA} ${WRKSRC}/exprtk.hpp ${STAGEDIR}${PREFIX}/include +benchmark: + cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} pgo + .include <bsd.port.mk> diff --git a/math/exprtk/distinfo b/math/exprtk/distinfo index c9674b36e1a5..dba6cf1aecb4 100644 --- a/math/exprtk/distinfo +++ b/math/exprtk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563763240 -SHA256 (ArashPartow-exprtk-g20190630-7ccb123_GH0.tar.gz) = a86b5a80b22ec44bf4196228209e9fd2c92a471254e9216feb752723a5174bdb -SIZE (ArashPartow-exprtk-g20190630-7ccb123_GH0.tar.gz) = 1313655 +TIMESTAMP = 1567643872 +SHA256 (ArashPartow-exprtk-g20190717-6f0a967_GH0.tar.gz) = 7adfc227edd7d4f176ee23bbf355a6a46505e1ee3c3b6fcfb43b6a3331db1a62 +SIZE (ArashPartow-exprtk-g20190717-6f0a967_GH0.tar.gz) = 1316372 diff --git a/math/fityk/Makefile b/math/fityk/Makefile deleted file mode 100644 index e886fb806172..000000000000 --- a/math/fityk/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# Created by: ijliao -# $FreeBSD$ - -PORTNAME= fityk -PORTVERSION= 1.3.1 -DISTVERSIONPREFIX= v -PORTREVISION= 9 -CATEGORIES= math - -MAINTAINER= ports@FreeBSD.org -COMMENT= Free peak fitting software - -LICENSE= GPLv2 # (or later) -LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -BUILD_DEPENDS= boost-libs>=1.35:devel/boost-libs \ - swig3.0:devel/swig30 \ - gnuplot:math/gnuplot -RUN_DEPENDS= gnuplot:math/gnuplot - -USE_GITHUB= yes -GH_ACCOUNT= wojdyr -GH_PROJECT= xylib:xylib -GH_TAGNAME= v1.4:xylib - -USES= autoreconf compiler:c++11-lib desktop-file-utils gmake \ - libtool lua readline shared-mime-info -USE_CXXSTD= c++11 -USE_GNOME= gtk20 -USE_WX= 3.0 -WX_CONF_ARGS= absolute -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes -BINARY_ALIAS= swig=swig3.0 - -CFLAGS+= -D_GNU_SOURCE -CPPFLAGS+= -I${WRKDIR}/xylib-1.4 \ - -I${LOCALBASE}/include -LDFLAGS+= -L${WRKDIR}/xylib-1.4/xylib/.libs \ - -lpthread -lbz2 -lz -L${LOCALBASE}/lib - -PORTDOCS= * - -OPTIONS_DEFINE= DOCS PYTHON -OPTIONS_DEFAULT= PYTHON -OPTIONS_SUB= yes - -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -PYTHON_USES= python:2.7 -PYTHON_CONFIGURE_ENABLE= python - -post-patch: - @${REINPLACE_CMD} -e '/)\/html/s|^|#|' \ - ${WRKSRC}/Makefile.am - @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ - ${WRKSRC}/doc/fityk.1 - @${REINPLACE_CMD} -e '/XYLIB_USE_TR1_MEMORY/s| 1| 0|' \ - ${WRKDIR}/xylib-1.4/xylib/cache.h - -pre-configure: - @cd ${WRKDIR}/xylib-1.4 \ - && ${AUTORECONF} -f -i \ - && ${SH} ./configure --disable-shared --without-gui \ - CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \ - CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -pre-build: - @cd ${WRKDIR}/xylib-1.4 && ${DO_MAKE_BUILD} ${ALL_TARGET} - -post-build-DOCS-on: - @cd ${WRKSRC}/doc && ${DO_MAKE_BUILD} html - -post-install: - (cd ${WRKDIR}/xylib-1.4 && ${INSTALL_PROGRAM} xyconv \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKDIR}/xylib-1.4 && ${INSTALL_MAN} xyconv.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1) - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html \ - ${STAGEDIR}${DOCSDIR}) - @${LN} -sf ${DOCSDIR}/html ${STAGEDIR}${DATADIR} - -.include <bsd.port.mk> diff --git a/math/fityk/distinfo b/math/fityk/distinfo deleted file mode 100644 index 0a5bfd1c1d7c..000000000000 --- a/math/fityk/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1527906558 -SHA256 (wojdyr-fityk-v1.3.1_GH0.tar.gz) = ee80239e5744e508a9487377ae0a0e6da71bbc6f8777c01be82e01035ccdf3cf -SIZE (wojdyr-fityk-v1.3.1_GH0.tar.gz) = 952443 -SHA256 (wojdyr-xylib-v1.4_GH0.tar.gz) = 435b66a38dd4352c8abf9263119c83d9ec926700ef025b66045608e18095ea26 -SIZE (wojdyr-xylib-v1.4_GH0.tar.gz) = 262109 diff --git a/math/fityk/files/patch-fityk__eparser.cpp b/math/fityk/files/patch-fityk__eparser.cpp deleted file mode 100644 index 6a07e37aed83..000000000000 --- a/math/fityk/files/patch-fityk__eparser.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- fityk/eparser.cpp.orig 2015-05-25 17:42:29 UTC -+++ fityk/eparser.cpp -@@ -154,7 +154,7 @@ int get_function_narg(int op) - } - } - --bool is_function(int op) -+bool my_is_funcion(int op) - { - return get_function_narg(op) != 0; - } -@@ -878,7 +878,7 @@ void ExpressionParser::parse_expr(Lexer& - // check if this is closing bracket of func() - if (!opstack_.empty()) { - int top = opstack_.back(); -- if (is_function(top)) { -+ if (my_is_funcion(top)) { - pop_onto_que(); - int n = opstack_.back() + 1; - opstack_.pop_back(); -@@ -911,7 +911,7 @@ void ExpressionParser::parse_expr(Lexer& - lex.throw_syntax_error("unexpected ',' after '?'"); - // if we are here, opstack_.back() == OP_OPEN_ROUND - else if (opstack_.size() < 3 || -- !is_function(*(opstack_.end() - 2))) -+ !my_is_funcion(*(opstack_.end() - 2))) - lex.throw_syntax_error("',' outside of function"); - else - // don't pop OP_OPEN_ROUND from the stack diff --git a/math/fityk/files/patch-wxgui__ceria.cpp b/math/fityk/files/patch-wxgui__ceria.cpp deleted file mode 100644 index cc3e4a1e4c75..000000000000 --- a/math/fityk/files/patch-wxgui__ceria.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- wxgui/ceria.cpp.orig 2015-05-25 17:42:29 UTC -+++ wxgui/ceria.cpp -@@ -9,6 +9,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <cmath> -+#include <stdlib.h> - #include <assert.h> - #include <string.h> - #include <algorithm> diff --git a/math/fityk/pkg-descr b/math/fityk/pkg-descr deleted file mode 100644 index 58dbd466a5b3..000000000000 --- a/math/fityk/pkg-descr +++ /dev/null @@ -1,20 +0,0 @@ -Fityk is a program for nonlinear fitting of analytical functions -(especially peak-shaped) to data (usually experimental data). There are -also people using it only to display data or to remove baseline from -data. - -It is reported to be used in crystallography, chromatography, -photoluminescence, infrared and Raman spectroscopy and other fields. - -Fityk knows about common peak-shaped functions (Gaussian, Lorentzian, -Voigt, Pearson VII, bifurcated Gaussian, EMG, Doniach-Sunjic, etc.) and -polynomials. It also supports user-defined functions. - -Fityk offers intuitive graphical interface (and also command line -interface), variouse optimization methods (standard Marquardt -least-square algorithm, Genetic Algorithms, Nelder-Mead simplex), -equality constraints, modelling error of x coordinate of points (eg. -zero-shift of instrument), handling series of datasets, automation of -common tasks with scripts, and more. - -WWW: http://fityk.nieto.pl/ diff --git a/math/fityk/pkg-plist b/math/fityk/pkg-plist deleted file mode 100644 index c121389f0ff4..000000000000 --- a/math/fityk/pkg-plist +++ /dev/null @@ -1,35 +0,0 @@ -bin/cfityk -bin/fityk -bin/xyconv -include/fityk/fityk.h -include/fityk/ui_api.h -lib/libfityk.so -lib/libfityk.so.4 -lib/libfityk.so.4.0.0 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/_fityk.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/fityk.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/fityk.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/fityk.pyo -man/man1/fityk.1.gz -man/man1/xyconv.1.gz -share/applications/fityk.desktop -%%PORTDOCS%%%%DATADIR%%/html -%%DATADIR%%/samples/README -%%DATADIR%%/samples/SiC_Zn.dat -%%DATADIR%%/samples/SiC_Zn.fit -%%DATADIR%%/samples/cfityk.py -%%DATADIR%%/samples/enso.dat -%%DATADIR%%/samples/enso.fit -%%DATADIR%%/samples/hello.c -%%DATADIR%%/samples/hello.cc -%%DATADIR%%/samples/hello.java -%%DATADIR%%/samples/hello.lua -%%DATADIR%%/samples/hello.pl -%%DATADIR%%/samples/hello.py -%%DATADIR%%/samples/hello.rb -%%DATADIR%%/samples/nacl01.dat -%%DATADIR%%/samples/nacl01.fit -%%DATADIR%%/samples/read-shockley.fit -share/icons/hicolor/32x32/apps/fityk.png -share/icons/hicolor/scalable/apps/fityk.svg -share/mime/packages/fityk.xml diff --git a/math/g2o/Makefile b/math/g2o/Makefile index 65e6f5293420..99ad390a1140 100644 --- a/math/g2o/Makefile +++ b/math/g2o/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= g2o -DISTVERSION= 20170730_git-87 -DISTVERSIONSUFFIX= -gbbe3c2b -PORTREVISION= 5 +DISTVERSION= 20170730_git-239 +DISTVERSIONSUFFIX= -ge7b5b7a CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -13,9 +12,11 @@ LICENSE= LGPL3 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libcxsparse.so:math/suitesparse \ - libQGLViewer-qt5.so:graphics/libQGLViewer + libQGLViewer-qt5.so:graphics/libQGLViewer \ + libmetis.so:math/metis \ + libopenblas.so:math/openblas -USES= cmake compiler:c++11-lang gl eigen:3 qt:5 +USES= cmake compiler:c++11-lang gl eigen:3 blaslapack:netlib qt:5 USE_GITHUB= yes GH_ACCOUNT= RainerKuemmerle USE_GL= gl glu diff --git a/math/g2o/distinfo b/math/g2o/distinfo index c94ab397d653..216d0edb94dc 100644 --- a/math/g2o/distinfo +++ b/math/g2o/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522223932 -SHA256 (RainerKuemmerle-g2o-20170730_git-87-gbbe3c2b_GH0.tar.gz) = 35ff08910d775f5b9a9ee046b5372953ae9e9d4d12b96e0bf499be128f4aad79 -SIZE (RainerKuemmerle-g2o-20170730_git-87-gbbe3c2b_GH0.tar.gz) = 1576650 +TIMESTAMP = 1567401757 +SHA256 (RainerKuemmerle-g2o-20170730_git-239-ge7b5b7a_GH0.tar.gz) = ae558f3be63697d7d4b278595a420af0bdfdbdba0726753d797480a1769996fa +SIZE (RainerKuemmerle-g2o-20170730_git-239-ge7b5b7a_GH0.tar.gz) = 1585121 diff --git a/math/g2o/pkg-plist b/math/g2o/pkg-plist index a751bdd368e9..ae8a0ef089d4 100644 --- a/math/g2o/pkg-plist +++ b/math/g2o/pkg-plist @@ -1,5 +1,7 @@ bin/g2o bin/g2o_anonymize_observations +bin/g2o_incremental +bin/g2o_online bin/g2o_simulator2d bin/g2o_simulator3d bin/g2o_viewer @@ -99,7 +101,30 @@ include/g2o/core/sparse_block_matrix_ccs.h include/g2o/core/sparse_block_matrix_diagonal.h include/g2o/core/sparse_optimizer.h include/g2o/core/sparse_optimizer_terminate_action.h +include/g2o/examples/interactive_slam/g2o_incremental/g2o_incremental_api.h +include/g2o/examples/interactive_slam/g2o_incremental/graph_optimizer_sparse_incremental.h +include/g2o/examples/interactive_slam/g2o_incremental/linear_solver_cholmod_online.h +include/g2o/examples/interactive_slam/g2o_interactive/fast_output.h +include/g2o/examples/interactive_slam/g2o_interactive/g2o_interactive_api.h +include/g2o/examples/interactive_slam/g2o_interactive/g2o_slam_interface.h +include/g2o/examples/interactive_slam/g2o_interactive/graph_optimizer_sparse_online.h +include/g2o/examples/interactive_slam/g2o_interactive/types_slam2d_online.h +include/g2o/examples/interactive_slam/g2o_interactive/types_slam3d_online.h +include/g2o/examples/interactive_slam/slam_parser/interface/abstract_slam_interface.h +include/g2o/examples/interactive_slam/slam_parser/interface/parser_interface.h +include/g2o/examples/interactive_slam/slam_parser/interface/slam_context_interface.h +include/g2o/examples/interactive_slam/slam_parser/parser/FlexLexer.h +include/g2o/examples/interactive_slam/slam_parser/parser/bison_parser.h +include/g2o/examples/interactive_slam/slam_parser/parser/commands.h +include/g2o/examples/interactive_slam/slam_parser/parser/driver.h +include/g2o/examples/interactive_slam/slam_parser/parser/location.hh +include/g2o/examples/interactive_slam/slam_parser/parser/position.hh +include/g2o/examples/interactive_slam/slam_parser/parser/scanner.h +include/g2o/examples/interactive_slam/slam_parser/parser/slam_context.h +include/g2o/examples/interactive_slam/slam_parser/parser/stack.hh include/g2o/freeglut/freeglut_minimal.h +include/g2o/solvers/cholmod/linear_solver_cholmod.h +include/g2o/solvers/csparse/csparse_extension.h include/g2o/solvers/csparse/csparse_helper.h include/g2o/solvers/csparse/g2o_csparse_api.h include/g2o/solvers/csparse/g2o_csparse_extension_api.h @@ -189,6 +214,7 @@ include/g2o/types/slam3d/edge_se3_pointxyz.h include/g2o/types/slam3d/edge_se3_pointxyz_depth.h include/g2o/types/slam3d/edge_se3_pointxyz_disparity.h include/g2o/types/slam3d/edge_se3_prior.h +include/g2o/types/slam3d/edge_se3_xyzprior.h include/g2o/types/slam3d/edge_xyz_prior.h include/g2o/types/slam3d/g2o_types_slam3d_api.h include/g2o/types/slam3d/isometry3d_gradients.h @@ -214,26 +240,22 @@ include/g2o/types/slam3d_addons/types_slam3d_addons.h include/g2o/types/slam3d_addons/vertex_line3d.h include/g2o/types/slam3d_addons/vertex_plane.h include/g2o/types/slam3d_addons/vertex_se3_euler.h -include/slam_parser/interface/abstract_slam_interface.h -include/slam_parser/interface/parser_interface.h -include/slam_parser/interface/slam_context_interface.h -include/slam_parser/parser/FlexLexer.h -include/slam_parser/parser/bison_parser.h -include/slam_parser/parser/commands.h -include/slam_parser/parser/driver.h -include/slam_parser/parser/location.hh -include/slam_parser/parser/position.hh -include/slam_parser/parser/scanner.h -include/slam_parser/parser/slam_context.h -include/slam_parser/parser/stack.hh +lib/cmake/g2o/g2oConfig.cmake +lib/cmake/g2o/g2oConfigVersion.cmake +lib/cmake/g2o/g2oTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/g2o/g2oTargets.cmake lib/libg2o_cli.so lib/libg2o_core.so lib/libg2o_csparse_extension.so lib/libg2o_ext_freeglut_minimal.so +lib/libg2o_hierarchical.so +lib/libg2o_incremental.so +lib/libg2o_interactive.so lib/libg2o_interface.so lib/libg2o_opengl_helper.so lib/libg2o_parser.so lib/libg2o_simulator.so +lib/libg2o_solver_cholmod.so lib/libg2o_solver_csparse.so lib/libg2o_solver_dense.so lib/libg2o_solver_eigen.so diff --git a/math/geogram/Makefile b/math/geogram/Makefile index 9b548488d1c8..657cf8f03b74 100644 --- a/math/geogram/Makefile +++ b/math/geogram/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= geogram -DISTVERSION= 1.6.11 +DISTVERSIONPREFIX= v +DISTVERSION= 1.7.1 CATEGORIES= math -MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/37934/ -DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Programming library of geometric algorithms @@ -15,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/doc/devkit/license.dox LIB_DEPENDS= libglfw.so:graphics/glfw USES= cmake gl localbase:ldflags +USE_GITHUB= yes +GH_ACCOUNT= alicevision USE_XORG= x11 xcursor xi xinerama xrandr xxf86vm USE_GL= gl glu USE_LDCONFIG= yes @@ -23,7 +24,4 @@ CMAKE_ON= GEOGRAM_USE_SYSTEM_GLFW3 VORPALINE_BUILD_DYNAMIC CMAKE_ARGS= -DVORPALINE_PLATFORM:STRING=FreeBSD LDFLAGS+= -pthread -post-stage: - @${RMDIR} ${STAGEDIR}${PREFIX}/include/geogram1/geogram_gfx/glup_viewer/colormaps - .include <bsd.port.mk> diff --git a/math/geogram/distinfo b/math/geogram/distinfo index 8d05c12e1c67..1640d62d6515 100644 --- a/math/geogram/distinfo +++ b/math/geogram/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556957125 -SHA256 (geogram_1.6.11.tar.gz) = 5d823eb8bc3b34cc5c7abd78320a81e7e79ae16374a9706a7069d53ca032caf6 -SIZE (geogram_1.6.11.tar.gz) = 10287048 +TIMESTAMP = 1567315726 +SHA256 (alicevision-geogram-v1.7.1_GH0.tar.gz) = cf0b7fba482407b650d1f494ee18dcf6744afbfdcd7028d28975ab60c44b9455 +SIZE (alicevision-geogram-v1.7.1_GH0.tar.gz) = 9921323 diff --git a/math/geogram/files/patch-src_lib_geogram__gfx_glup__viewer_glup__viewer.c b/math/geogram/files/patch-src_lib_geogram__gfx_glup__viewer_glup__viewer.c deleted file mode 100644 index 7eefdca72872..000000000000 --- a/math/geogram/files/patch-src_lib_geogram__gfx_glup__viewer_glup__viewer.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/lib/geogram_gfx/glup_viewer/glup_viewer.c.orig 2018-12-09 17:49:50 UTC -+++ src/lib/geogram_gfx/glup_viewer/glup_viewer.c -@@ -64,11 +64,11 @@ - #include <png/png.h> - #endif - --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include <malloc.h> - #endif - --#if defined(__APPLE__) || defined(__linux__) || defined(__EMSCRIPTEN__) -+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) - #include <unistd.h> - static void glup_viewer_pause() { - usleep(1000); diff --git a/math/geogram/pkg-plist b/math/geogram/pkg-plist index 62199e02a869..0926d60b4c41 100644 --- a/math/geogram/pkg-plist +++ b/math/geogram/pkg-plist @@ -1,11 +1,14 @@ bin/geobox bin/geocod bin/geodump +bin/geogram_demo_Application bin/geogram_demo_Delaunay2d bin/geogram_demo_Delaunay3d bin/geogram_demo_Evert bin/geogram_demo_GLUP bin/geogram_demo_Raytrace +bin/geogram_demo_SimpleApplication +bin/geoshade bin/vorpalite bin/vorpaview include/geogram1/geogram/NL/nl.h @@ -24,6 +27,7 @@ include/geogram1/geogram/NL/nl_private.h include/geogram1/geogram/NL/nl_superlu.h include/geogram1/geogram/api/defs.h include/geogram1/geogram/basic/algorithm.h +include/geogram1/geogram/basic/android_wrapper.h include/geogram1/geogram/basic/argused.h include/geogram1/geogram/basic/assert.h include/geogram1/geogram/basic/atomics.h @@ -116,6 +120,7 @@ include/geogram1/geogram/numerics/predicates/.pck.h include/geogram1/geogram/numerics/predicates/aligned3d.h include/geogram1/geogram/numerics/predicates/det3d.h include/geogram1/geogram/numerics/predicates/det4d.h +include/geogram1/geogram/numerics/predicates/det_compare_4d.h include/geogram1/geogram/numerics/predicates/dot3d.h include/geogram1/geogram/numerics/predicates/dot_compare_3d.h include/geogram1/geogram/numerics/predicates/orient2d.h @@ -140,6 +145,7 @@ include/geogram1/geogram/points/co3ne.h include/geogram1/geogram/points/colocate.h include/geogram1/geogram/points/kd_tree.h include/geogram1/geogram/points/nn_search.h +include/geogram1/geogram/points/principal_axes.h include/geogram1/geogram/third_party/HLBFGS/HLBFGS.h include/geogram1/geogram/third_party/HLBFGS/HLBFGS_BLAS.h include/geogram1/geogram/third_party/HLBFGS/ICFS.h @@ -203,6 +209,7 @@ include/geogram1/geogram/third_party/stb_image/stb_image.h include/geogram1/geogram/third_party/stb_image/stb_image_write.h include/geogram1/geogram/third_party/tetgen/tetgen.h include/geogram1/geogram/third_party/triangle/triangle.h +include/geogram1/geogram/third_party/xatlas/xatlas.h include/geogram1/geogram/third_party/zlib/crc32.h include/geogram1/geogram/third_party/zlib/deflate.h include/geogram1/geogram/third_party/zlib/gzguts.h @@ -265,7 +272,6 @@ include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/blur_fragment_shader.h include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/depth_dependent_blur_fragment_shader.h include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/unsharp_masking_fragment_shader.h include/geogram1/geogram_gfx/GLUP/shaders/fullscreen/vertex_shader.h -include/geogram1/geogram_gfx/ImGui_ext/file_dialog.h include/geogram1/geogram_gfx/ImGui_ext/icon_font.h include/geogram1/geogram_gfx/ImGui_ext/imgui_ext.h include/geogram1/geogram_gfx/api/defs.h @@ -276,28 +282,25 @@ include/geogram1/geogram_gfx/basic/frame_buffer_object.h include/geogram1/geogram_gfx/full_screen_effects/ambient_occlusion.h include/geogram1/geogram_gfx/full_screen_effects/full_screen_effect.h include/geogram1/geogram_gfx/full_screen_effects/unsharp_masking.h -include/geogram1/geogram_gfx/glup_viewer/glup_viewer.h -include/geogram1/geogram_gfx/glup_viewer/glup_viewer_gui.h -include/geogram1/geogram_gfx/glup_viewer/glup_viewer_gui_private.h +include/geogram1/geogram_gfx/gui/application.h +include/geogram1/geogram_gfx/gui/arc_ball.h +include/geogram1/geogram_gfx/gui/command.h +include/geogram1/geogram_gfx/gui/console.h +include/geogram1/geogram_gfx/gui/events.h +include/geogram1/geogram_gfx/gui/gui_state.h +include/geogram1/geogram_gfx/gui/gui_state_bigfont_h.h +include/geogram1/geogram_gfx/gui/gui_state_bigfont_v.h +include/geogram1/geogram_gfx/gui/simple_application.h +include/geogram1/geogram_gfx/gui/simple_mesh_application.h +include/geogram1/geogram_gfx/gui/status_bar.h +include/geogram1/geogram_gfx/gui/text_editor.h include/geogram1/geogram_gfx/lua/lua_glup.h -include/geogram1/geogram_gfx/lua/lua_glup_viewer.h include/geogram1/geogram_gfx/lua/lua_imgui.h +include/geogram1/geogram_gfx/lua/lua_simple_application.h include/geogram1/geogram_gfx/mesh/mesh_gfx.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/glup_compat.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imconfig.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_android.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_glfw.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_opengl3.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_impl_win32.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imgui_internal.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imstb_rectpack.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imstb_textedit.h -include/geogram1/geogram_gfx/third_party/ImGui/OLD/imstb_truetype.h include/geogram1/geogram_gfx/third_party/ImGui/glup_compat.h include/geogram1/geogram_gfx/third_party/ImGui/imconfig.h include/geogram1/geogram_gfx/third_party/ImGui/imgui.h -include/geogram1/geogram_gfx/third_party/ImGui/imgui_impl_android.h include/geogram1/geogram_gfx/third_party/ImGui/imgui_impl_glfw.h include/geogram1/geogram_gfx/third_party/ImGui/imgui_impl_opengl3.h include/geogram1/geogram_gfx/third_party/ImGui/imgui_impl_win32.h @@ -305,7 +308,6 @@ include/geogram1/geogram_gfx/third_party/ImGui/imgui_internal.h include/geogram1/geogram_gfx/third_party/ImGui/imstb_rectpack.h include/geogram1/geogram_gfx/third_party/ImGui/imstb_textedit.h include/geogram1/geogram_gfx/third_party/ImGui/imstb_truetype.h -include/geogram1/geogram_gfx/third_party/ImGuiColorTextEdit/OLD/TextEditor.h include/geogram1/geogram_gfx/third_party/ImGuiColorTextEdit/TextEditor.h include/geogram1/geogram_gfx/third_party/glad/KHR/khrplatform.h include/geogram1/geogram_gfx/third_party/glad/glad.h @@ -319,9 +321,10 @@ include/geogram1/geogram_gfx/third_party/quicktext/glQuickText.h lib/cmake/modules/FindGeogram.cmake lib/libgeogram.so lib/libgeogram.so.1 -lib/libgeogram.so.1.6.11 +lib/libgeogram.so.1.7.1 lib/libgeogram_gfx.so lib/libgeogram_gfx.so.1 -lib/libgeogram_gfx.so.1.6.11 +lib/libgeogram_gfx.so.1.7.1 libdata/pkgconfig/geogram1.pc libdata/pkgconfig/geogram_gfx1.pc +@dir include/geogram1/geogram_gfx/gui/colormaps diff --git a/math/hpipm/Makefile b/math/hpipm/Makefile new file mode 100644 index 000000000000..d29d4ea76854 --- /dev/null +++ b/math/hpipm/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= hpipm +DISTVERSION= 0.1.0-80 +DISTVERSIONSUFFIX= -g8679589 +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= High-performance interior-point-method QP solvers + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +BUILD_DEPENDS= blasfeo>0:math/blasfeo + +USES= cmake localbase +USE_GITHUB= yes +GH_ACCOUNT= giaf + +.include <bsd.port.mk> diff --git a/math/hpipm/distinfo b/math/hpipm/distinfo new file mode 100644 index 000000000000..f06cc4af5164 --- /dev/null +++ b/math/hpipm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566690260 +SHA256 (giaf-hpipm-0.1.0-80-g8679589_GH0.tar.gz) = 293c068d79e32d9b872ba03c10685438036944985bdcc19fe068133e3a371f83 +SIZE (giaf-hpipm-0.1.0-80-g8679589_GH0.tar.gz) = 1454937 diff --git a/math/hpipm/files/patch-CMakeLists.txt b/math/hpipm/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..f79705b6577a --- /dev/null +++ b/math/hpipm/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-08-24 23:47:04 UTC ++++ CMakeLists.txt +@@ -228,7 +228,7 @@ install(TARGETS hpipm EXPORT hpipmConfig + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +-install(EXPORT hpipmConfig DESTINATION cmake) ++install(EXPORT hpipmConfig DESTINATION lib/cmake/hpipm) + + file(GLOB_RECURSE HPIPM_HEADERS "include/*.h") + install(FILES ${HPIPM_HEADERS} DESTINATION ${HPIPM_HEADERS_INSTALLATION_DIRECTORY}) diff --git a/math/hpipm/pkg-descr b/math/hpipm/pkg-descr new file mode 100644 index 000000000000..d2834968964c --- /dev/null +++ b/math/hpipm/pkg-descr @@ -0,0 +1,8 @@ +This is HPIPM, a high-performance interior-point method solver for dense, +optimal control- and tree-structured convex quadratic programs. It provides +efficient implementations of dense and structure-exploiting algorithms to solve +small to medium scale problems arising in model predictive control and embedded +optimization in general and it relies on the high-performance linear algebra +package BLASFEO. + +WWW: https://github.com/giaf/hpipm diff --git a/math/hpipm/pkg-plist b/math/hpipm/pkg-plist new file mode 100644 index 000000000000..f35bc2bbd4e3 --- /dev/null +++ b/math/hpipm/pkg-plist @@ -0,0 +1,61 @@ +include/hpipm_aux_string.h +include/hpipm_common.h +include/hpipm_d_cond.h +include/hpipm_d_cond_aux.h +include/hpipm_d_core_qp_ipm.h +include/hpipm_d_core_qp_ipm_aux.h +include/hpipm_d_dense_qp.h +include/hpipm_d_dense_qp_dim.h +include/hpipm_d_dense_qp_ipm.h +include/hpipm_d_dense_qp_kkt.h +include/hpipm_d_dense_qp_res.h +include/hpipm_d_dense_qp_sol.h +include/hpipm_d_ocp_qp.h +include/hpipm_d_ocp_qp_dim.h +include/hpipm_d_ocp_qp_ipm.h +include/hpipm_d_ocp_qp_kkt.h +include/hpipm_d_ocp_qp_res.h +include/hpipm_d_ocp_qp_sol.h +include/hpipm_d_ocp_qp_utils.h +include/hpipm_d_part_cond.h +include/hpipm_d_tree_ocp_qp.h +include/hpipm_d_tree_ocp_qp_dim.h +include/hpipm_d_tree_ocp_qp_ipm.h +include/hpipm_d_tree_ocp_qp_kkt.h +include/hpipm_d_tree_ocp_qp_res.h +include/hpipm_d_tree_ocp_qp_sol.h +include/hpipm_m_dense_qp.h +include/hpipm_m_dense_qp_dim.h +include/hpipm_m_ocp_qp.h +include/hpipm_m_ocp_qp_ipm_hard.h +include/hpipm_m_ocp_qp_kkt.h +include/hpipm_s_cond.h +include/hpipm_s_cond_aux.h +include/hpipm_s_core_qp_ipm.h +include/hpipm_s_core_qp_ipm_aux.h +include/hpipm_s_dense_qp.h +include/hpipm_s_dense_qp_dim.h +include/hpipm_s_dense_qp_ipm.h +include/hpipm_s_dense_qp_kkt.h +include/hpipm_s_dense_qp_res.h +include/hpipm_s_dense_qp_sol.h +include/hpipm_s_ocp_qp.h +include/hpipm_s_ocp_qp_dim.h +include/hpipm_s_ocp_qp_ipm.h +include/hpipm_s_ocp_qp_kkt.h +include/hpipm_s_ocp_qp_res.h +include/hpipm_s_ocp_qp_sol.h +include/hpipm_s_ocp_qp_utils.h +include/hpipm_s_part_cond.h +include/hpipm_s_tree_ocp_qp.h +include/hpipm_s_tree_ocp_qp_dim.h +include/hpipm_s_tree_ocp_qp_ipm.h +include/hpipm_s_tree_ocp_qp_kkt.h +include/hpipm_s_tree_ocp_qp_res.h +include/hpipm_s_tree_ocp_qp_sol.h +include/hpipm_scenario_tree.h +include/hpipm_timing.h +include/hpipm_tree.h +lib/cmake/hpipm/hpipmConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/hpipm/hpipmConfig.cmake +lib/libhpipm.a diff --git a/math/kalgebra/distinfo b/math/kalgebra/distinfo index 096982cb4df9..9528544c1d2d 100644 --- a/math/kalgebra/distinfo +++ b/math/kalgebra/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555689 -SHA256 (KDE/applications/19.08.0/kalgebra-19.08.0.tar.xz) = b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb -SIZE (KDE/applications/19.08.0/kalgebra-19.08.0.tar.xz) = 1156824 +TIMESTAMP = 1567537262 +SHA256 (KDE/applications/19.08.1/kalgebra-19.08.1.tar.xz) = c9859e0b2b847652007a3244bc658f7e160fe88fc70ea7da6e60f003f54f46c9 +SIZE (KDE/applications/19.08.1/kalgebra-19.08.1.tar.xz) = 1156912 diff --git a/math/kbruch/distinfo b/math/kbruch/distinfo index 6da0bb1790cc..4a60046e67c2 100644 --- a/math/kbruch/distinfo +++ b/math/kbruch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555690 -SHA256 (KDE/applications/19.08.0/kbruch-19.08.0.tar.xz) = 29c83039af494703e9d665eca2acde30bb4b94666b3dfe9092833e35f83a9541 -SIZE (KDE/applications/19.08.0/kbruch-19.08.0.tar.xz) = 5604168 +TIMESTAMP = 1567537262 +SHA256 (KDE/applications/19.08.1/kbruch-19.08.1.tar.xz) = 74b387e6eafc5fac8b7a75df6f8d61a2b4b0380a82b5c43f3a10c9b75855318f +SIZE (KDE/applications/19.08.1/kbruch-19.08.1.tar.xz) = 5604040 diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo index ebea61abd32b..eb8eb055d960 100644 --- a/math/kcalc/distinfo +++ b/math/kcalc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555690 -SHA256 (KDE/applications/19.08.0/kcalc-19.08.0.tar.xz) = 58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103 -SIZE (KDE/applications/19.08.0/kcalc-19.08.0.tar.xz) = 372228 +TIMESTAMP = 1567537262 +SHA256 (KDE/applications/19.08.1/kcalc-19.08.1.tar.xz) = 7b3c110a97b851e8db03302484cadc59a59ec8378501ee61dd094ac2c7caa203 +SIZE (KDE/applications/19.08.1/kcalc-19.08.1.tar.xz) = 372548 diff --git a/math/kig/distinfo b/math/kig/distinfo index 2d80e79fe805..14ba0284118d 100644 --- a/math/kig/distinfo +++ b/math/kig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555690 -SHA256 (KDE/applications/19.08.0/kig-19.08.0.tar.xz) = ec35f8e9c10e0a984ab7ff06fc810a26e0abc825ee5674af238bb04e83ce38ee -SIZE (KDE/applications/19.08.0/kig-19.08.0.tar.xz) = 3498828 +TIMESTAMP = 1567537263 +SHA256 (KDE/applications/19.08.1/kig-19.08.1.tar.xz) = 8b073fd0310e62483a548ada000b4230f2b70dec8ab11ac8303bd64961829675 +SIZE (KDE/applications/19.08.1/kig-19.08.1.tar.xz) = 3495636 diff --git a/math/kmplot/distinfo b/math/kmplot/distinfo index 4073d6d7ada1..cad4f00100d6 100644 --- a/math/kmplot/distinfo +++ b/math/kmplot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555691 -SHA256 (KDE/applications/19.08.0/kmplot-19.08.0.tar.xz) = 66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94 -SIZE (KDE/applications/19.08.0/kmplot-19.08.0.tar.xz) = 3052904 +TIMESTAMP = 1567537263 +SHA256 (KDE/applications/19.08.1/kmplot-19.08.1.tar.xz) = 7797dc95f64738b918cb19481bc74cebd1f66b5a537592bb53e98e1715701fe2 +SIZE (KDE/applications/19.08.1/kmplot-19.08.1.tar.xz) = 3055312 diff --git a/math/mumps4/Makefile b/math/mumps4/Makefile index 04ec597675a6..d23da5b07b3b 100644 --- a/math/mumps4/Makefile +++ b/math/mumps4/Makefile @@ -3,7 +3,7 @@ PORTNAME= mumps4 PORTVERSION= 4.10.0 # Please do not upgrade to 5+: use math/mumps -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://mumps.enseeiht.fr/ \ http://graal.ens-lyon.fr/MUMPS/ \ @@ -17,60 +17,58 @@ COMMENT= MUltifrontal Massively Parallel sparse direct Solver LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE -#----------------------------------------------------------------------- - -# WARNING: Non-serviceable parts inside, can break other ports -# You may define these options/knobs: -# -# FFLAGS: Fortran compiler flags for gfortran -# WITH_OPTIMIZED_FLAGS:Try to use agressive (non-CPU) FFLAGS -# BLAS_LIBS: specify other version of BLAS -# WITH_ATLAS: Use ATLAS instead of the regular BLAS -# WITH_METIS: Add METIS ordering -#----------------------------------------------------------------------- - USES= fortran MAKE_JOBS_UNSAFE=yes +FFLAGS+= -ffast-math FORTRANLIBS= -lgfortran GCCLIBDIR= ${LDFLAGS} USE_LDCONFIG= yes VEM= ${PORTVERSION:R:R} LIBS= cmumps dmumps mumps_common pord smumps zmumps -.if defined(WITH_OPTIMIZED_FLAGS) -FFLAGS+= -O3 -ffast-math -.endif +CONFLICTS+= mumps-mpich-4* -.ifdef WITH_METIS -BUILD_DEPENDS+= ${LOCALBASE}/bin/oemetis:math/metis4 -MAKE_ENV+= ORDERINGSF=-Dmetis -.endif +OPTIONS_DEFINE= METIS4 DOCS EXAMPLES + +METIS4_DESCR= Use math/metis4 for Ordering + +METIS4_LIB_DEPENDS+= libmetis.so.1:math/metis4 + +LIBS+= mpiseq PLIST_SUB+= MUMPSVERSION=${PORTVERSION} MUMPSV=${VEM} -OPTIONS_DEFINE= DOCS EXAMPLES +#----------------------------------------------------------------------- +# WARNING: Non-serviceable parts inside, can break other ports +# You may define these options/knobs: +# +# FFLAGS: Fortran compiler flags for gfortran +# BLASLIB: specify other version of BLAS +# WITH_ATLAS: Use ATLAS instead of the regular BLAS +#----------------------------------------------------------------------- .include <bsd.port.pre.mk> +.if ${PORT_OPTIONS:MMETIS4} +MAKE_ENV+= ORDERINGSF=-Dmetis +.endif + +# This is like blaslapack, except we don't use lapack at all .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) LIB_DEPENDS+= libatlas.so:math/atlas -BLAS_LIBS= -lf77blas -LAPACK_LIBS= -lalapack -lcblas +BLASLIB= -lf77blas +#LAPACKLIB= -lalapack -lcblas .else LIB_DEPENDS+= libblas.so:math/blas -BLAS_LIBS= -lblas -LAPACK_LIBS= -llapack +BLASLIB= -lblas +#LAPACKLIB= -llapack .endif -CONFLICTS+= mumps-mpich-4* - -LIBS+= mpiseq - pre-configure: ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \ ${WRKSRC}/Makefile.inc @@ -85,11 +83,11 @@ pre-build: s+@SOVER@+${VEM}+g; \ s+@GCCLIBDIR@+${GCCLIBDIR}+g; \ s+@FORTRANLIBS@+${FORTRANLIBS}+g; \ - s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \ + s+@BLAS_LIBS@+${BLASLIB}+ ; \ s+@LOCALBASE@+${LOCALBASE}+g;' \ ${WRKSRC}/${MF} .endfor -.ifdef WITH_METIS +.if ${PORT_OPTIONS:MMETIS4} ${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc .endif diff --git a/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ index dfbe12362ca7..e2149348c2de 100644 --- a/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ +++ b/math/mumps4/files/patch-Make.inc_Makefile.inc.generic.SEQ @@ -14,11 +14,16 @@ LPORD = -L$(LPORDDIR) -lpord -#LMETISDIR = /local/metis/ -+#LMETISDIR = @LOCALBASE@/lib ++LMETISDIR = @LOCALBASE@/lib #IMETIS = # Should be provided if you use parmetis # You have to choose one among the following two lines depending on -@@ -72,7 +72,7 @@ LPORD = -L$(LPORDDIR) -lpord +@@ -67,12 +67,11 @@ LPORD = -L$(LPORDDIR) -lpord + # line (remember to add -Dparmetis in the ORDERINGSF variable below) + + #LMETIS = -L$(LMETISDIR) -lmetis +-#LMETIS = -L$(LMETISDIR) -lparmetis -lmetis + # The following variables will be used in the compilation process. # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis @@ -27,7 +32,7 @@ ORDERINGSC = $(ORDERINGSF) LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH) -@@ -95,11 +95,11 @@ OUTF = -o +@@ -95,11 +94,11 @@ OUTF = -o # RM : remove files RM = /bin/rm -f # CC : C compiler @@ -42,7 +47,7 @@ # AR : Archive object in a library # keep a space at the end if options have to be separated from lib name AR = ar vr -@@ -112,14 +112,14 @@ RANLIB = ranlib +@@ -112,14 +111,14 @@ RANLIB = ranlib # the sequential library provided by MUMPS, to use instead # of ScaLAPACK and MPI. INCSEQ = -I$(topdir)/libseq @@ -60,7 +65,7 @@ # FORTRAN/C COMPATIBILITY: # Use: -@@ -132,12 +132,12 @@ LIBOTHERS = -lpthread +@@ -132,12 +131,12 @@ LIBOTHERS = -lpthread # leave empty if your Fortran compiler does not change the symbols. # diff --git a/math/mumps4/files/patch-PORD_lib_Makefile b/math/mumps4/files/patch-PORD_lib_Makefile index 6b3f9cca85e8..a5383845d4d8 100644 --- a/math/mumps4/files/patch-PORD_lib_Makefile +++ b/math/mumps4/files/patch-PORD_lib_Makefile @@ -1,6 +1,6 @@ --- PORD/lib/Makefile.orig 2011-05-10 12:56:32 UTC +++ PORD/lib/Makefile -@@ -21,10 +21,15 @@ OBJS = graph.o gbipart.o gbisect.o ddcre +@@ -21,9 +21,14 @@ OBJS = graph.o gbipart.o gbisect.o ddcreate.o ddbisect .c.o: $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o @@ -11,10 +11,9 @@ +libpord$(LIBEXT): $(OBJS) + $(AR) $@ $(OBJS) $(RANLIB) $@ - ++ +libpord.so.@SOVER@: $(OBJS) + $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT).so.@SOVER@ -o libpord$(PLAT).so.@SOVER@ -Wl,-z,defs -+ + clean: rm -f *.o - diff --git a/math/mumps4/files/patch-src_Makefile b/math/mumps4/files/patch-src_Makefile index 035e47408c6a..cf8c0346d351 100644 --- a/math/mumps4/files/patch-src_Makefile +++ b/math/mumps4/files/patch-src_Makefile @@ -11,7 +11,7 @@ OBJS_COMMON = \ mumps_part9.o\ -@@ -53,13 +55,19 @@ OBJS = $(ARITH)mumps_part1.o\ +@@ -53,12 +55,18 @@ OBJS = $(ARITH)mumps_part1.o\ $(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON) @@ -26,10 +26,9 @@ - $(AR)$@ $? + $(AR) $@ $? $(RANLIB) $@ - ++ +$(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@: $(OBJS) + $(FC) -shared ${.ALLSRC} -Wl,-soname,lib$(ARITH)mumps$(PLAT).so.@SOVER@ -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(LIBPAR) -lblas $(SCALAP) $(LIBOTHERS) -o $(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@ -Wl,-z,defs -+ + $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ $(ARITH)mumps_struc_def.o - diff --git a/math/ntl/Makefile b/math/ntl/Makefile index 4c863db46193..4dfb5fb397a5 100644 --- a/math/ntl/Makefile +++ b/math/ntl/Makefile @@ -3,7 +3,7 @@ PORTNAME= ntl PORTVERSION= 11.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://www.shoup.net/ntl/ diff --git a/math/octave-forge-bsltl/Makefile b/math/octave-forge-bsltl/Makefile index be0a9c1cb780..85b22565ca63 100644 --- a/math/octave-forge-bsltl/Makefile +++ b/math/octave-forge-bsltl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-bsltl -PORTVERSION= 1.1.1 -PORTREVISION= 10 +PORTVERSION= 1.3.1 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-bsltl/distinfo b/math/octave-forge-bsltl/distinfo index 03fc02ea1502..d3561afcb701 100644 --- a/math/octave-forge-bsltl/distinfo +++ b/math/octave-forge-bsltl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498167823 -SHA256 (octave-forge/bsltl-1.1.1.tar.gz) = 8eedcfa9bcc299b185476b61886fa691bbe3fd72c3a3000a972806ce9cd5a912 -SIZE (octave-forge/bsltl-1.1.1.tar.gz) = 58460 +TIMESTAMP = 1567445917 +SHA256 (octave-forge/bsltl-1.3.1.tar.gz) = 4bb7ae78decc0d7f71bb553ba1270a3b69efaabed00a70c66ac5157fc8f01945 +SIZE (octave-forge/bsltl-1.3.1.tar.gz) = 60034 diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile deleted file mode 100644 index 975d4d81e2e6..000000000000 --- a/math/octave-forge-econometrics/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-econometrics -PORTVERSION= 1.1.1 -PORTREVISION= 16 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING - -BROKEN= depends upon octave-forge-optim which is broken -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${OCTAVE_PKGNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/src - -RUN_DEPENDS+= ${TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-econometrics/distinfo b/math/octave-forge-econometrics/distinfo deleted file mode 100644 index b51d4a2c5309..000000000000 --- a/math/octave-forge-econometrics/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/econometrics-1.1.1.tar.gz) = b982f842273935c2e3441d09512611e03d4fee6a7c45532909594d41593ff3ee -SIZE (octave-forge/econometrics-1.1.1.tar.gz) = 26867 diff --git a/math/octave-forge-econometrics/pkg-descr b/math/octave-forge-econometrics/pkg-descr deleted file mode 100644 index cd4ce9afee91..000000000000 --- a/math/octave-forge-econometrics/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is econometrics. - - Econometrics functions including MLE and GMM based techniques. - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile deleted file mode 100644 index 915b17d14cfe..000000000000 --- a/math/octave-forge-fits/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-fits -PORTVERSION= 1.0.7 -PORTREVISION= 11 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING - -BROKEN= does not build with octave>=5.1.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${DISTNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/src - -LIB_DEPENDS+= libcfitsio.so:astro/cfitsio - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-fits/distinfo b/math/octave-forge-fits/distinfo deleted file mode 100644 index 7b0970a26bfd..000000000000 --- a/math/octave-forge-fits/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1498101621 -SHA256 (octave-forge/fits-1.0.7.tar.gz) = 95124173f852498cb71acc97712af104027669f60c4f972bbcd8c59b2b2f4b49 -SIZE (octave-forge/fits-1.0.7.tar.gz) = 16759 diff --git a/math/octave-forge-fits/pkg-descr b/math/octave-forge-fits/pkg-descr deleted file mode 100644 index df45281bac41..000000000000 --- a/math/octave-forge-fits/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is fits. - -The Octave-FITS package provides functions for reading, and writing FITS -(Flexible Image Transport System) files. The package supports uses the -libcfitsio library. - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile deleted file mode 100644 index 6a69283b322a..000000000000 --- a/math/octave-forge-linear-algebra/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-linear-algebra -PORTVERSION= 2.2.2 -PORTREVISION= 11 -PORTEPOCH= 1 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -BROKEN= does not build with octave>=5.1.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${OCTAVE_PKGNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/src - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-linear-algebra/distinfo b/math/octave-forge-linear-algebra/distinfo deleted file mode 100644 index 8729634b7525..000000000000 --- a/math/octave-forge-linear-algebra/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/linear-algebra-2.2.2.tar.gz) = fbaaa5f520bcbcf3469b4848876a38d2aaab7bdeeadf241fdcc33881836e9da3 -SIZE (octave-forge/linear-algebra-2.2.2.tar.gz) = 124057 diff --git a/math/octave-forge-linear-algebra/files/patch-CmplxGSVD.cc b/math/octave-forge-linear-algebra/files/patch-CmplxGSVD.cc deleted file mode 100644 index 65676f4e525a..000000000000 --- a/math/octave-forge-linear-algebra/files/patch-CmplxGSVD.cc +++ /dev/null @@ -1,147 +0,0 @@ ---- CmplxGSVD.cc.orig 2015-01-24 19:54:11 UTC -+++ CmplxGSVD.cc -@@ -14,13 +14,12 @@ - // You should have received a copy of the GNU General Public License along with - // this program; if not, see <http://www.gnu.org/licenses/>. - --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -+#include "CmplxGSVD.h" - - #include <iostream> - --#include "CmplxGSVD.h" -+#include <octave/oct.h> -+ - #include "f77-fcn.h" - #include "lo-error.h" - -@@ -30,6 +29,13 @@ - #include "pager.h" - */ - -+#if defined (OCTAVE_HAVE_F77_INT_TYPE) -+# define TO_F77_INT(x) octave::to_f77_int (x) -+#else -+typedef octave_idx_type F77_INT; -+# define TO_F77_INT(x) (x) -+#endif -+ - extern "C" - { - F77_RET_T -@@ -38,27 +44,27 @@ extern "C" - F77_CONST_CHAR_ARG_DECL, // JOBU (input) CHARACTER*1 - F77_CONST_CHAR_ARG_DECL, // JOBV (input) CHARACTER*1 - F77_CONST_CHAR_ARG_DECL, // JOBQ (input) CHARACTER*1 -- const octave_idx_type&, // M (input) INTEGER -- const octave_idx_type&, // N (input) INTEGER -- const octave_idx_type&, // P (input) INTEGER -- octave_idx_type &, // K (output) INTEGER -- octave_idx_type &, // L (output) INTEGER -+ const F77_INT&, // M (input) INTEGER -+ const F77_INT&, // N (input) INTEGER -+ const F77_INT&, // P (input) INTEGER -+ F77_INT&, // K (output) INTEGER -+ F77_INT&, // L (output) INTEGER - Complex*, // A (input/output) COMPLEX*16 array, dimension (LDA,N) -- const octave_idx_type&, // LDA (input) INTEGER -+ const F77_INT&, // LDA (input) INTEGER - Complex*, // B (input/output) COMPLEX*16 array, dimension (LDB,N) -- const octave_idx_type&, // LDB (input) INTEGER -+ const F77_INT&, // LDB (input) INTEGER - double*, // ALPHA (output) DOUBLE PRECISION array, dimension (N) - double*, // BETA (output) DOUBLE PRECISION array, dimension (N) - Complex*, // U (output) COMPLEX*16 array, dimension (LDU,M) -- const octave_idx_type&, // LDU (input) INTEGER -+ const F77_INT&, // LDU (input) INTEGER - Complex*, // V (output) COMPLEX*16 array, dimension (LDV,P) -- const octave_idx_type&, // LDV (input) INTEGER -+ const F77_INT&, // LDV (input) INTEGER - Complex*, // Q (output) COMPLEX*16 array, dimension (LDQ,N) -- const octave_idx_type&, // LDQ (input) INTEGER -+ const F77_INT&, // LDQ (input) INTEGER - Complex*, // WORK (workspace) COMPLEX*16 array - double*, // RWORK (workspace) DOUBLE PRECISION array -- int*, // IWORK (workspace/output) INTEGER array, dimension (N) -- octave_idx_type& // INFO (output)INTEGER -+ F77_INT*, // IWORK (workspace/output) INTEGER array, dimension (N) -+ F77_INT& // INFO (output)INTEGER - F77_CHAR_ARG_LEN_DECL - F77_CHAR_ARG_LEN_DECL - F77_CHAR_ARG_LEN_DECL -@@ -121,11 +127,11 @@ octave_idx_type - ComplexGSVD::init (const ComplexMatrix& a, const ComplexMatrix& b, - GSVD::type gsvd_type) - { -- octave_idx_type info; -+ F77_INT info; - -- octave_idx_type m = a.rows (); -- octave_idx_type n = a.cols (); -- octave_idx_type p = b.rows (); -+ F77_INT m = TO_F77_INT (a.rows ()); -+ F77_INT n = TO_F77_INT (a.cols ()); -+ F77_INT p = TO_F77_INT (b.rows ()); - - ComplexMatrix atmp = a; - Complex *tmp_dataA = atmp.fortran_vec (); -@@ -133,17 +139,17 @@ ComplexGSVD::init (const ComplexMatrix& - ComplexMatrix btmp = b; - Complex *tmp_dataB = btmp.fortran_vec (); - -- // octave_idx_type min_mn = m < n ? m : n; -+ // F77_INT min_mn = m < n ? m : n; - - char jobu = 'U'; - char jobv = 'V'; - char jobq = 'Q'; - -- octave_idx_type nrow_u = m; -- octave_idx_type nrow_v = p; -- octave_idx_type nrow_q = n; -+ F77_INT nrow_u = m; -+ F77_INT nrow_v = p; -+ F77_INT nrow_q = n; - -- octave_idx_type k, l; -+ F77_INT k, l; - - switch (gsvd_type) - { -@@ -187,7 +193,7 @@ ComplexGSVD::init (const ComplexMatrix& - } - Complex *q = right_sm.fortran_vec (); - -- octave_idx_type lwork = 3*n; -+ F77_INT lwork = 3*n; - lwork = lwork > m ? lwork : m; - lwork = (lwork > p ? lwork : p) + n; - -@@ -195,7 +201,7 @@ ComplexGSVD::init (const ComplexMatrix& - Array<double> alpha (dim_vector (n, 1)); - Array<double> beta (dim_vector (n, 1)); - Array<double> rwork(dim_vector (2*n, 1)); -- Array<int> iwork (dim_vector (n, 1)); -+ Array<F77_INT> iwork (dim_vector (n, 1)); - - F77_XFCN (zggsvd, ZGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1), - F77_CONST_CHAR_ARG2 (&jobv, 1), -@@ -219,13 +225,13 @@ ComplexGSVD::init (const ComplexMatrix& - if (info > 0) { - (*current_liboctave_error_handler) ("zggsvd.f: Jacobi-type procedure failed to converge."); - } else { -- octave_idx_type i, j; -+ F77_INT i, j; - - if (GSVD::std == gsvd_type) { - R.resize(k+l, k+l); -- int astart = n-k-l; -+ F77_INT astart = n-k-l; - if (m - k - l >= 0) { -- int astart = n-k-l; -+ F77_INT astart = n-k-l; - /* - * R is stored in A(1:K+L,N-K-L+1:N) - */ diff --git a/math/octave-forge-linear-algebra/files/patch-CmplxGSVD.h b/math/octave-forge-linear-algebra/files/patch-CmplxGSVD.h deleted file mode 100644 index 1ab712546361..000000000000 --- a/math/octave-forge-linear-algebra/files/patch-CmplxGSVD.h +++ /dev/null @@ -1,11 +0,0 @@ ---- CmplxGSVD.h.orig 2015-01-24 19:54:11 UTC -+++ CmplxGSVD.h -@@ -19,6 +19,8 @@ - - #include <iostream> - -+#include <octave/oct.h> -+ - #include "dDiagMatrix.h" - #include "CMatrix.h" - #include "dbleGSVD.h" diff --git a/math/octave-forge-linear-algebra/files/patch-Makefile b/math/octave-forge-linear-algebra/files/patch-Makefile deleted file mode 100644 index 9619a1f0b1b6..000000000000 --- a/math/octave-forge-linear-algebra/files/patch-Makefile +++ /dev/null @@ -1,83 +0,0 @@ ---- Makefile.orig 2015-01-24 19:54:11 UTC -+++ Makefile -@@ -1,66 +1,24 @@ --sinclude Makeconf -- --ifndef OCTAVE_FORGE --MKOCTFILE = mkoctfile --endif -- --ifndef LAPACK_LIBS --LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) --endif --ifndef BLAS_LIBS --BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) --endif --LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) --export LFLAGS -- --DEFINES = -DHAVE_CONFIG_H -Wall --GSVD_OBJECTS = gsvd.o dbleGSVD.o CmplxGSVD.o --GSVD_TARGET = gsvd.oct --GSVD_TEST = gsvd --GSVD_DEPENDS = gsvd.d dbleGSVD.d CmplxGSVD.d -- --OBJECTS = $(GSVD_OBJECTS) --TARGETS = $(GSVD_TARGET) --DEPENDS = $(GSVD_DEPENDS) -- --.PHONY: all test clean count -- --.SUFFIXES: -- --.PRECIOUS: %.d %.o -- --all : $(TARGETS) pgmres.oct -- --$(GSVD_TARGET) : $(GSVD_DEPENDS) $(GSVD_OBJECTS) -- $(MKOCTFILE) $(DEFINES) $(GSVD_OBJECTS) -o $@ ${LAPACK_LIBS} -+MKOCTFILE ?= mkoctfile - --$(GSVD_TEST) : $(GSVD_TARGET) -+OCT_FILES := gsvd.oct pgmres.oct - --ifneq (,$(DEPENDS)) -- sinclude $(DEPENDS) --endif -+GSVD_DEPENDS := dbleGSVD.o CmplxGSVD.o - --%.d:%.cc -- $(MKOCTFILE) $(DEFINES) -M $< -+LAPACK_LIBS ?= $(shell $(MKOCTFILE) -p LAPACK_LIBS) -+BLAS_LIBS ?= $(shell $(MKOCTFILE) -p BLAS_LIBS) - --%.o:%.cc --%.o:%.cc %.d -- $(MKOCTFILE) $(DEFINES) -c $< -+.PHONY: all clean - --%.o:%.f -- $(MKOCTFILE) $(DEFINES) -c $< --%.oct:%.o -- $(MKOCTFILE) $(DEFINES) $< -o $@ -+all: $(OCT_FILES) - - %.oct: %.cc -- mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS} -+ $(MKOCTFILE) $^ - --.phony: test --test: $(GSVD_TEST) -- for i in $^; do echo "test $$i"; done | octave --silent -+%.o: %.cc %.h -+ $(MKOCTFILE) -c $< - --clean: -- rm -f $(TARGETS) $(DEPENDS) $(OBJECTS) octave-core -+gsvd.oct: gsvd.cc $(GSVD_DEPENDS) -+ $(MKOCTFILE) -c $< $(LAPACK_LIBS) $(BLAS_LIBS) - --count: -- wc *{.cc,.h,.f} -+clean: -+ $(RM) *.o *.oct octave-core octave-workspace diff --git a/math/octave-forge-linear-algebra/files/patch-dbleGSVD.cc b/math/octave-forge-linear-algebra/files/patch-dbleGSVD.cc deleted file mode 100644 index 2b258997658f..000000000000 --- a/math/octave-forge-linear-algebra/files/patch-dbleGSVD.cc +++ /dev/null @@ -1,147 +0,0 @@ ---- dbleGSVD.cc.orig 2015-01-24 19:54:11 UTC -+++ dbleGSVD.cc -@@ -14,14 +14,14 @@ - // You should have received a copy of the GNU General Public License along with - // this program; if not, see <http://www.gnu.org/licenses/>. - --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -+#include "dbleGSVD.h" - - #include <iostream> - --#include "dbleGSVD.h" -+#include <octave/oct.h> -+ - #include "f77-fcn.h" -+#include "lo-error.h" - - /* - uncomment those lines to monitor k and l -@@ -29,6 +29,13 @@ - #include "pager.h" - */ - -+#if defined (OCTAVE_HAVE_F77_INT_TYPE) -+# define TO_F77_INT(x) octave::to_f77_int (x) -+#else -+# define TO_F77_INT(x) (x) -+typedef octave_idx_type F77_INT; -+#endif -+ - extern "C" - { - F77_RET_T -@@ -37,26 +44,26 @@ extern "C" - F77_CONST_CHAR_ARG_DECL, // JOBU (input) CHARACTER*1 - F77_CONST_CHAR_ARG_DECL, // JOBV (input) CHARACTER*1 - F77_CONST_CHAR_ARG_DECL, // JOBQ (input) CHARACTER*1 -- const octave_idx_type&, // M (input) INTEGER -- const octave_idx_type&, // N (input) INTEGER -- const octave_idx_type&, // P (input) INTEGER -- octave_idx_type &, // K (output) INTEGER -- octave_idx_type &, // L (output) INTEGER -+ const F77_INT&, // M (input) INTEGER -+ const F77_INT&, // N (input) INTEGER -+ const F77_INT&, // P (input) INTEGER -+ F77_INT &, // K (output) INTEGER -+ F77_INT &, // L (output) INTEGER - double*, // A (input/output) DOUBLE PRECISION array, dimension (LDA,N) -- const octave_idx_type&, // LDA (input) INTEGER -+ const F77_INT&, // LDA (input) INTEGER - double*, // B (input/output) DOUBLE PRECISION array, dimension (LDB,N) -- const octave_idx_type&, // LDB (input) INTEGER -+ const F77_INT&, // LDB (input) INTEGER - double*, // ALPHA (output) DOUBLE PRECISION array, dimension (N) - double*, // BETA (output) DOUBLE PRECISION array, dimension (N) - double*, // U (output) DOUBLE PRECISION array, dimension (LDU,M) -- const octave_idx_type&, // LDU (input) INTEGER -+ const F77_INT&, // LDU (input) INTEGER - double*, // V (output) DOUBLE PRECISION array, dimension (LDV,P) -- const octave_idx_type&, // LDV (input) INTEGER -+ const F77_INT&, // LDV (input) INTEGER - double*, // Q (output) DOUBLE PRECISION array, dimension (LDQ,N) -- const octave_idx_type&, // LDQ (input) INTEGER -+ const F77_INT&, // LDQ (input) INTEGER - double*, // WORK (workspace) DOUBLE PRECISION array -- int*, // IWORK (workspace/output) INTEGER array, dimension (N) -- octave_idx_type& // INFO (output)INTEGER -+ F77_INT*, // IWORK (workspace/output) INTEGER array, dimension (N) -+ F77_INT& // INFO (output)INTEGER - F77_CHAR_ARG_LEN_DECL - F77_CHAR_ARG_LEN_DECL - F77_CHAR_ARG_LEN_DECL -@@ -117,11 +124,11 @@ GSVD::R_matrix (void) const - octave_idx_type - GSVD::init (const Matrix& a, const Matrix& b, GSVD::type gsvd_type) - { -- octave_idx_type info; -+ F77_INT info; - -- octave_idx_type m = a.rows (); -- octave_idx_type n = a.cols (); -- octave_idx_type p = b.rows (); -+ F77_INT m = TO_F77_INT (a.rows ()); -+ F77_INT n = TO_F77_INT (a.cols ()); -+ F77_INT p = TO_F77_INT (b.rows ()); - - Matrix atmp = a; - double *tmp_dataA = atmp.fortran_vec (); -@@ -129,17 +136,17 @@ GSVD::init (const Matrix& a, const Matri - Matrix btmp = b; - double *tmp_dataB = btmp.fortran_vec (); - -- // octave_idx_type min_mn = m < n ? m : n; -+ // F77_INT min_mn = m < n ? m : n; - - char jobu = 'U'; - char jobv = 'V'; - char jobq = 'Q'; - -- octave_idx_type nrow_u = m; -- octave_idx_type nrow_v = p; -- octave_idx_type nrow_q = n; -+ F77_INT nrow_u = m; -+ F77_INT nrow_v = p; -+ F77_INT nrow_q = n; - -- octave_idx_type k, l; -+ F77_INT k, l; - - switch (gsvd_type) - { -@@ -183,14 +190,14 @@ GSVD::init (const Matrix& a, const Matri - } - double *q = right_sm.fortran_vec (); - -- octave_idx_type lwork = 3*n; -+ F77_INT lwork = 3*n; - lwork = lwork > m ? lwork : m; - lwork = (lwork > p ? lwork : p) + n; - - Array<double> work (dim_vector (lwork, 1)); - Array<double> alpha (dim_vector (n, 1)); - Array<double> beta (dim_vector (n, 1)); -- Array<int> iwork (dim_vector (n, 1)); -+ Array<F77_INT> iwork (dim_vector (n, 1)); - - F77_XFCN (dggsvd, DGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1), - F77_CONST_CHAR_ARG2 (&jobv, 1), -@@ -213,13 +220,13 @@ GSVD::init (const Matrix& a, const Matri - if (info > 0) { - (*current_liboctave_error_handler) ("dggsvd.f: Jacobi-type procedure failed to converge."); - } else { -- octave_idx_type i, j; -+ F77_INT i, j; - - if (GSVD::std == gsvd_type) { - R.resize(k+l, k+l); -- int astart = n-k-l; -+ F77_INT astart = n-k-l; - if (m - k - l >= 0) { -- int astart = n-k-l; -+ F77_INT astart = n-k-l; - /* - * R is stored in A(1:K+L,N-K-L+1:N) - */ diff --git a/math/octave-forge-linear-algebra/files/patch-dbleGSVD.h b/math/octave-forge-linear-algebra/files/patch-dbleGSVD.h deleted file mode 100644 index efadfbc18554..000000000000 --- a/math/octave-forge-linear-algebra/files/patch-dbleGSVD.h +++ /dev/null @@ -1,11 +0,0 @@ ---- dbleGSVD.h.orig 2015-01-24 19:54:11 UTC -+++ dbleGSVD.h -@@ -19,6 +19,8 @@ - - #include <iostream> - -+#include <octave/oct.h> -+ - #include "dDiagMatrix.h" - #include "dMatrix.h" - diff --git a/math/octave-forge-linear-algebra/pkg-descr b/math/octave-forge-linear-algebra/pkg-descr deleted file mode 100644 index ed954a68c03d..000000000000 --- a/math/octave-forge-linear-algebra/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is linear-algebra. - - Additional linear algebra code, including general SVD and matrix functions. - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile deleted file mode 100644 index 617972952456..000000000000 --- a/math/octave-forge-mechanics/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-mechanics -PORTVERSION= 1.3.1 -PORTREVISION= 16 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING - -BROKEN= depends upon octave-forge-linear-algebra which is broken -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -RUN_DEPENDS+= ${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general -RUN_DEPENDS+= ${TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry -RUN_DEPENDS+= ${TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${OCTAVE_PKGNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/inst/molecularDynamics/src - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-mechanics/distinfo b/math/octave-forge-mechanics/distinfo deleted file mode 100644 index 769f8ced0b5e..000000000000 --- a/math/octave-forge-mechanics/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/mechanics-1.3.1.tar.gz) = 06291ede6589761cec329d213a81bce7c68a26ef8adf9ff5c9d66ffbf021bf6c -SIZE (octave-forge/mechanics-1.3.1.tar.gz) = 67844 diff --git a/math/octave-forge-mechanics/pkg-descr b/math/octave-forge-mechanics/pkg-descr deleted file mode 100644 index cd13e5b94a58..000000000000 --- a/math/octave-forge-mechanics/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is mechanics. - - Library with functions useful for numerical computation in classical mechanics. - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile deleted file mode 100644 index 48c401569af1..000000000000 --- a/math/octave-forge-parallel/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-parallel -PORTVERSION= 3.1.3 -PORTREVISION= 4 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING - -BROKEN= does not build with octave>=5.1.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${DISTNAME} - -RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct - -WRKSRC= ${WRKDIR}/${OCTSRC}/src -GNU_CONFIGURE= yes -USES+= compiler:gcc-c++11-lib perl5 shebangfix -USE_PERL5= build -SHEBANG_FILES= *.pl - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-parallel/distinfo b/math/octave-forge-parallel/distinfo deleted file mode 100644 index 1e3cd57e6cc0..000000000000 --- a/math/octave-forge-parallel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1534035763 -SHA256 (octave-forge/parallel-3.1.3.tar.gz) = bf4001b688da33df9a6a88e97f5e4fc32ba0c4ad5a30a686ecf9e1ab284bb4f8 -SIZE (octave-forge/parallel-3.1.3.tar.gz) = 206468 diff --git a/math/octave-forge-parallel/pkg-descr b/math/octave-forge-parallel/pkg-descr deleted file mode 100644 index 58ad57d92d42..000000000000 --- a/math/octave-forge-parallel/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is parallel. - -Parallel execution package for cluster computers. For parallel execution on a -single machine see e.g. function parcellfun (author: Jaroslav Hajek) in -package general. - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-stk/Makefile b/math/octave-forge-stk/Makefile index aca26e41014d..a8b0e3fcd804 100644 --- a/math/octave-forge-stk/Makefile +++ b/math/octave-forge-stk/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-stk -PORTVERSION= 2.5.1 -PORTREVISION= 6 +PORTVERSION= 2.6.0 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-stk/distinfo b/math/octave-forge-stk/distinfo index fb374f0362b1..78a9b3da0940 100644 --- a/math/octave-forge-stk/distinfo +++ b/math/octave-forge-stk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529674227 -SHA256 (octave-forge/stk-2.5.1.tar.gz) = a38a7a6547fa702214c7e34b198d379e42b37eeeae8f27f9d95719502cb778f0 -SIZE (octave-forge/stk-2.5.1.tar.gz) = 358897 +TIMESTAMP = 1567556690 +SHA256 (octave-forge/stk-2.6.0.tar.gz) = 4fec8203ef96cb205614a4b83991a41511ca50b16baaaee0334574af55ffbc26 +SIZE (octave-forge/stk-2.6.0.tar.gz) = 380197 diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile deleted file mode 100644 index 6f2f4165b315..000000000000 --- a/math/octave-forge-strings/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-strings -PORTVERSION= 1.2.0 -PORTREVISION= 12 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -BROKEN= does not build with octave>=5.1.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${DISTNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/src - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -ALL_TARGET= # Intentionally left empty - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-strings/distinfo b/math/octave-forge-strings/distinfo deleted file mode 100644 index e563a0bf2b30..000000000000 --- a/math/octave-forge-strings/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/strings-1.2.0.tar.gz) = cfe2702d9e1b69e1fc6bee9a8fab8bb3d63a42d74e763538687d0dbcdd5619ac -SIZE (octave-forge/strings-1.2.0.tar.gz) = 8816 diff --git a/math/octave-forge-strings/pkg-descr b/math/octave-forge-strings/pkg-descr deleted file mode 100644 index b14599f71156..000000000000 --- a/math/octave-forge-strings/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is strings. - - Additional manipulation functions - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-tisean/Makefile b/math/octave-forge-tisean/Makefile deleted file mode 100644 index 70f1c1713532..000000000000 --- a/math/octave-forge-tisean/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-tisean -PORTVERSION= 0.2.3 -PORTREVISION= 11 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -LICENSE= GPLv3 -LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING - -BROKEN= does not build with octave>=5.1.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -RUN_DEPENDS+= ${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${DISTNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/src - -GNU_CONFIGURE= yes - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-tisean/distinfo b/math/octave-forge-tisean/distinfo deleted file mode 100644 index fa98c05dbf80..000000000000 --- a/math/octave-forge-tisean/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (octave-forge/tisean-0.2.3.tar.gz) = bbc94ea6af663092863a437f88215e84d3a59a60b9f51f6ffd9dbe90606a8259 -SIZE (octave-forge/tisean-0.2.3.tar.gz) = 715494 diff --git a/math/octave-forge-tisean/files/patch-Makefile.in b/math/octave-forge-tisean/files/patch-Makefile.in deleted file mode 100644 index 872866c0fa3a..000000000000 --- a/math/octave-forge-tisean/files/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig 2018-05-14 21:28:27 UTC -+++ Makefile.in -@@ -73,10 +73,10 @@ $(OCTFILES) : %.oct : %.cc - $(MKOCTFILE) $(CXXFLAGS) $< $(LIBS) -o $@ - - $(OCT_LINK_F): %.oct : %.cc $(OBJECTS_F) $(LIBS_F) -- $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ -+ $(MKOCTFILE) -fPIC $(CXXFLAGS) $< $(OBJECTS_F) $(LIBS_F) -o $@ - - $(OCT_LINK_CC): %.oct : %.cc $(OBJECTS_CC) -- $(MKOCTFILE) $(CXXFLAGS) $< $(OBJECTS_CC) -o $@ -+ $(MKOCTFILE) -fPIC $(CXXFLAGS) $< $(OBJECTS_CC) -o $@ - - PKG_ADD PKG_DEL: $(OCT_SOURCES) - $(SED) -n -e 's/.*$@: \(.*\)/\1/p' $^ > $@-t diff --git a/math/octave-forge-tisean/files/patch-____c1____.cc b/math/octave-forge-tisean/files/patch-____c1____.cc deleted file mode 100644 index 45d9d0ebf1b1..000000000000 --- a/math/octave-forge-tisean/files/patch-____c1____.cc +++ /dev/null @@ -1,75 +0,0 @@ ---- __c1__.cc.orig 2015-08-14 22:25:52 UTC -+++ __c1__.cc -@@ -34,17 +34,24 @@ FOR INTERNAL USE ONLY" - #include <octave/f77-fcn.h> - #include <octave/oct-map.h> - -+#if defined (OCTAVE_HAVE_F77_INT_TYPE) -+# define TO_F77_INT(x) octave::to_f77_int (x) -+#else -+typedef octave_idx_type F77_INT; -+# define TO_F77_INT(x) (x) -+#endif -+ - extern "C" - { - F77_RET_T - F77_FUNC (d1, D1) -- (const octave_idx_type& nmax, const octave_idx_type& mmax, -- const octave_idx_type& nxx, const double *y, -- const octave_idx_type& delay, const octave_idx_type& m, -- const octave_idx_type& ncmin, const double& pr, -+ (const F77_INT& nmax, const F77_INT& mmax, -+ const F77_INT& nxx, const double *y, -+ const F77_INT& delay, const F77_INT& m, -+ const F77_INT& ncmin, const double& pr, - double& pln, double& eln, -- const octave_idx_type& nmin, const octave_idx_type& kmax, -- const octave_idx_type& iverb); -+ const F77_INT& nmin, const F77_INT& kmax, -+ const F77_INT& iverb); - - F77_RET_T - F77_FUNC (rand, RAND) -@@ -66,23 +73,23 @@ DEFUN_DLD (__c1__, args, nargout, HELPTE - { - // Assigning inputs - Matrix input = args(0).matrix_value (); -- octave_idx_type mindim = args(1).idx_type_value (); -- octave_idx_type maxdim = args(2).idx_type_value (); -- octave_idx_type delay = args(3).idx_type_value (); -- octave_idx_type tmin = args(4).idx_type_value (); -- octave_idx_type cmin = args(5).idx_type_value (); -+ F77_INT mindim = TO_F77_INT (args(1).idx_type_value ()); -+ F77_INT maxdim = TO_F77_INT (args(2).idx_type_value ()); -+ F77_INT delay = TO_F77_INT (args(3).idx_type_value ()); -+ F77_INT tmin = TO_F77_INT (args(4).idx_type_value ()); -+ F77_INT cmin = TO_F77_INT (args(5).idx_type_value ()); - double resolution = args(6).double_value (); - double seed = args(7).double_value (); -- octave_idx_type kmax = args(8).idx_type_value (); -+ F77_INT kmax = TO_F77_INT (args(8).idx_type_value ()); - bool verbose = args(9).bool_value (); -- octave_idx_type iverb = verbose; -+ F77_INT iverb = TO_F77_INT (verbose); - - - if (! error_state) - { - -- octave_idx_type lines_read = input.rows (); //nmax in d1() -- octave_idx_type columns_read = input.columns (); -+ F77_INT lines_read = TO_F77_INT (input.rows ()); //nmax in d1() -+ F77_INT columns_read = TO_F77_INT (input.columns ()); - - - dim_vector dv (maxdim - mindim + 1, 1); -@@ -94,7 +101,7 @@ DEFUN_DLD (__c1__, args, nargout, HELPTE - // Seed the rand() function for d1() - F77_XFCN (rand, RAND, (sqrt(seed))); - -- for (octave_idx_type m = mindim; m <= maxdim; m++) -+ for (F77_INT m = mindim; m <= maxdim; m++) - { - octave_scalar_map tmp (keys); - tmp.setfield ("dim", m); diff --git a/math/octave-forge-tisean/files/patch-____surrogates____.cc b/math/octave-forge-tisean/files/patch-____surrogates____.cc deleted file mode 100644 index c3b355f3c105..000000000000 --- a/math/octave-forge-tisean/files/patch-____surrogates____.cc +++ /dev/null @@ -1,57 +0,0 @@ ---- __surrogates__.cc.orig 2015-08-14 22:25:52 UTC -+++ __surrogates__.cc -@@ -34,14 +34,21 @@ FOR INTERNAL USE ONLY" - #include <octave/f77-fcn.h> - #include <octave/Cell.h> - -+#if defined (OCTAVE_HAVE_F77_INT_TYPE) -+# define TO_F77_INT(x) octave::to_f77_int (x) -+#else -+typedef octave_idx_type F77_INT; -+# define TO_F77_INT(x) (x) -+#endif -+ - extern "C" - { - F77_RET_T - F77_FUNC (ts_surrogates, TS_SURROGATES) -- (const double *xx, const octave_idx_type& nmaxp, -- const octave_idx_type& mcmax, const octave_idx_type& imax, -- const octave_idx_type& ispec, const double& seed, double *output, -- octave_idx_type& iterations, double& rel_discrepency); -+ (const double *xx, const F77_INT& nmaxp, -+ const F77_INT& mcmax, const F77_INT& imax, -+ const F77_INT& ispec, const double& seed, double *output, -+ F77_INT& iterations, double& rel_discrepency); - } - - -@@ -59,15 +66,15 @@ DEFUN_DLD (__surrogates__, args, nargout - // Assigning inputs - Matrix input = args(0).matrix_value (); - octave_idx_type nsur = args(1).idx_type_value (); -- octave_idx_type imax = args(2).idx_type_value (); -- octave_idx_type ispec = args(3).idx_type_value (); -+ F77_INT imax = TO_F77_INT (args(2).idx_type_value ()); -+ F77_INT ispec = TO_F77_INT (args(3).idx_type_value ()); - double seed = args(4).double_value (); - - if (! error_state) - { - -- octave_idx_type nmaxp = input.rows (); -- octave_idx_type mcmax = input.columns (); -+ F77_INT nmaxp = TO_F77_INT (input.rows ()); -+ F77_INT mcmax = TO_F77_INT (input.columns ()); - - Cell surro_data (dim_vector (nsur,1)); - Matrix surro_tmp (input.dims ()); -@@ -75,7 +82,7 @@ DEFUN_DLD (__surrogates__, args, nargout - - for (octave_idx_type i = 0; i < nsur; i++) - { -- octave_idx_type it_tmp; -+ F77_INT it_tmp; - double rel_discrepency_tmp; - - F77_XFCN (ts_surrogates, TS_SURROGATES, diff --git a/math/octave-forge-tisean/files/patch-____upo____.cc b/math/octave-forge-tisean/files/patch-____upo____.cc deleted file mode 100644 index 720b18f2c68d..000000000000 --- a/math/octave-forge-tisean/files/patch-____upo____.cc +++ /dev/null @@ -1,58 +0,0 @@ ---- __upo__.cc.orig 2015-08-14 22:25:52 UTC -+++ __upo__.cc -@@ -33,18 +33,24 @@ FOR INTERNAL USE ONLY" - #include <octave/oct.h> - #include <octave/f77-fcn.h> - -+#if defined (OCTAVE_HAVE_F77_INT_TYPE) -+# define TO_F77_INT(x) octave::to_f77_int (x) -+#else -+typedef octave_idx_type F77_INT; -+# define TO_F77_INT(x) (x) -+#endif - - extern "C" - { - F77_RET_T - F77_FUNC (ts_upo, TS_UPO) -- (const int& m, const double& eps, -+ (const F77_INT& m, const double& eps, - const double& frac, const double& teq, - const double& tdis, const double& h, -- const double& tacc, const int& iper, -- const int& icen, const int& lines_read, -+ const double& tacc, const F77_INT& iper, -+ const F77_INT& icen, const F77_INT& lines_read, - double* in_out1, double* olens, -- double* orbit_data, const int& sizedat, -+ double* orbit_data, const F77_INT& sizedat, - double* accuracy, double* stability); - } - -@@ -63,22 +69,22 @@ DEFUN_DLD (__upo__, args, nargout, HELPT - { - // Assigning inputs - NDArray in_out1 = args(0).array_value(); -- int m = args(1).int_value(); -+ F77_INT m = TO_F77_INT (args(1).int_value()); - double eps = args(2).double_value(); - double frac = args(3).double_value(); - double teq = args(4).double_value(); - double tdis = args(5).double_value(); - double h = args(6).double_value(); - double tacc = args(7).double_value(); -- int iper = args(8).int_value(); -- int icen = args(9).int_value(); -+ F77_INT iper = TO_F77_INT (args(8).int_value()); -+ F77_INT icen = TO_F77_INT (args(9).int_value()); - - - - if (! error_state) - { - -- int lines_read = in_out1.numel(); -+ F77_INT lines_read = TO_F77_INT (in_out1.numel()); - // Generating output vectors with estimated lengths - // The extra length (+1) is to store the actual lengths - NDArray olens (dim_vector (icen+1,1)); diff --git a/math/octave-forge-tisean/files/patch-lazy.cc b/math/octave-forge-tisean/files/patch-lazy.cc deleted file mode 100644 index ae8631135e28..000000000000 --- a/math/octave-forge-tisean/files/patch-lazy.cc +++ /dev/null @@ -1,58 +0,0 @@ ---- lazy.cc.orig 2015-08-14 22:25:52 UTC -+++ lazy.cc -@@ -35,7 +35,7 @@ Performs simple nonlinear noise reductio - @item X\n\ - Must be realvector. If it is a row vector then the output will be row vectors as well.\n\ - @item m\n\ --Embedding dimension. Must be postive integer.\n\ -+Embedding dimension. Must be positive integer.\n\ - @item rv\n\ - If @var{rv} > 0 then it is equal to the absolute radius of the neighbourhoods. If @var{rv} < 0 then its opposite (-@var{rv}) is equal to the fraction of standard deviation used. It cannot be equal 0.\n\ - @item imax\n\ -@@ -71,12 +71,19 @@ Uses TISEAN package lazy\n\ - // In order to avoid clobbered warnings transposed is initialized globally. - bool transposed; - -+#if defined (OCTAVE_HAVE_F77_INT_TYPE) -+# define TO_F77_INT(x) octave::to_f77_int (x) -+#else -+typedef octave_idx_type F77_INT; -+# define TO_F77_INT(x) (x) -+#endif -+ - extern "C" - { - F77_RET_T - F77_FUNC (ts_lazy, TS_LAZY) -- (const int& m, const double& rv, -- const int& imax, const int& lines_read, -+ (const F77_INT& m, const double& rv, -+ const F77_INT& imax, const F77_INT& lines_read, - double* in_out1, double* in_out2); - } - -@@ -100,12 +107,12 @@ DEFUN_DLD (lazy, args, nargout, HELPTEXT - { - // Assigning inputs - Matrix in_out1 = args(0).matrix_value(); -- int m = args(1).int_value(); -+ F77_INT m = TO_F77_INT (args(1).int_value()); - double rv = args(2).double_value(); -- int imax = DEFAULT_IMAX; -+ F77_INT imax = DEFAULT_IMAX; - - if (nargin == 4) -- imax = args(3).int_value(); -+ imax = TO_F77_INT (args(3).int_value()); - - // --- DATA VALIDATION --- - -@@ -144,7 +151,7 @@ DEFUN_DLD (lazy, args, nargout, HELPTEXT - in_out1 = in_out1.transpose(); - } - -- int lines_read = in_out1.numel(); -+ F77_INT lines_read = TO_F77_INT (in_out1.numel()); - NDArray in_out2 (Matrix (lines_read, 1)); - - F77_XFCN (ts_lazy, TS_LAZY, diff --git a/math/octave-forge-tisean/pkg-descr b/math/octave-forge-tisean/pkg-descr deleted file mode 100644 index 5cd09e6f081b..000000000000 --- a/math/octave-forge-tisean/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is tisean. - - Port of TISEAN 3.0.1, which does nonlinear time series analysis. See - http://www.mpipks-dresden.mpg.de/~tisean/ - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-tisean/pkg-plist b/math/octave-forge-tisean/pkg-plist deleted file mode 100644 index a999ec86c07e..000000000000 --- a/math/octave-forge-tisean/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment This file intentionally left empty diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile deleted file mode 100644 index 7064efc8bd3d..000000000000 --- a/math/octave-forge-video/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> -# $FreeBSD$ - -PORTNAME= octave-forge-video -PORTVERSION= 1.2.4 -PORTREVISION= 13 -CATEGORIES= math - -MAINTAINER= stephen@FreeBSD.org -COMMENT= Octave-forge package ${OCTAVE_PKGNAME} - -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING - -BROKEN= does not build with octave>=5.1.0 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -USES= pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ENV+= HOME=${WRKSRC} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -# OCTSRC is the name of the directory of the package. -# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${DISTNAME} - -WRKSRC= ${WRKDIR}/${OCTSRC}/src - -LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg - -.include "${.CURDIR}/../../Mk/bsd.octave.mk" - -post-build: - ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} - -.include <bsd.port.mk> diff --git a/math/octave-forge-video/distinfo b/math/octave-forge-video/distinfo deleted file mode 100644 index 4cad6cdd04af..000000000000 --- a/math/octave-forge-video/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1497926922 -SHA256 (octave-forge/video-1.2.4.tar.gz) = 69af2f5b7c9d96318d5528b150ec8aa12873e974bd16c714698a8558c5aee339 -SIZE (octave-forge/video-1.2.4.tar.gz) = 53044 diff --git a/math/octave-forge-video/files/patch-AVHandler.cc b/math/octave-forge-video/files/patch-AVHandler.cc deleted file mode 100644 index b114750200b1..000000000000 --- a/math/octave-forge-video/files/patch-AVHandler.cc +++ /dev/null @@ -1,20 +0,0 @@ -AVHandler.cc:246:29: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' - if (codec->capabilities & CODEC_CAP_TRUNCATED) - ^ -AVHandler.cc:247:30: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' - vstream->codec->flags |= CODEC_FLAG_TRUNCATED; - ^ - ---- AVHandler.cc.orig 2017-05-28 14:27:02 UTC -+++ AVHandler.cc -@@ -243,8 +243,8 @@ AVHandler::setup_read() - codec_name = codec->name; - - // We can handle truncated bitstreams -- if (codec->capabilities & CODEC_CAP_TRUNCATED) -- vstream->codec->flags |= CODEC_FLAG_TRUNCATED; -+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) -+ vstream->codec->flags |= AV_CODEC_FLAG_TRUNCATED; - - if (avcodec_open2(vstream->codec, codec, NULL) < 0) - { diff --git a/math/octave-forge-video/pkg-descr b/math/octave-forge-video/pkg-descr deleted file mode 100644 index 9818327f6b51..000000000000 --- a/math/octave-forge-video/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -The octave-forge package is the result of The GNU Octave Repositry project, -which is intended to be a central location for custom scripts, functions and -extensions for GNU Octave. contains the source for all the functions plus -build and install scripts. - -This is video. - -Implements addframe, avifile, aviinfo, and aviread, using ffmpeg. -(and approximately conforms to Matlab interface) - -WWW: http://octave.sourceforge.net/ diff --git a/math/octave-forge-zeromq/Makefile b/math/octave-forge-zeromq/Makefile index d000c54c9ae1..8f3bfb8e0d76 100644 --- a/math/octave-forge-zeromq/Makefile +++ b/math/octave-forge-zeromq/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-zeromq -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 1.5.0 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-zeromq/distinfo b/math/octave-forge-zeromq/distinfo index 8c7c0d5ccc43..3bd30fc6d56f 100644 --- a/math/octave-forge-zeromq/distinfo +++ b/math/octave-forge-zeromq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553813307 -SHA256 (octave-forge/zeromq-1.4.0.tar.gz) = 3d45d9c888d360fa657576c466a1b93971a9baaa284afd4dc7ef4af3fcfa0584 -SIZE (octave-forge/zeromq-1.4.0.tar.gz) = 329172 +TIMESTAMP = 1565312393 +SHA256 (octave-forge/zeromq-1.5.0.tar.gz) = 60507815da85f034231308860b9ed8bdb1dec92811cd3c07607f9edcfe60c8a2 +SIZE (octave-forge/zeromq-1.5.0.tar.gz) = 342738 diff --git a/math/onnx/Makefile b/math/onnx/Makefile new file mode 100644 index 000000000000..fec20e194c67 --- /dev/null +++ b/math/onnx/Makefile @@ -0,0 +1,26 @@ +# $FreeBSD$ + +PORTNAME= onnx +DISTVERSIONPREFIX= v +DISTVERSION= 1.5.0 +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Open Neural Network eXchange + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libprotobuf.so:devel/protobuf + +USES= cmake compiler:c++11-lang python:build +USE_GITHUB= yes + +CMAKE_ON= BUILD_SHARED_LIBS + +BINARY_ALIAS= python=${PYTHON_CMD} + +post-install: # https://github.com/onnx/onnx/issues/2263 + @${FIND} -d ${STAGEDIR}${PREFIX}/include -type d -empty -delete + +.include <bsd.port.mk> diff --git a/math/onnx/distinfo b/math/onnx/distinfo new file mode 100644 index 000000000000..c692833dd911 --- /dev/null +++ b/math/onnx/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566874234 +SHA256 (onnx-onnx-v1.5.0_GH0.tar.gz) = 707887fffd79f36213baea7012fd1599c2c6d14ca4974484f1363dced4f7357a +SIZE (onnx-onnx-v1.5.0_GH0.tar.gz) = 2431004 diff --git a/math/onnx/pkg-descr b/math/onnx/pkg-descr new file mode 100644 index 000000000000..cb61902666c8 --- /dev/null +++ b/math/onnx/pkg-descr @@ -0,0 +1,14 @@ +Open Neural Network Exchange (ONNX) is an open ecosystem that empowers AI +developers to choose the right tools as their project evolves. ONNX provides an +open source format for AI models, both deep learning and traditional ML. It +defines an extensible computation graph model, as well as definitions of +built-in operators and standard data types. Currently we focus on the +capabilities needed for inferencing (scoring). + +ONNX is widely supported and can be found in many frameworks, tools, and +hardware. Enabling interoperability between different frameworks and +streamlining the path from research to production helps increase the speed of +innovation in the AI community. We invite the community to join us and further +evolve ONNX. + +WWW: https://onnx.ai/ diff --git a/math/onnx/pkg-plist b/math/onnx/pkg-plist new file mode 100644 index 000000000000..721bb62d2323 --- /dev/null +++ b/math/onnx/pkg-plist @@ -0,0 +1,95 @@ +include/onnx/backend/test/cpp/driver/test_driver.h +include/onnx/backend/test/cpp/gtest_utils.h +include/onnx/checker.h +include/onnx/common/array_ref.h +include/onnx/common/assertions.h +include/onnx/common/common.h +include/onnx/common/constants.h +include/onnx/common/graph_node_list.h +include/onnx/common/interned_strings.h +include/onnx/common/ir.h +include/onnx/common/ir_pb_converter.h +include/onnx/common/model_helpers.h +include/onnx/common/status.h +include/onnx/common/stl_backports.h +include/onnx/common/tensor.h +include/onnx/defs/attr_proto_util.h +include/onnx/defs/data_type_utils.h +include/onnx/defs/function.h +include/onnx/defs/operator_sets-ml.h +include/onnx/defs/operator_sets.h +include/onnx/defs/schema.h +include/onnx/defs/shape_inference.h +include/onnx/defs/tensor_proto_util.h +include/onnx/onnx-ml.pb.h +include/onnx/onnx-operators-ml.pb.h +include/onnx/onnx-operators_pb.h +include/onnx/onnx_pb.h +include/onnx/onnxifi.h +include/onnx/onnxifi_ext.h +include/onnx/onnxifi_loader.h +include/onnx/onnxifi_utils.h +include/onnx/optimizer/optimize.h +include/onnx/optimizer/pass.h +include/onnx/optimizer/pass_manager.h +include/onnx/optimizer/pass_registry.h +include/onnx/optimizer/passes/eliminate_deadend.h +include/onnx/optimizer/passes/eliminate_identity.h +include/onnx/optimizer/passes/eliminate_nop_dropout.h +include/onnx/optimizer/passes/eliminate_nop_monotone_argmax.h +include/onnx/optimizer/passes/eliminate_nop_pad.h +include/onnx/optimizer/passes/eliminate_nop_transpose.h +include/onnx/optimizer/passes/eliminate_unused_initializer.h +include/onnx/optimizer/passes/extract_constant_to_initializer.h +include/onnx/optimizer/passes/fuse_add_bias_into_conv.h +include/onnx/optimizer/passes/fuse_bn_into_conv.h +include/onnx/optimizer/passes/fuse_consecutive_concats.h +include/onnx/optimizer/passes/fuse_consecutive_log_softmax.h +include/onnx/optimizer/passes/fuse_consecutive_reduce_unsqueeze.h +include/onnx/optimizer/passes/fuse_consecutive_squeezes.h +include/onnx/optimizer/passes/fuse_consecutive_transposes.h +include/onnx/optimizer/passes/fuse_matmul_add_bias_into_gemm.h +include/onnx/optimizer/passes/fuse_pad_into_conv.h +include/onnx/optimizer/passes/fuse_transpose_into_gemm.h +include/onnx/optimizer/passes/lift_lexical_references.h +include/onnx/optimizer/passes/nop.h +include/onnx/optimizer/passes/split.h +include/onnx/proto_utils.h +include/onnx/py_utils.h +include/onnx/shape_inference/implementation.h +include/onnx/string_utils.h +include/onnx/version_converter/BaseConverter.h +include/onnx/version_converter/adapters/adapter.h +include/onnx/version_converter/adapters/averagepool_7_6.h +include/onnx/version_converter/adapters/batch_normalization_6_5.h +include/onnx/version_converter/adapters/batch_normalization_6_7.h +include/onnx/version_converter/adapters/broadcast_backward_compatibility.h +include/onnx/version_converter/adapters/broadcast_forward_compatibility.h +include/onnx/version_converter/adapters/cast_9_8.h +include/onnx/version_converter/adapters/compatible.h +include/onnx/version_converter/adapters/concat_3_4.h +include/onnx/version_converter/adapters/dropout_6_7.h +include/onnx/version_converter/adapters/extend_supported_types.h +include/onnx/version_converter/adapters/gemm_6_7.h +include/onnx/version_converter/adapters/gemm_7_6.h +include/onnx/version_converter/adapters/maxpool_8_7.h +include/onnx/version_converter/adapters/no_previous_version.h +include/onnx/version_converter/adapters/remove_consumed_inputs.h +include/onnx/version_converter/adapters/reshape_4_5.h +include/onnx/version_converter/adapters/reshape_5_4.h +include/onnx/version_converter/adapters/scan_9_8.h +include/onnx/version_converter/adapters/set_is_test.h +include/onnx/version_converter/adapters/sum_8_7.h +include/onnx/version_converter/adapters/type_restriction.h +include/onnx/version_converter/adapters/upsample_9_8.h +include/onnx/version_converter/convert.h +include/onnx/version_converter/helper.h +lib/libonnx.so +lib/libonnx_proto.so +lib/libonnxifi.so +lib/libonnxifi_dummy.so +lib/libonnxifi_loader.a +share/cmake/ONNX/ONNXConfig.cmake +share/cmake/ONNX/ONNXConfigVersion.cmake +share/cmake/ONNX/ONNXTargets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/ONNX/ONNXTargets.cmake diff --git a/math/osi/Makefile b/math/osi/Makefile index 67796e389f2c..da6acc705f8d 100644 --- a/math/osi/Makefile +++ b/math/osi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= Osi -DISTVERSION= 0.108.4 -PORTREVISION= 1 +DISTVERSION= 0.108.5 CATEGORIES= math MASTER_SITES= https://www.coin-or.org/download/source/${PORTNAME}/ PKGNAMEPREFIX= coin-or- diff --git a/math/osi/distinfo b/math/osi/distinfo index d37f55d7af4d..4fc021a52583 100644 --- a/math/osi/distinfo +++ b/math/osi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561074521 -SHA256 (Osi-0.108.4.tgz) = 45a72e7019d33b9cf9c3f9fde30a9cb1e822e3b6897239c7dd67bc0060837c8d -SIZE (Osi-0.108.4.tgz) = 7516391 +TIMESTAMP = 1566760036 +SHA256 (Osi-0.108.5.tgz) = 8efabdb3d5c89837d73fa6f9e7b764dce7450c579037964b64a996757f4d7d2c +SIZE (Osi-0.108.5.tgz) = 7526811 diff --git a/math/osi/pkg-plist b/math/osi/pkg-plist index 6e9396d028c9..811339a14fb1 100644 --- a/math/osi/pkg-plist +++ b/math/osi/pkg-plist @@ -15,9 +15,9 @@ include/coin/OsiSolverParameters.hpp include/coin/OsiUnitTests.hpp lib/libOsi.so lib/libOsi.so.1 -lib/libOsi.so.1.13.4 +lib/libOsi.so.1.13.5 lib/libOsiCommonTests.so lib/libOsiCommonTests.so.1 -lib/libOsiCommonTests.so.1.13.4 +lib/libOsiCommonTests.so.1.13.5 libdata/pkgconfig/osi-unittests.pc libdata/pkgconfig/osi.pc diff --git a/math/osqp/Makefile b/math/osqp/Makefile index 4fc65b117375..8d3d967946d3 100644 --- a/math/osqp/Makefile +++ b/math/osqp/Makefile @@ -2,11 +2,11 @@ PORTNAME= osqp DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 +DISTVERSION= 0.6.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org -COMMENT= Operator Splitting QP Solver +COMMENT= Operator Splitting Quadratic Program solver for optimization problems LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/math/osqp/distinfo b/math/osqp/distinfo index 890d57ee3e20..4c7f9a845924 100644 --- a/math/osqp/distinfo +++ b/math/osqp/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1544551542 -SHA256 (oxfordcontrol-osqp-v0.5.0_GH0.tar.gz) = e0932d1f7bc56dbe526bee4a81331c1694d94c570f8ac6a6cb413f38904e0f64 -SIZE (oxfordcontrol-osqp-v0.5.0_GH0.tar.gz) = 928438 +TIMESTAMP = 1567231987 +SHA256 (oxfordcontrol-osqp-v0.6.0_GH0.tar.gz) = 6e00d11d1f88c1e32a4419324b7539b89e8f9cbb1c50afe69f375347c989ba2b +SIZE (oxfordcontrol-osqp-v0.6.0_GH0.tar.gz) = 936676 SHA256 (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 9d02ed1a10ad2e8df4de3eb70469be4f9b896a8f93a9323065af625b08cd3645 SIZE (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 22930 diff --git a/math/osqp/pkg-descr b/math/osqp/pkg-descr index b40dd44558a8..06ef33f7a19b 100644 --- a/math/osqp/pkg-descr +++ b/math/osqp/pkg-descr @@ -1,3 +1,6 @@ +The OSQP (Operator Splitting Quadratic Program) solver is a numerical +optimization package for solving convex quadratic programs. + OSQP uses a specialized ADMM-based first-order method with custom sparse linear algebra routines that exploit structure in problem data. diff --git a/math/osqp/pkg-plist b/math/osqp/pkg-plist index f421b7df1d7c..0fee0749c6d3 100644 --- a/math/osqp/pkg-plist +++ b/math/osqp/pkg-plist @@ -2,8 +2,8 @@ include/osqp/auxil.h include/osqp/constants.h include/osqp/cs.h include/osqp/ctrlc.h +include/osqp/error.h include/osqp/glob_opts.h -include/osqp/kkt.h include/osqp/lin_alg.h include/osqp/lin_sys.h include/osqp/osqp.h diff --git a/math/prng/Makefile b/math/prng/Makefile index b08bf68ee3f6..d589809e81d3 100644 --- a/math/prng/Makefile +++ b/math/prng/Makefile @@ -3,7 +3,7 @@ PORTNAME= prng DISTVERSION= 3.0.2 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://statistik.wu-wien.ac.at/software/prng/ diff --git a/math/prng/files/patch-examples_pairs.c b/math/prng/files/patch-examples_pairs.c new file mode 100644 index 000000000000..50d3eeb5cf8d --- /dev/null +++ b/math/prng/files/patch-examples_pairs.c @@ -0,0 +1,10 @@ +--- examples/pairs.c.orig 2000-10-17 08:39:02.000000000 -0700 ++++ examples/pairs.c 2019-09-01 21:02:29.348451000 -0700 +@@ -53,6 +53,7 @@ + #include <stdlib.h> + #include <string.h> + #include "prng.h" ++#define gets(_a) gets_s(_a, sizeof(_a)) + + struct prng_struct *generator; + char outfile[200] = "pairs.out"; diff --git a/math/prng/files/patch-no-gets b/math/prng/files/patch-no-gets new file mode 100644 index 000000000000..6f7a6f838b63 --- /dev/null +++ b/math/prng/files/patch-no-gets @@ -0,0 +1,48 @@ +--- examples/pairs.c.orig 2019-06-30 22:57:59.603524000 +0300 ++++ examples/pairs.c 2019-06-30 23:06:55.659597000 +0300 +@@ -54,6 +54,18 @@ + #include <string.h> + #include "prng.h" + ++static void ++safe_gets(char *buf, int size) ++{ ++ size_t len; ++ ++ if (fgets(buf, size, stdin) == NULL) ++ return; ++ len = strlen(buf); ++ if (len && buf[len - 1] == '\n') ++ buf[len - 1] = '\0'; ++} ++ + struct prng_struct *generator; + char outfile[200] = "pairs.out"; + FILE *out; +@@ -71,7 +83,7 @@ + else + { + printf("\nGenerator ? "); +- gets(input); ++ safe_gets(input, sizeof(input)); + g = prng_new(input); + } + +@@ -88,7 +100,7 @@ + { + npairs = 10000; + printf("\nHow many pairs [%d] ",npairs); +- gets(input); ++ safe_gets(input, sizeof(input)); + if (input[0] != 0 ) npairs = atoi(input); + } + +@@ -97,7 +109,7 @@ + else + { + printf("Output filename ('-' for stdout) ? [%s] ",outfile); +- gets(input); ++ safe_gets(input, sizeof(input)); + if (input[0] != 0 ) strncpy(outfile,input,100); + } + diff --git a/math/pure-mpfr/Makefile b/math/pure-mpfr/Makefile deleted file mode 100644 index 0230df15cf19..000000000000 --- a/math/pure-mpfr/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: Zhihao Yuan <lichray@gmail.com> -# $FreeBSD$ - -PORTNAME= pure-mpfr -PORTVERSION= 0.5 -CATEGORIES= math -MASTER_SITES= https://bitbucket.org/purelang/pure-lang/downloads/ -DIST_SUBDIR= pure - -MAINTAINER= ports@FreeBSD.org -COMMENT= Multiprecision floats for Pure - -LICENSE= LGPL3+ -LICENSE_FILE= ${WRKSRC}/COPYING.LESSER - -DEPRECATED= Depends on expiring devel/llvm35 -EXPIRATION_DATE=2019-08-31 - -USES= pkgconfig pure -MAKE_ARGS= libdir="${PREFIX}/lib" - -PORTDOCS= README -PORTEXAMPLES= * -PLIST_FILES= lib/pure/mpfr.pure \ - lib/pure/mpfr.so - -OPTIONS_DEFINE= DOCS EXAMPLES - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pure/mpfr.so - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - -.include <bsd.port.mk> diff --git a/math/pure-mpfr/distinfo b/math/pure-mpfr/distinfo deleted file mode 100644 index 20939f6e1f39..000000000000 --- a/math/pure-mpfr/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pure/pure-mpfr-0.5.tar.gz) = 39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7 -SIZE (pure/pure-mpfr-0.5.tar.gz) = 25365 diff --git a/math/pure-mpfr/pkg-descr b/math/pure-mpfr/pkg-descr deleted file mode 100644 index a2d03fe6e5e7..000000000000 --- a/math/pure-mpfr/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -pure-mpfr makes the MPFR multiprecision floats (henceforth referred to as -mpfr numbers or values) available in Pure, so that they work with the other -types of Pure numbers in an almost seamless fashion. - -WWW: https://puredocs.bitbucket.io/pure-mpfr.html diff --git a/math/pure-rational/Makefile b/math/pure-rational/Makefile deleted file mode 100644 index 8caec14c487f..000000000000 --- a/math/pure-rational/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Created by: Zhihao Yuan <lichray@gmail.com> -# $FreeBSD$ - -PORTNAME= pure-rational -PORTVERSION= 0.1 -PORTREVISION= 1 -CATEGORIES= math -MASTER_SITES= https://bitbucket.org/purelang/pure-lang/downloads/ -DIST_SUBDIR= pure - -MAINTAINER= ports@FreeBSD.org -COMMENT= Rational number library for the Pure language - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Depends on expiring devel/llvm35 -EXPIRATION_DATE=2019-08-31 - -USES= pure -NO_ARCH= yes - -PORTDOCS= README -PLIST_FILES= lib/pure/rational.pure \ - lib/pure/rat_interval.pure - -OPTIONS_DEFINE= DOCS - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/math/pure-rational/distinfo b/math/pure-rational/distinfo deleted file mode 100644 index 8596660ab0ec..000000000000 --- a/math/pure-rational/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pure/pure-rational-0.1.tar.gz) = 62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa -SIZE (pure/pure-rational-0.1.tar.gz) = 65724 diff --git a/math/pure-rational/pkg-descr b/math/pure-rational/pkg-descr deleted file mode 100644 index d76fc7c8e0e7..000000000000 --- a/math/pure-rational/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -pure-rational provides additional operations on the rational number type -provided by the math.pure module in the standard library. - -WWW: https://puredocs.bitbucket.io/pure-rational.html diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile index a66dda89666f..98f5971701f4 100644 --- a/math/py-keras/Makefile +++ b/math/py-keras/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= keras -DISTVERSION= 2.2.4 -PORTREVISION= 3 +DISTVERSION= 2.2.5 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-keras/distinfo b/math/py-keras/distinfo index 6bc4e06a03a1..2f0fdd29f36d 100644 --- a/math/py-keras/distinfo +++ b/math/py-keras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538967160 -SHA256 (keras-team-keras-2.2.4_GH0.tar.gz) = 46f8e5bd66f778abd8d5a62b3c3d749fbd41854176fcf0df5258cf94c3fd1b28 -SIZE (keras-team-keras-2.2.4_GH0.tar.gz) = 494645 +TIMESTAMP = 1566756183 +SHA256 (keras-team-keras-2.2.5_GH0.tar.gz) = 149c281194976e2799bea423d192d8520606d5ddec5bf776d7dd30244f67d94f +SIZE (keras-team-keras-2.2.5_GH0.tar.gz) = 595364 diff --git a/math/py-nevergrad/Makefile b/math/py-nevergrad/Makefile index 778eb153d988..cdf952411cdc 100644 --- a/math/py-nevergrad/Makefile +++ b/math/py-nevergrad/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nevergrad -PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTVERSION= 0.2.3 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-nevergrad/distinfo b/math/py-nevergrad/distinfo index 31f23bd1a35c..a18412fd1173 100644 --- a/math/py-nevergrad/distinfo +++ b/math/py-nevergrad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561147705 -SHA256 (nevergrad-0.2.2.tar.gz) = 40ebb009e5f7f94c2962ef8388a8513e29f70928bdc57779df5dcb1bce6f769d -SIZE (nevergrad-0.2.2.tar.gz) = 125992 +TIMESTAMP = 1567510036 +SHA256 (nevergrad-0.2.3.tar.gz) = eca735bf58966147ce749a455ef858f64529ee056615583e838a33b6bac7dc37 +SIZE (nevergrad-0.2.3.tar.gz) = 129041 diff --git a/math/py-onnx/Makefile b/math/py-onnx/Makefile new file mode 100644 index 000000000000..17aa6e740297 --- /dev/null +++ b/math/py-onnx/Makefile @@ -0,0 +1,32 @@ +# $FreeBSD$ + +PORTNAME= onnx +DISTVERSION= 1.5.0 +PORTREVISION= 2 +CATEGORIES= math +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Open Neural Network eXchange + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= cmake:devel/cmake \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} +LIB_DEPENDS= libprotobuf.so:devel/protobuf +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ + ${PY_TYPING} \ + ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} + +USES= compiler:c11 python +USE_PYTHON= distutils concurrent autoplist + +BINARY_ALIAS= python=${PYTHON_CMD} + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/onnx/onnx_cpp2py_export.so + +.include <bsd.port.mk> diff --git a/math/py-onnx/distinfo b/math/py-onnx/distinfo new file mode 100644 index 000000000000..3e636052643c --- /dev/null +++ b/math/py-onnx/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1565284463 +SHA256 (onnx-1.5.0.tar.gz) = 1a584a4ef62a6db178c257fffb06a9d8e61b41c0a80bfd8bcd8a253d72c4b0b4 +SIZE (onnx-1.5.0.tar.gz) = 2981047 diff --git a/math/py-onnx/files/patch-setup.py b/math/py-onnx/files/patch-setup.py new file mode 100644 index 000000000000..6778542b8368 --- /dev/null +++ b/math/py-onnx/files/patch-setup.py @@ -0,0 +1,29 @@ +--- setup.py.orig 2019-04-24 06:21:37 UTC ++++ setup.py +@@ -52,11 +52,12 @@ COVERAGE = bool(os.getenv('COVERAGE')) + # Version + ################################################################################ + +-try: +- git_version = subprocess.check_output(['git', 'rev-parse', 'HEAD'], +- cwd=TOP_DIR).decode('ascii').strip() +-except (OSError, subprocess.CalledProcessError): +- git_version = None ++#try: ++# git_version = subprocess.check_output(['git', 'rev-parse', 'HEAD'], ++# cwd=TOP_DIR).decode('ascii').strip() ++#except (OSError, subprocess.CalledProcessError): ++# git_version = None ++git_version = None + + with open(os.path.join(TOP_DIR, 'VERSION_NUMBER')) as version_file: + VersionInfo = namedtuple('VersionInfo', ['version', 'git_version'])( +@@ -286,7 +287,7 @@ install_requires.extend([ + 'protobuf', + 'numpy', + 'six', +- 'typing>=3.6.4', ++ 'typing>=3.6.4; python_version < "3.5"', + 'typing-extensions>=3.6.2.1', + ]) + diff --git a/math/py-onnx/pkg-descr b/math/py-onnx/pkg-descr new file mode 100644 index 000000000000..cb61902666c8 --- /dev/null +++ b/math/py-onnx/pkg-descr @@ -0,0 +1,14 @@ +Open Neural Network Exchange (ONNX) is an open ecosystem that empowers AI +developers to choose the right tools as their project evolves. ONNX provides an +open source format for AI models, both deep learning and traditional ML. It +defines an extensible computation graph model, as well as definitions of +built-in operators and standard data types. Currently we focus on the +capabilities needed for inferencing (scoring). + +ONNX is widely supported and can be found in many frameworks, tools, and +hardware. Enabling interoperability between different frameworks and +streamlining the path from research to production helps increase the speed of +innovation in the AI community. We invite the community to join us and further +evolve ONNX. + +WWW: https://onnx.ai/ diff --git a/math/py-osqp/Makefile b/math/py-osqp/Makefile index ba94443a805b..c2a84e820848 100644 --- a/math/py-osqp/Makefile +++ b/math/py-osqp/Makefile @@ -2,8 +2,7 @@ PORTNAME= osqp DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 -PORTREVISION= 1 +DISTVERSION= 0.6.1 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,7 +22,7 @@ USES= python USE_GITHUB= yes GH_ACCOUNT= oxfordcontrol GH_PROJECT= ${PORTNAME}-python -GH_TUPLE= oxfordcontrol:${PORTNAME}:v${DISTVERSION}:s/${PORTNAME}_sources \ +GH_TUPLE= oxfordcontrol:${PORTNAME}:0baddd3:s/${PORTNAME}_sources \ oxfordcontrol:qdldl:7ab0fca:q/${PORTNAME}_sources/lin_sys/direct/qdldl/qdldl_sources USE_PYTHON= distutils autoplist diff --git a/math/py-osqp/distinfo b/math/py-osqp/distinfo index c2a4e63b218c..fa1f0b51789a 100644 --- a/math/py-osqp/distinfo +++ b/math/py-osqp/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1544636383 -SHA256 (oxfordcontrol-osqp-python-v0.5.0_GH0.tar.gz) = 6061c34745a152c143c4d0875aeaa01042e7e383f41ffbdffbe06a55f5a7caeb -SIZE (oxfordcontrol-osqp-python-v0.5.0_GH0.tar.gz) = 55123 -SHA256 (oxfordcontrol-osqp-v0.5.0_GH0.tar.gz) = e0932d1f7bc56dbe526bee4a81331c1694d94c570f8ac6a6cb413f38904e0f64 -SIZE (oxfordcontrol-osqp-v0.5.0_GH0.tar.gz) = 928438 +TIMESTAMP = 1567371687 +SHA256 (oxfordcontrol-osqp-python-v0.6.1_GH0.tar.gz) = bfd8ccc4ccf2c7be1e8798bcc828e9b773a707deb2678a62d82396048e009742 +SIZE (oxfordcontrol-osqp-python-v0.6.1_GH0.tar.gz) = 61254 +SHA256 (oxfordcontrol-osqp-0baddd3_GH0.tar.gz) = 209694548ef95e46444cbd8cbe907975bca3deb7eace6ccb714cc41862037da5 +SIZE (oxfordcontrol-osqp-0baddd3_GH0.tar.gz) = 936684 SHA256 (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 9d02ed1a10ad2e8df4de3eb70469be4f9b896a8f93a9323065af625b08cd3645 SIZE (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 22930 diff --git a/math/py-pystan/Makefile b/math/py-pystan/Makefile new file mode 100644 index 000000000000..f2dc3daec44a --- /dev/null +++ b/math/py-pystan/Makefile @@ -0,0 +1,32 @@ +# $FreeBSD$ + +PORTNAME= pystan +PORTVERSION= 2.19.0.0 +PORTREVISION= 1 +CATEGORIES= math python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= gmm@tutanota.com +COMMENT= PyStan is the Python interface for Stan + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= python shebangfix +USE_PYTHON= autoplist distutils + +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} + +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} + +SHEBANG_FILES= ${WRKSRC}/pystan/stan/lib/stan_math/lib/upgrade-sundials.sh \ + ${WRKSRC}/pystan/stan/lib/stan_math/hooks/pre-commit \ + ${WRKSRC}/pystan/stan/lib/stan_math/runTests.py \ + +NO_ARCH= yes +NO_ARCH_IGNORE= _api.so _chains.so _misc.so + +.include <bsd.port.mk> diff --git a/math/py-pystan/distinfo b/math/py-pystan/distinfo new file mode 100644 index 000000000000..5ee9f181ca45 --- /dev/null +++ b/math/py-pystan/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1563392208 +SHA256 (pystan-2.19.0.0.tar.gz) = b85301b960d5991918b40bd64a4e9321813657a9fc028e0f39edce7220a309eb +SIZE (pystan-2.19.0.0.tar.gz) = 16540340 diff --git a/math/py-pystan/pkg-descr b/math/py-pystan/pkg-descr new file mode 100644 index 000000000000..1095826ed988 --- /dev/null +++ b/math/py-pystan/pkg-descr @@ -0,0 +1,7 @@ +PyStan provides a Python interface to Stan, a package for Bayesian inference +using the No-U-Turn sampler, a variant of Hamiltonian Monte Carlo. + +For more information on Stan and its modeling language, see the Stan User's +Guide and Reference Manual at http://mc-stan.org/. + +WWW: https://github.com/stan-dev/pystan diff --git a/math/py-quadprog/Makefile b/math/py-quadprog/Makefile index bb8a68204210..4d028d4edee8 100644 --- a/math/py-quadprog/Makefile +++ b/math/py-quadprog/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= quadprog -DISTVERSION= 0.1.6 -PORTREVISION= 1 +DISTVERSION= 0.1.7 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-quadprog/distinfo b/math/py-quadprog/distinfo index c854a50d9b39..c3da1702837b 100644 --- a/math/py-quadprog/distinfo +++ b/math/py-quadprog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551374538 -SHA256 (quadprog-0.1.6.tar.gz) = 5e161635fb7f2730edef0070448bdbe93784552202c12e15e0fbf640f0cef0f4 -SIZE (quadprog-0.1.6.tar.gz) = 107537 +TIMESTAMP = 1567186997 +SHA256 (quadprog-0.1.7.tar.gz) = f308b9a4f0368c956fd48e480dfadad7a9497ed7c1bb3059a2777b7deb4fbff9 +SIZE (quadprog-0.1.7.tar.gz) = 18048 diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile index f90ab184989f..46c4da412fed 100644 --- a/math/py-rpy2/Makefile +++ b/math/py-rpy2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rpy2 -DISTVERSION= 3.0.5 -PORTREVISION= 1 +DISTVERSION= 3.1.0 CATEGORIES= math MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,7 +21,9 @@ LIB_DEPENDS= libR.so:math/R \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=0:devel/py-tzlocal@${PY_FLAVOR} USES= fortran python:3.5+ readline USE_PYTHON= autoplist distutils diff --git a/math/py-rpy2/distinfo b/math/py-rpy2/distinfo index 4c83bfe4f1a4..af2013c4d6e1 100644 --- a/math/py-rpy2/distinfo +++ b/math/py-rpy2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563542761 -SHA256 (rpy2-3.0.5.tar.gz) = c1fcd966780ebc3ea2400f73b558a801fbc17c09312f55d27b391b48fc24c8f9 -SIZE (rpy2-3.0.5.tar.gz) = 117660 +TIMESTAMP = 1567451240 +SHA256 (rpy2-3.1.0.tar.gz) = ed4284df32d00b1fba5b1409e5df64b04b02d47aff543d6ef1dc211ab94e247f +SIZE (rpy2-3.1.0.tar.gz) = 158773 diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile deleted file mode 100644 index 4042e10830a3..000000000000 --- a/math/py-yt/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Created by: Yuri Victorovich <yuri@rawbw.com> -# $FreeBSD$ - -PORTNAME= yt -DISTVERSION= 3.5.0 -PORTREVISION= 3 -CATEGORIES= math astro python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= yuri@FreeBSD.org -COMMENT= Analysis and visualization toolkit for volumetric data - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/COPYING.txt - -DEPRECATED= Depends on expiring graphics/embree -EXPIRATION_DATE= 2019-09-04 - -BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR} -LIB_DEPENDS= libembree.so:graphics/embree \ - libomp.so:devel/openmp -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=1.0:math/py-sympy@${PY_FLAVOR} \ - ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipython5>=1.0:devel/ipython5@${PY_FLAVOR} - -USES= dos2unix localbase python -USE_PYTHON= distutils cython autoplist concurrent - -post-patch: - @${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|True|; s|check_for_openmp() is True|True|" \ - ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e "s|\['-fopenmp', filename\]|['-I${LOCALBASE}/include', '-L${LOCALBASE}/lib', '-lm', '-fopenmp', filename]|" \ - ${WRKSRC}/setupext.py - -post-install: - @${STRIP_CMD} $$(${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so") - -.include <bsd.port.mk> diff --git a/math/py-yt/distinfo b/math/py-yt/distinfo deleted file mode 100644 index e3cfab5cd2e8..000000000000 --- a/math/py-yt/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1539846194 -SHA256 (yt-3.5.0.tar.gz) = ee4bf8349f02ce21f571654c26d85c1f69d9678fc8f5c7cfe5d1686c7ed2e3ca -SIZE (yt-3.5.0.tar.gz) = 10417638 diff --git a/math/py-yt/files/patch-yt_extern_tqdm___utils.py b/math/py-yt/files/patch-yt_extern_tqdm___utils.py deleted file mode 100644 index 42900ea89072..000000000000 --- a/math/py-yt/files/patch-yt_extern_tqdm___utils.py +++ /dev/null @@ -1,11 +0,0 @@ ---- yt/extern/tqdm/_utils.py.orig 2017-01-01 20:57:19 UTC -+++ yt/extern/tqdm/_utils.py -@@ -40,7 +40,7 @@ def _environ_cols_wrapper(): # pragma: - _environ_cols = _environ_cols_windows - if _environ_cols is None: - _environ_cols = _environ_cols_tput -- if current_os in ['Linux', 'Darwin'] or current_os.startswith('CYGWIN'): -+ if current_os in ['FreeBSD', 'Linux', 'Darwin'] or current_os.startswith('CYGWIN'): - _environ_cols = _environ_cols_linux - return _environ_cols - diff --git a/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h b/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h deleted file mode 100644 index 4bf2fcc821d3..000000000000 --- a/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h +++ /dev/null @@ -1,11 +0,0 @@ ---- yt/utilities/lib/platform_dep.h.orig 2017-01-01 20:57:35 UTC -+++ yt/utilities/lib/platform_dep.h -@@ -57,7 +57,7 @@ double erf(double x) - - #else - #include <stdint.h> --#include "alloca.h" -+#include <stdlib.h> - #include <math.h> - #endif - diff --git a/math/py-yt/pkg-descr b/math/py-yt/pkg-descr deleted file mode 100644 index 164d85c3123e..000000000000 --- a/math/py-yt/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -yt supports structured, variable-resolution meshes, unstructured meshes, -and discrete or sampled data such as particles. Focused on driving -physically-meaningful inquiry, yt has been applied in domains such as -astrophysics, seismology, nuclear engineering, molecular dynamics, and -oceanography. - -WWW: http://yt-project.org diff --git a/math/rkward-kde/files/patch-rkward_rkward.cpp b/math/rkward-kde/files/patch-rkward_rkward.cpp new file mode 100644 index 000000000000..c30b0512e6f8 --- /dev/null +++ b/math/rkward-kde/files/patch-rkward_rkward.cpp @@ -0,0 +1,10 @@ +--- rkward/rkward.cpp.orig 2019-09-05 17:14:20 UTC ++++ rkward/rkward.cpp +@@ -24,6 +24,7 @@ + #include <QMenuBar> + #include <QStatusBar> + #include <QInputDialog> ++#include <QHBoxLayout> + + // include files for KDE + #include <kmessagebox.h> diff --git a/math/rkward-kde/files/patch-rkward_windows_rktoolwindowbar.cpp b/math/rkward-kde/files/patch-rkward_windows_rktoolwindowbar.cpp new file mode 100644 index 000000000000..f772e084471c --- /dev/null +++ b/math/rkward-kde/files/patch-rkward_windows_rktoolwindowbar.cpp @@ -0,0 +1,10 @@ +--- rkward/windows/rktoolwindowbar.cpp.orig 2019-09-04 19:20:47 UTC ++++ rkward/windows/rktoolwindowbar.cpp +@@ -24,6 +24,7 @@ + #include <kparts/partmanager.h> + #include <kselectaction.h> + ++#include <QLayout> + #include <QSplitter> + #include <QContextMenuEvent> + diff --git a/math/rkward-kde/files/patch-rkward_windows_rkworkplace.cpp b/math/rkward-kde/files/patch-rkward_windows_rkworkplace.cpp new file mode 100644 index 000000000000..f72eddd848d2 --- /dev/null +++ b/math/rkward-kde/files/patch-rkward_windows_rkworkplace.cpp @@ -0,0 +1,10 @@ +--- rkward/windows/rkworkplace.cpp.orig 2019-09-04 19:06:32 UTC ++++ rkward/windows/rkworkplace.cpp +@@ -31,6 +31,7 @@ + #include <QDir> + #include <QApplication> + #include <QMimeDatabase> ++#include <QVBoxLayout> + + #include "detachedwindowcontainer.h" + #include "rkcommandeditorwindow.h" diff --git a/math/rocs/distinfo b/math/rocs/distinfo index 7c1ecd4610a6..4620f3a3f8fb 100644 --- a/math/rocs/distinfo +++ b/math/rocs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565555691 -SHA256 (KDE/applications/19.08.0/rocs-19.08.0.tar.xz) = 2e9346781bb6198a3fb3c3357ef796c0e86fdd104146de87a481619d3cbe78fe -SIZE (KDE/applications/19.08.0/rocs-19.08.0.tar.xz) = 1516860 +TIMESTAMP = 1567537263 +SHA256 (KDE/applications/19.08.1/rocs-19.08.1.tar.xz) = eaa2fefae8123071e5802d0c13016d0b99608f91c75c7c6e4fbe6f2c6dc12adf +SIZE (KDE/applications/19.08.1/rocs-19.08.1.tar.xz) = 1517012 diff --git a/math/symphony/Makefile b/math/symphony/Makefile new file mode 100644 index 000000000000..1f8b7b214e01 --- /dev/null +++ b/math/symphony/Makefile @@ -0,0 +1,26 @@ +# $FreeBSD$ + +PORTNAME= symphony +DISTVERSIONPREFIX= releases/ +DISTVERSION= 5.6.17 +CATEGORIES= math +PKGNAMEPREFIX= coin-or- + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Solver and development framework for mixed-integer linear programs + +LICENSE= EPL +LICENSE_FILE= ${WRKSRC}/SYMPHONY/LICENSE + +LIB_DEPENDS= libCbc.so:math/coinmp + +USES= gmake libtool pkgconfig +GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= coin-or +GH_PROJECT= SYMPHONY +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip + +.include <bsd.port.mk> diff --git a/math/symphony/distinfo b/math/symphony/distinfo new file mode 100644 index 000000000000..043e49b5f477 --- /dev/null +++ b/math/symphony/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1566695939 +SHA256 (coin-or-SYMPHONY-releases-5.6.17_GH0.tar.gz) = f6c2b9c9e60ebff4a665e243e765649334c5d0680f536d3d9c0c372025ab96dc +SIZE (coin-or-SYMPHONY-releases-5.6.17_GH0.tar.gz) = 1848015 diff --git a/math/symphony/pkg-descr b/math/symphony/pkg-descr new file mode 100644 index 000000000000..df136115aadd --- /dev/null +++ b/math/symphony/pkg-descr @@ -0,0 +1,9 @@ +SYMPHONY is an open-source solver for mixed-integer linear programs (MILPs) +written in C. It can be used in four different main modes: +* As a callable library through either the native C interface or through the + Osi. +* As an interactive solver using a command-line interface. +* As a framework to build customized solvers for specific problem classes. +* Through a number of different modeling languages: AMPL, GMPL, GAMS, PuLP. + +WWW: https://projects.coin-or.org/SYMPHONY diff --git a/math/symphony/pkg-plist b/math/symphony/pkg-plist new file mode 100644 index 000000000000..94a261cfdf7e --- /dev/null +++ b/math/symphony/pkg-plist @@ -0,0 +1,19 @@ +bin/symphony +include/coin/OsiSymSolverInterface.hpp +include/coin/OsiSymSolverParameters.hpp +include/coin/SymConfig.h +include/coin/SymWarmStart.hpp +include/coin/symphony.h +lib/libOsiSym.so +lib/libOsiSym.so.3 +lib/libOsiSym.so.3.6.17 +lib/libSym.so +lib/libSym.so.3 +lib/libSym.so.3.6.17 +libdata/pkgconfig/osi-sym.pc +libdata/pkgconfig/symphony-app.pc +libdata/pkgconfig/symphony.pc +share/coin/doc/SYMPHONY/AUTHORS +share/coin/doc/SYMPHONY/LICENSE +share/coin/doc/SYMPHONY/README +share/coin/doc/SYMPHONY/sym_addlibs.txt diff --git a/math/tvm/Makefile b/math/tvm/Makefile new file mode 100644 index 000000000000..c4bb6afaf447 --- /dev/null +++ b/math/tvm/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= tvm +DISTVERSIONPREFIX= v +DISTVERSION= 0.4-1440 +DISTVERSIONSUFFIX= -g347e3d9d +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Deep learning compiler stack for cpu, gpu and specialized accelerators + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= dmlc-core>0:devel/dmlc-core \ + rang>0:devel/rang + +USES= cmake localbase +USE_GITHUB= yes +GH_ACCOUNT= dmlc +GH_TUPLE= dmlc:dlpack:0acb731:dlpack/3rdparty/dlpack +USE_LDCONFIG= yes + +.include <bsd.port.mk> diff --git a/math/tvm/distinfo b/math/tvm/distinfo new file mode 100644 index 000000000000..fb18e00d18f9 --- /dev/null +++ b/math/tvm/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1566889638 +SHA256 (dmlc-tvm-v0.4-1440-g347e3d9d_GH0.tar.gz) = 57caebe24afb19158cedf546d89d35f47d6a22c8ba6f1109d3017e756a1480db +SIZE (dmlc-tvm-v0.4-1440-g347e3d9d_GH0.tar.gz) = 2694303 +SHA256 (dmlc-dlpack-0acb731_GH0.tar.gz) = e246632ccb182369e78a4028bfd9d3ff8a3507620ba414126fb0e860477248ba +SIZE (dmlc-dlpack-0acb731_GH0.tar.gz) = 39435 diff --git a/math/tvm/pkg-descr b/math/tvm/pkg-descr new file mode 100644 index 000000000000..cb5ef2261d34 --- /dev/null +++ b/math/tvm/pkg-descr @@ -0,0 +1,6 @@ +TVM is a compiler stack for deep learning systems. It is designed to close the +gap between the productivity-focused deep learning frameworks, and the +performance- and efficiency-focused hardware backends. TVM works with deep +learning frameworks to provide end to end compilation to different backends. + +WWW: https://tvm.ai/ diff --git a/math/tvm/pkg-plist b/math/tvm/pkg-plist new file mode 100644 index 000000000000..3a1393e21738 --- /dev/null +++ b/math/tvm/pkg-plist @@ -0,0 +1,17 @@ +include/tvm/runtime/c_backend_api.h +include/tvm/runtime/c_runtime_api.h +include/tvm/runtime/device_api.h +include/tvm/runtime/module.h +include/tvm/runtime/ndarray.h +include/tvm/runtime/node_base.h +include/tvm/runtime/object.h +include/tvm/runtime/packed_func.h +include/tvm/runtime/registry.h +include/tvm/runtime/serializer.h +include/tvm/runtime/threading_backend.h +include/tvm/runtime/util.h +include/tvm/runtime/vm.h +lib/libnnvm_compiler.so +lib/libtvm.so +lib/libtvm_runtime.so +lib/libtvm_topi.so diff --git a/math/vampire/Makefile b/math/vampire/Makefile new file mode 100644 index 000000000000..7c2e9e6ab983 --- /dev/null +++ b/math/vampire/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= vampire +DISTVERSION= 4.4 +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Automatic theorem prover + +LICENSE= BSD2CLAUSE +xLICENSE_FILE= ${WRKSRC}/LICENSE + +USES= compiler:c++11-lang gmake +USE_GITHUB= yes +GH_ACCOUNT= vprover + +ALL_TARGET= vampire_rel # do we also need the z3 target? + +BINARY_ALIAS= g++=${CXX} + +CXXFLAGS+= -DCHECK_LEAKS=0 +MAKE_ARGS= FREEBSD_VERSION_NUMBER="${PORTVERSION}" + +#MAKE_ARGS= GNUMPF=1 # This causes compillation failure, additionally GitHub failed to create the issue for this project. + +PLIST_FILES= bin/${PORTNAME} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET}* ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include <bsd.port.mk> diff --git a/math/vampire/distinfo b/math/vampire/distinfo new file mode 100644 index 000000000000..5debd66afb3d --- /dev/null +++ b/math/vampire/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567051355 +SHA256 (vprover-vampire-4.4_GH0.tar.gz) = 43f09743a3a505ec8d8ac6fb60420915d56c4164be3caab728d7856a4f2ace8d +SIZE (vprover-vampire-4.4_GH0.tar.gz) = 1748193 diff --git a/math/vampire/files/patch-Lib_Portability.hpp b/math/vampire/files/patch-Lib_Portability.hpp new file mode 100644 index 000000000000..e82b0a05f6c8 --- /dev/null +++ b/math/vampire/files/patch-Lib_Portability.hpp @@ -0,0 +1,16 @@ +--- Lib/Portability.hpp.orig 2018-12-01 20:14:14 UTC ++++ Lib/Portability.hpp +@@ -25,11 +25,11 @@ + // Detect compiler + + #ifndef __APPLE__ +-# define __APPLE__ 0 ++//# define __APPLE__ 0 + #endif + + #ifndef __CYGWIN__ +-# define __CYGWIN__ 0 ++//# define __CYGWIN__ 0 + #endif + + ////////////////////////////////////////////////////// diff --git a/math/vampire/files/patch-Lib_System.cpp b/math/vampire/files/patch-Lib_System.cpp new file mode 100644 index 000000000000..1d054dcf2b31 --- /dev/null +++ b/math/vampire/files/patch-Lib_System.cpp @@ -0,0 +1,26 @@ +--- Lib/System.cpp.orig 2018-12-01 20:15:38 UTC ++++ Lib/System.cpp +@@ -27,9 +27,13 @@ + #include <stdlib.h> + # include <unistd.h> + # if !__APPLE__ && !__CYGWIN__ +-# include <sys/prctl.h> ++//# include <sys/prctl.h> + # endif + ++#if defined (__FreeBSD__) ++#include <sys/wait.h> ++#endif ++ + #include <dirent.h> + + #include <cerrno> +@@ -360,7 +364,7 @@ void System::terminateImmediately(int re + */ + void System::registerForSIGHUPOnParentDeath() + { +-#if __APPLE__ || __CYGWIN__ ++#if __APPLE__ || __CYGWIN__ || __FreeBSD__ + // cerr<<"Death of parent process not being handled on Mac and Windows"<<endl; + // NOT_IMPLEMENTED; + #else diff --git a/math/vampire/files/patch-Makefile b/math/vampire/files/patch-Makefile new file mode 100644 index 000000000000..e4525c0022b1 --- /dev/null +++ b/math/vampire/files/patch-Makefile @@ -0,0 +1,27 @@ +--- Makefile.orig 2019-08-23 07:50:16 UTC ++++ Makefile +@@ -557,20 +557,17 @@ VERSION_NUMBER = 4.4.0 + # The dependency on .git/HEAD tracks switching between branches, + # the dependency on .git/index tracks new commits. + +-.git/HEAD: +-.git/index: +- +-version.cpp: .git/HEAD .git/index Makefile ++version.cpp: Makefile + @echo "//Automatically generated file, see Makefile for details" > $@ +- @echo "const char* VERSION_STRING = \"Vampire $(VERSION_NUMBER) (commit $(shell git log -1 --format=%h\ on\ %ci || echo unknown))\";" >> $@ ++ @echo "const char* VERSION_STRING = \"Vampire $(FREEBSD_VERSION_NUMBER)\";" >> $@ + + ################################################################ + # separate directory for object files implementation + + # different directory for each configuration, so there is no need for "make clean" + SED_CMD='s/^[(]HEAD$$/detached/' # +-BRANCH=$(shell git branch | grep "\*" | cut -d ' ' -f 2 | sed -e $(SED_CMD) ) +-COM_CNT=$(shell git rev-list HEAD --count) ++BRANCH="master" ++COM_CNT="0" + CONF_ID := obj/$(shell echo -n "$(BRANCH) $(XFLAGS)"|sum|cut -d ' ' -f1)X + + obj: diff --git a/math/vampire/pkg-descr b/math/vampire/pkg-descr new file mode 100644 index 000000000000..90442288a95d --- /dev/null +++ b/math/vampire/pkg-descr @@ -0,0 +1,9 @@ +Automatic theorem proving has a number of important applications, such as +software verification, hardware verification, hardware design, knowledge +representation and reasoning, the Semantic Web, algebra, and proving theorems +in mathematics. Over 50 years of research in theorem proving have resulted in +one of the most advanced and elegant theories in computer science. This area is +an ideal target for scientific engineering: implementation techniques have to be +developed to realise an advanced theory in practically valuable tools. + +WWW: https://vprover.github.io/ |