pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Request upgrade of math/ipopt



Request to upgrade math/ipopt.

I am trying to build wip/scip which requires ipopt min 3.12, pkgsrc has
3.11.5 and upstream latest is 3.14.4

Attaching a patch to upgrade to the latest, which built fine without
applying pkgsrc patches on NetBSD 9.2 amd64.

Please check.

-- 
Mayuresh
diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
index 7f43d217849..0eef5ef97c9 100644
--- a/math/ipopt/Makefile
+++ b/math/ipopt/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2023/08/02 19:21:55 nia Exp $
 
-DISTNAME=	Ipopt-3.11.5
-PKGREVISION=	1
+DISTNAME=	Ipopt-3.14.4
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/Ipopt/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	asau%inbox.ru@localhost
 HOMEPAGE=	https://projects.coin-or.org/Ipopt
@@ -15,6 +14,12 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
+IPOPTRELEASEDIR=Ipopt-releases-3.14.4
+WRKSRC=		${WRKDIR}/${IPOPTRELEASEDIR}
+
+post-extract:
+	cd ${WRKDIR} && ${LN} -s ${IPOPTRELEASEDIR} Ipopt
+
 TEST_TARGET=	test
 
 # Fails with C++14 default language
diff --git a/math/ipopt/PLIST b/math/ipopt/PLIST
index cfa76906e78..046f3922b01 100644
--- a/math/ipopt/PLIST
+++ b/math/ipopt/PLIST
@@ -1,51 +1,87 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2013/11/14 15:04:12 asau Exp $
-include/coin/HSLLoader.h
-include/coin/IpAlgTypes.hpp
-include/coin/IpBlas.hpp
-include/coin/IpCachedResults.hpp
-include/coin/IpCompoundVector.hpp
-include/coin/IpDebug.hpp
-include/coin/IpDenseVector.hpp
-include/coin/IpException.hpp
-include/coin/IpIpoptApplication.hpp
-include/coin/IpIpoptCalculatedQuantities.hpp
-include/coin/IpIpoptData.hpp
-include/coin/IpIpoptNLP.hpp
-include/coin/IpIteratesVector.hpp
-include/coin/IpJournalist.hpp
-include/coin/IpLapack.hpp
-include/coin/IpMatrix.hpp
-include/coin/IpNLP.hpp
-include/coin/IpNLPScaling.hpp
-include/coin/IpObserver.hpp
-include/coin/IpOptionsList.hpp
-include/coin/IpOrigIpoptNLP.hpp
-include/coin/IpReferenced.hpp
-include/coin/IpRegOptions.hpp
-include/coin/IpReturnCodes.h
-include/coin/IpReturnCodes.hpp
-include/coin/IpReturnCodes.inc
-include/coin/IpReturnCodes_inc.h
-include/coin/IpSmartPtr.hpp
-include/coin/IpSolveStatistics.hpp
-include/coin/IpStdCInterface.h
-include/coin/IpSymMatrix.hpp
-include/coin/IpTNLP.hpp
-include/coin/IpTNLPAdapter.hpp
-include/coin/IpTNLPReducer.hpp
-include/coin/IpTaggedObject.hpp
-include/coin/IpTimedTask.hpp
-include/coin/IpTimingStatistics.hpp
-include/coin/IpTypes.hpp
-include/coin/IpUtils.hpp
-include/coin/IpVector.hpp
-include/coin/IpoptConfig.h
-include/coin/PardisoLoader.h
+@comment $NetBSD$
+include/coin-or/IpAlgBuilder.hpp
+include/coin-or/IpAlgStrategy.hpp
+include/coin-or/IpAlgTypes.hpp
+include/coin-or/IpAugSystemSolver.hpp
+include/coin-or/IpBlas.hpp
+include/coin-or/IpCachedResults.hpp
+include/coin-or/IpCompoundMatrix.hpp
+include/coin-or/IpCompoundSymMatrix.hpp
+include/coin-or/IpCompoundVector.hpp
+include/coin-or/IpConvCheck.hpp
+include/coin-or/IpDebug.hpp
+include/coin-or/IpDenseVector.hpp
+include/coin-or/IpDiagMatrix.hpp
+include/coin-or/IpEqMultCalculator.hpp
+include/coin-or/IpException.hpp
+include/coin-or/IpExpansionMatrix.hpp
+include/coin-or/IpGenTMatrix.hpp
+include/coin-or/IpHessianUpdater.hpp
+include/coin-or/IpIdentityMatrix.hpp
+include/coin-or/IpIpoptAlg.hpp
+include/coin-or/IpIpoptApplication.hpp
+include/coin-or/IpIpoptCalculatedQuantities.hpp
+include/coin-or/IpIpoptData.hpp
+include/coin-or/IpIpoptNLP.hpp
+include/coin-or/IpIterateInitializer.hpp
+include/coin-or/IpIteratesVector.hpp
+include/coin-or/IpIterationOutput.hpp
+include/coin-or/IpJournalist.hpp
+include/coin-or/IpLapack.hpp
+include/coin-or/IpLineSearch.hpp
+include/coin-or/IpLinearSolvers.h
+include/coin-or/IpMatrix.hpp
+include/coin-or/IpMuUpdate.hpp
+include/coin-or/IpNLP.hpp
+include/coin-or/IpNLPScaling.hpp
+include/coin-or/IpObserver.hpp
+include/coin-or/IpOptionsList.hpp
+include/coin-or/IpOrigIpoptNLP.hpp
+include/coin-or/IpPDSystemSolver.hpp
+include/coin-or/IpReferenced.hpp
+include/coin-or/IpRegOptions.hpp
+include/coin-or/IpReturnCodes.h
+include/coin-or/IpReturnCodes.hpp
+include/coin-or/IpReturnCodes.inc
+include/coin-or/IpReturnCodes_inc.h
+include/coin-or/IpScaledMatrix.hpp
+include/coin-or/IpSearchDirCalculator.hpp
+include/coin-or/IpSmartPtr.hpp
+include/coin-or/IpSolveStatistics.hpp
+include/coin-or/IpStdCInterface.h
+include/coin-or/IpSumSymMatrix.hpp
+include/coin-or/IpSymLinearSolver.hpp
+include/coin-or/IpSymMatrix.hpp
+include/coin-or/IpSymScaledMatrix.hpp
+include/coin-or/IpSymTMatrix.hpp
+include/coin-or/IpTNLP.hpp
+include/coin-or/IpTNLPAdapter.hpp
+include/coin-or/IpTNLPReducer.hpp
+include/coin-or/IpTaggedObject.hpp
+include/coin-or/IpTimedTask.hpp
+include/coin-or/IpTimingStatistics.hpp
+include/coin-or/IpTripletHelper.hpp
+include/coin-or/IpTypes.h
+include/coin-or/IpTypes.hpp
+include/coin-or/IpUtils.hpp
+include/coin-or/IpVector.hpp
+include/coin-or/IpZeroSymMatrix.hpp
+include/coin-or/IpoptConfig.h
+include/coin-or/SensAlgorithm.hpp
+include/coin-or/SensApplication.hpp
+include/coin-or/SensBacksolver.hpp
+include/coin-or/SensMeasurement.hpp
+include/coin-or/SensPCalculator.hpp
+include/coin-or/SensRegOp.hpp
+include/coin-or/SensSchurData.hpp
+include/coin-or/SensSchurDriver.hpp
+include/coin-or/SensSimpleBacksolver.hpp
+include/coin-or/SensStepCalc.hpp
+include/coin-or/SensUtils.hpp
 lib/libipopt.la
