diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index ce15d76ec27c..76d310981e7a 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -1,53 +1,53 @@ PORTNAME= nlopt DISTVERSIONPREFIX= v -DISTVERSION= 2.10.1 -PORTREVISION= 2 +DISTVERSION= 2.11.0 CATEGORIES= math MAINTAINER= rhurlin@FreeBSD.org COMMENT= Nonlinear optimization library WWW= https://nlopt.readthedocs.io/ \ https://github.com/stevengj/nlopt/ LICENSE= LGPL21 MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_armv6= fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory BROKEN_armv7= fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory FLAVORS= full minimal FLAVOR?= ${FLAVORS:[1]} full_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \ swig:devel/swig full_LIB_DEPENDS= liboctave.so:math/octave full_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} full_CONFLICTS_INSTALL= ${PORTNAME}-minimal minimal_PKGNAMESUFFIX= -minimal minimal_CONFLICTS_INSTALL= ${PORTNAME} USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= stevengj USE_LDCONFIG= yes -# 'make test': 100% tests passed, 0 tests failed out of 83 +# 'make FLAVOR=full test': 100% tests passed, 0 tests failed out of 84 +# 'make FLAVOR=minimal test': 100% tests passed, 0 tests failed out of 77 CMAKE_TESTING_ON= NLOPT_TESTS .if ${FLAVOR} == full USES+= guile:3.0,alias localbase octave:env pkgconfig python # Because guile-config-3.0 crashes, nlopt avoids this by using # files/patch-cmake_FindGuile.cmake and setting GUILE_EXECUTABLE # and GUILE_CONFIG_EXECUTABLE MAKE_ENV+= GUILE_EXECUTABLE=${PREFIX}/bin/guile-3.0 \ GUILE_CONFIG_EXECUTABLE=${PREFIX}/bin/guile-config-3.0 CMAKE_OFF= NLOPT_JAVA GNU_HOST= ${ARCH}-portbld-freebsd${OSREL} PLIST= ${PKGDIR}/pkg-plist.${FLAVOR} PLIST_SUB= GNU_HOST=${GNU_HOST} OCTAVE_VERSION=${OCTAVE_VERSION} .elif ${FLAVOR} == minimal CMAKE_OFF= NLOPT_GUILE NLOPT_JAVA NLOPT_OCTAVE NLOPT_PYTHON NLOPT_SWIG .endif .include diff --git a/math/nlopt/distinfo b/math/nlopt/distinfo index a60c626813d7..82fc0e3832e3 100644 --- a/math/nlopt/distinfo +++ b/math/nlopt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770744225 -SHA256 (stevengj-nlopt-v2.10.1_GH0.tar.gz) = 30d13ce16da119db3e987784f7864e35a562ec62c186352fae55cd003e6c58ff -SIZE (stevengj-nlopt-v2.10.1_GH0.tar.gz) = 2064973 +TIMESTAMP = 1780762090 +SHA256 (stevengj-nlopt-v2.11.0_GH0.tar.gz) = 53e552d83e9294d67db37f0f4a23f15933a9ef698485301a18b98b40004cf0de +SIZE (stevengj-nlopt-v2.11.0_GH0.tar.gz) = 2065716 diff --git a/math/nlopt/files/patch-src_swig_CMakeLists.txt b/math/nlopt/files/patch-src_swig_CMakeLists.txt index 904492141700..8d5b9d304a51 100644 --- a/math/nlopt/files/patch-src_swig_CMakeLists.txt +++ b/math/nlopt/files/patch-src_swig_CMakeLists.txt @@ -1,15 +1,15 @@ ---- src/swig/CMakeLists.txt.orig 2025-02-04 18:29:30 UTC +--- src/swig/CMakeLists.txt.orig 2026-06-05 18:42:06 UTC +++ src/swig/CMakeLists.txt -@@ -58,10 +58,10 @@ if (GUILE_FOUND) +@@ -52,10 +52,10 @@ if (GUILE_FOUND AND NLOPT_CXX) set (CMAKE_SWIG_FLAGS) - target_include_directories (nlopt_guile PRIVATE ${GUILE_INCLUDE_DIRS}) + target_compile_options(nlopt_guile PRIVATE ${GUILE_CFLAGS}) - target_link_libraries (nlopt_guile ${nlopt_lib}) -- target_link_libraries (nlopt_guile ${GUILE_LIBRARIES}) + target_link_libraries (nlopt_guile PRIVATE ${nlopt_lib}) +- target_link_libraries (nlopt_guile PRIVATE ${GUILE_LIBRARIES}) + target_link_options(nlopt_guile PRIVATE ${GUILE_LDFLAGS}) set_target_properties (nlopt_guile PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}") file (RELATIVE_PATH _REL_GUILE_SITE_PATH ${GUILE_ROOT_DIR} ${GUILE_SITE_DIR}) diff --git a/math/nlopt/pkg-plist b/math/nlopt/pkg-plist index 0f3a0325fb15..8432f1d3f03e 100644 --- a/math/nlopt/pkg-plist +++ b/math/nlopt/pkg-plist @@ -1,13 +1,13 @@ include/nlopt.h include/nlopt.hpp lib/cmake/nlopt/NLoptConfig.cmake lib/cmake/nlopt/NLoptConfigVersion.cmake lib/cmake/nlopt/NLoptLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nlopt/NLoptLibraryDepends.cmake lib/libnlopt.so lib/libnlopt.so.1 -lib/libnlopt.so.1.0.0 +lib/libnlopt.so.1.1.0 libdata/pkgconfig/nlopt.pc share/man/man3/nlopt.3.gz share/man/man3/nlopt_minimize.3.gz share/man/man3/nlopt_minimize_constrained.3.gz diff --git a/math/nlopt/pkg-plist.full b/math/nlopt/pkg-plist.full index d95671430326..2b467bedcebf 100644 --- a/math/nlopt/pkg-plist.full +++ b/math/nlopt/pkg-plist.full @@ -1,64 +1,64 @@ include/nlopt.h include/nlopt.hpp lib/cmake/nlopt/NLoptConfig.cmake lib/cmake/nlopt/NLoptConfigVersion.cmake lib/cmake/nlopt/NLoptLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nlopt/NLoptLibraryDepends.cmake lib/guile/%%GUILE_VER%%/extensions/nlopt_guile.so lib/libnlopt.so lib/libnlopt.so.1 -lib/libnlopt.so.1.0.0 +lib/libnlopt.so.1.1.0 lib/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%/nlopt_optimize.oct %%PYTHON_SITELIBDIR%%/_nlopt.so -%%PYTHON_SITELIBDIR%%/nlopt-2.10.1.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/nlopt-2.11.0.dist-info/METADATA %%PYTHON_SITELIBDIR%%/nlopt.py libdata/pkgconfig/nlopt.pc %%GUILE_SITE%%/nlopt.scm share/man/man3/nlopt.3.gz share/man/man3/nlopt_minimize.3.gz share/man/man3/nlopt_minimize_constrained.3.gz share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_AUGLAG.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_AUGLAG_EQ.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_MLSL.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_MLSL_LDS.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_STOGO.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GD_STOGO_RAND.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_AGS.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_CRS2_LM.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L_NOSCAL.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L_RAND.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_L_RAND_NOSCAL.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_DIRECT_NOSCAL.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ESCH.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ISRES.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_MLSL.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_MLSL_LDS.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ORIG_DIRECT.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_GN_ORIG_DIRECT_L.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_G_MLSL.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_G_MLSL_LDS.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_AUGLAG.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_AUGLAG_EQ.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_CCSAQ.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_LBFGS.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_MMA.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_SLSQP.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON_PRECOND.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON_PRECOND_RESTART.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_TNEWTON_RESTART.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_VAR1.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LD_VAR2.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_AUGLAG.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_AUGLAG_EQ.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_BOBYQA.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_COBYLA.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_NELDERMEAD.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_NEWUOA.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_NEWUOA_BOUND.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_PRAXIS.m share/octave/%%OCTAVE_VERSION%%/site/m/NLOPT_LN_SBPLX.m share/octave/%%OCTAVE_VERSION%%/site/m/nlopt_minimize.m share/octave/%%OCTAVE_VERSION%%/site/m/nlopt_minimize_constrained.m