diff --git a/math/cminpack/Makefile b/math/cminpack/Makefile
index 47560f69a427..b6a8876967d3 100644
--- a/math/cminpack/Makefile
+++ b/math/cminpack/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	cminpack
-PORTVERSION=	1.3.6
+PORTVERSION=	1.3.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Solving nonlinear equations and nonlinear least squares problems
 WWW=		http://devernay.free.fr/hacks/cminpack/
 
 LICENSE_FILE=	${WRKSRC}/CopyrightMINPACK.txt
 
 USES=		blaslapack:openblas cmake localbase
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	devernay
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	USE_BLAS
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} "*.[ch] testdata" \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/math/cminpack/distinfo b/math/cminpack/distinfo
index 5894a1c3c5e5..314a45dd8d7c 100644
--- a/math/cminpack/distinfo
+++ b/math/cminpack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487969746
-SHA256 (devernay-cminpack-v1.3.6_GH0.tar.gz) = 3c07fd21308c96477a2c900032e21d937739c233ee273b4347a0d4a84a32d09f
-SIZE (devernay-cminpack-v1.3.6_GH0.tar.gz) = 313459
+TIMESTAMP = 1716964535
+SHA256 (devernay-cminpack-v1.3.9_GH0.tar.gz) = aa37bac5b5caaa4f5805ea5c4240e3834c993672f6dab0b17190ee645e251c9f
+SIZE (devernay-cminpack-v1.3.9_GH0.tar.gz) = 337119
diff --git a/math/cminpack/files/patch-CMakeLists.txt b/math/cminpack/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4562f5571eff
--- /dev/null
+++ b/math/cminpack/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2024-05-29 12:19:48 UTC
++++ CMakeLists.txt
+@@ -181,7 +181,7 @@ foreach (cminpack_lib ${cminpack_libs})
+   endif ()
+   configure_file (cmake/cminpack.pc.in ${pkg_conf_file} @ONLY)
+   install (FILES ${pkg_conf_file}
+-    DESTINATION ${CMINPACK_LIB_INSTALL_DIR}/pkgconfig/ COMPONENT pkgconfig)
++    DESTINATION libdata/pkgconfig/ COMPONENT pkgconfig)
+ 
+ endforeach ()
+ 
diff --git a/math/cminpack/files/patch-cmake_CMakeLists.txt b/math/cminpack/files/patch-cmake_CMakeLists.txt
deleted file mode 100644
index a8f9c202390e..000000000000
--- a/math/cminpack/files/patch-cmake_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/CMakeLists.txt.orig	2017-02-24 21:33:00 UTC
-+++ cmake/CMakeLists.txt
-@@ -11,6 +11,6 @@ if (USE_BLAS AND BLAS_FOUND)
- endif()
- configure_file(cminpack.pc.in ${pkg_conf_file} @ONLY)
- install(FILES ${pkg_conf_file}
--    DESTINATION ${CMINPACK_LIB_INSTALL_DIR}/pkgconfig/ COMPONENT pkgconfig)
-+    DESTINATION libdata/pkgconfig/ COMPONENT pkgconfig)
- 
- install(FILES CMinpackConfig.cmake DESTINATION share/cmake/CMinpack)
diff --git a/math/cminpack/pkg-plist b/math/cminpack/pkg-plist
index 370f75318dde..fc998bc76a4e 100644
--- a/math/cminpack/pkg-plist
+++ b/math/cminpack/pkg-plist
@@ -1,67 +1,76 @@
 include/cminpack-1/cminpack.h
 include/cminpack-1/minpack.h
 lib/libcminpack.so
 lib/libcminpack.so.1
-lib/libcminpack.so.1.3.6
+lib/libcminpack.so.1.3.9
+lib/libcminpackld.so
+lib/libcminpackld.so.1
+lib/libcminpackld.so.1.3.9
+lib/libcminpacks.so
+lib/libcminpacks.so.1
+lib/libcminpacks.so.1.3.9
 libdata/pkgconfig/cminpack.pc
-share/cmake/CMinpack/CMinpackConfig.cmake
+libdata/pkgconfig/cminpackld.pc
+libdata/pkgconfig/cminpacks.pc
+%%DATADIR%%/CMinpackConfig-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/CMinpackConfig.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmpfiles.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errjac.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/genf77tests.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hybdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hybdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyjdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyjdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ibmdpdr.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ibmdpdr_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmddrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmddrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmfdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmfdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmsdrv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lmsdrv_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/machar.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/neqipt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssq.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssqfcn.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssqipt.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssqjac.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tchkder_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tchkderc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tchkderc_box.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tenorm_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tenormc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/chkder.data
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/neq.data
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/ssq.data
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata/um.data
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tfdjac2_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tfdjac2c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrd1_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrd1c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrd_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrdc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrj1_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrj1c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrj_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrjc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thybrjc_box.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmder1_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmder1c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmder_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmderc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmderc_box.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmdif1_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmdif1c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmdif_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmdifc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmstr1_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmstr1c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmstr_.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tlmstrc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vec.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vecfcn.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vecjac.c