+lib/libsipopt.la
 lib/pkgconfig/ipopt.pc
-share/coin/doc/Ipopt/AUTHORS
-share/coin/doc/Ipopt/LICENSE
-share/coin/doc/Ipopt/README
-share/coin/doc/Ipopt/ipopt_addlibs_c.txt
-share/coin/doc/Ipopt/ipopt_addlibs_cpp.txt
-share/coin/doc/Ipopt/ipopt_addlibs_f.txt
+share/doc/ipopt/AUTHORS
+share/doc/ipopt/ChangeLog.md
+share/doc/ipopt/LICENSE
+share/doc/ipopt/README.md
diff --git a/math/ipopt/distinfo b/math/ipopt/distinfo
index d06a6d2191a..aa9ec56b900 100644
--- a/math/ipopt/distinfo
+++ b/math/ipopt/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.6 2021/10/26 10:55:45 nia Exp $
 
-BLAKE2s (Ipopt-3.11.5.tgz) = c56b2f156c1ff7d3f2d0ebd646d989308787379b9b33e1896a34759034b212b7
-SHA512 (Ipopt-3.11.5.tgz) = c86b73672bc17a6e1d7d126c79e015519364c267a5930d492b7a6b4fcd63d5caed85766f250fd8bc7ebf87fc9da06419b058450750a03e8915e56b9bea07d345
-Size (Ipopt-3.11.5.tgz) = 4743371 bytes
+BLAKE2s (Ipopt-3.14.4.tar.gz) = 8278c215dc80e027767d30aa0b40e7a3950ce4d962049e2050089d797e0a6ecd
+SHA512 (Ipopt-3.14.4.tar.gz) = a27a08ae24c94da96efcfa236034cec79d79111d7dc9c028d808b412d5abb21495a0011f075a87db65b91ba69e191653552e7f99fe8da88c3b580d971eac3652
+Size (Ipopt-3.14.4.tar.gz) = 1843885 bytes
 SHA1 (patch-Ipopt_Makefile.in) = 6582e7425f1d3d8b9b010caa89225fe000e3897a
 SHA1 (patch-Ipopt_configure) = a8737f537b8638a71d65d83658770826bfefc5e6
 SHA1 (patch-ThirdParty_HSLold_configure) = e4993ba13c1c84a4d83992c3ce0c58a500af7462
diff --git a/math/ipopt/patches/patch-Ipopt_Makefile.in b/math/ipopt/patches/patch-Ipopt_Makefile.in
deleted file mode 100644
index f4e30a11181..00000000000
--- a/math/ipopt/patches/patch-Ipopt_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Ipopt_Makefile.in,v 1.1 2013/12/06 21:24:59 joerg Exp $
-
---- Ipopt/Makefile.in.orig	2013-12-06 17:06:05.000000000 +0000
-+++ Ipopt/Makefile.in
-@@ -1077,7 +1077,7 @@ astyle:
- #   since pkg-config may have reordered the flags from FLIBS, we take them out one by one
- install-data-hook:
- 	@$(mkdir_p) "$(addlibsdir)"
--@COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
-+@COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH=${DESTDIR}${pkgconfiglibdir} \
- @COIN_HAS_PKGCONFIG_TRUE@	$(PKG_CONFIG) --libs ipopt > $(addlibsdir)/ipopt_addlibs_cpp.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libipopt.lib @IPOPTLIB_LIBS_INSTALLED@" > $(addlibsdir)/ipopt_addlibs_cpp.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-L@abs_lib_dir@ -lipopt @IPOPTLIB_LIBS_INSTALLED@" > $(addlibsdir)/ipopt_addlibs_cpp.txt
diff --git a/math/ipopt/patches/patch-Ipopt_configure b/math/ipopt/patches/patch-Ipopt_configure
deleted file mode 100644
index 00b7d146f57..00000000000
--- a/math/ipopt/patches/patch-Ipopt_configure
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-Ipopt_configure,v 1.1 2013/11/29 12:59:31 joerg Exp $
-
---- Ipopt/configure.orig	2013-11-28 03:29:00.000000000 +0000
-+++ Ipopt/configure
-@@ -5180,7 +5180,12 @@ fi
- 
-           done
-           ;;
--        -[lLR]*)
-+        -R*)
-+          ac_arg="-Wl,$ac_arg"
-+          shift
-+          set X $ac_arg "$@"
-+          ;;
-+        -[lLR]*|-Wl*)
-             ac_exists=false
-   for ac_i in $ac_cv_f77_libs; do
-     if test x"$ac_arg" = x"$ac_i"; then
diff --git a/math/ipopt/patches/patch-ThirdParty_HSLold_configure b/math/ipopt/patches/patch-ThirdParty_HSLold_configure
deleted file mode 100644
index 63edd0686be..00000000000
--- a/math/ipopt/patches/patch-ThirdParty_HSLold_configure
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ThirdParty_HSLold_configure,v 1.1 2013/11/29 12:59:31 joerg Exp $
-
---- ThirdParty/HSLold/configure.orig	2013-11-28 03:27:10.000000000 +0000
-+++ ThirdParty/HSLold/configure
-@@ -4475,7 +4475,12 @@ fi
- 
-           done
-           ;;
--        -[lLR]*)
-+        -R*)
-+          ac_arg="-Wl,$ac_arg"
-+          shift
-+          set X $ac_arg "$@"
-+          ;;
-+        -[lLR]*|-Wl*)
-             ac_exists=false
-   for ac_i in $ac_cv_f77_libs; do
-     if test x"$ac_arg" = x"$ac_i"; then


Home | Main Index | Thread Index | Old Index