From nobody Sun Oct 15 09:06:16 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7Z9P0XRPz4xtZT; Sun, 15 Oct 2023 09:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7Z9N758Vz4ZLd; Sun, 15 Oct 2023 09:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697360777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NS2cqtiJ3tXDxuiT7DZiSWQpKJ7UFtNbsO22l56CIUQ=; b=iIQDOpDQ6ToSEhk/Il8lDSN9JMpR8XC8Xg08uV8EVvdGDSc+CvTMXUd0th0FAhOR8bXHkA cBFaKyaJubfFtTXbHxr+x2cTrxTWz0Z1rr34AebnhOOkaqa6qgUzxHvYaktCfHsUHCPtIP cE4dlbCDeXsETxzxQ15tfbULrwuOrSFlGs1VuwnFjZGip8cz1bIB3ZKcgyKnNCZe3zsRNa PEML+g0wI5Ky9z64o35JIg/jTaPuHo/sseDVvPXP1L1/Lo37Nb+NonuBHvFNaH7yNMRFdw vc9I7nEPL5DSPatU30Ha+7mYB38Mkko7WGfF1Ws0c9fszLHpT6wthcIzs8t2cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697360777; a=rsa-sha256; cv=none; b=hPBvP5EZ80M0CY7DB8eWbZh+um3+qrU+da0NQHdbZdPxkVO1a4R3tByFZCEy5lbwhfhic5 w9zeVg5lRoit+u6AAFYIc8Ct5SecPZHuhtILVesFV2RRS1g4fxkI3NyLItkO5PLasblS5+ JKSIwonWeSfu8XnndW47i4Bg/kTvYanVhE7I8EnVv1/4ryhcIcF9coOeaGNKblVQbgVX1D k4Xgb5OooK9yrjFXb1P99JF3JFYIWaEjfsYau7tKpslu8Bw9MO5dDFndh518hRrFOI3Nwi 6u2R5K68XZkrVvUm4wEbMDjsQIIoUJt0lOlmy+XNTsPMgzOUmPo1A/K1JoGaSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697360777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NS2cqtiJ3tXDxuiT7DZiSWQpKJ7UFtNbsO22l56CIUQ=; b=ld+Sk2PufErXCiWvze46vvJ/mHTXDUqwbHYc7Lwii2Uekh34P1kYh3H87yhRZq406m0N3v 18gVMpYa+w98DDPM++nRgqqSifjDq75JBn1Lf3jGdJWjzU4fLDYgdr1S3t1H+7UNSSDvEi 9cDgxi0xZHnEfu72vIsjOBnuuJ78fNHMReXXj7jnP1vJ47uB8Yvg+F2oYQAOYigJXHSJxJ hNWQPI7VvPF6StJHuhT0F70cLrEzn9upjbd+sJbj0El+V7ZQlWGJdlvgQkZ+oqtCRLqJZv JGwDcNHaMIQjif+9kxrfMG27DpJe+79Lsh08+YPUY4JTsqyluOT0n2esBDXKGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7Z9N64d5z169w; Sun, 15 Oct 2023 09:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39F96GEI043477; Sun, 15 Oct 2023 09:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39F96GmB043474; Sun, 15 Oct 2023 09:06:16 GMT (envelope-from git) Date: Sun, 15 Oct 2023 09:06:16 GMT Message-Id: <202310150906.39F96GmB043474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 073494f9c70f - main - math/suitesparse-umfpack: upgrade to 6.2.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 073494f9c70fdd5b9d7d8104dfd926da7291363b Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=073494f9c70fdd5b9d7d8104dfd926da7291363b commit 073494f9c70fdd5b9d7d8104dfd926da7291363b Author: Thierry Thomas AuthorDate: 2023-10-14 14:04:09 +0000 Commit: Thierry Thomas CommitDate: 2023-10-15 08:59:10 +0000 math/suitesparse-umfpack: upgrade to 6.2.1 --- math/suitesparse-umfpack/Makefile | 2 +- .../files/patch-UMFPACK_Source_amd__internal.h | 283 --------------------- math/suitesparse-umfpack/pkg-plist | 2 +- 3 files changed, 2 insertions(+), 285 deletions(-) diff --git a/math/suitesparse-umfpack/Makefile b/math/suitesparse-umfpack/Makefile index a1dc1c3c841e..8bfb9ee9b499 100644 --- a/math/suitesparse-umfpack/Makefile +++ b/math/suitesparse-umfpack/Makefile @@ -1,5 +1,5 @@ PORTNAME= ${MPORTNAME:tl} -PORTVERSION= 6.2.0 +PORTVERSION= 6.2.1 CATEGORIES= math COMMENT= Sparse multifrontal LU factorization diff --git a/math/suitesparse-umfpack/files/patch-UMFPACK_Source_amd__internal.h b/math/suitesparse-umfpack/files/patch-UMFPACK_Source_amd__internal.h deleted file mode 100644 index f7fb7257c4c5..000000000000 --- a/math/suitesparse-umfpack/files/patch-UMFPACK_Source_amd__internal.h +++ /dev/null @@ -1,283 +0,0 @@ ---- UMFPACK/Source/amd_internal.h.orig 2023-09-18 19:30:26 UTC -+++ UMFPACK/Source/amd_internal.h -@@ -0,0 +1,280 @@ -+//------------------------------------------------------------------------------ -+// AMD/Include/amd_internal.h: internal definitions for AMD -+//------------------------------------------------------------------------------ -+ -+// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and -+// Iain S. Duff. All Rights Reserved. -+// SPDX-License-Identifier: BSD-3-clause -+ -+//------------------------------------------------------------------------------ -+ -+/* This file is for internal use in AMD itself, and does not normally need to -+ * be included in user code (it is included in UMFPACK, however). All others -+ * should use amd.h instead. -+ */ -+ -+/* ========================================================================= */ -+/* === NDEBUG ============================================================== */ -+/* ========================================================================= */ -+ -+/* -+ * Turning on debugging takes some work (see below). If you do not edit this -+ * file, then debugging is always turned off, regardless of whether or not -+ * -DNDEBUG is specified in your compiler options. -+ * -+ * If AMD is being compiled as a mexFunction, then MATLAB_MEX_FILE is defined, -+ * and mxAssert is used instead of assert. If debugging is not enabled, no -+ * MATLAB include files or functions are used. Thus, the AMD library libamd.a -+ * can be safely used in either a stand-alone C program or in another -+ * mexFunction, without any change. -+ */ -+ -+/* -+ AMD will be exceedingly slow when running in debug mode. The next three -+ lines ensure that debugging is turned off. -+*/ -+#ifndef NDEBUG -+#define NDEBUG -+#endif -+ -+/* -+ To enable debugging, uncomment the following line: -+#undef NDEBUG -+*/ -+ -+#define SUITESPARSE_LIBRARY -+#include "amd.h" -+ -+/* ------------------------------------------------------------------------- */ -+/* basic definitions */ -+/* ------------------------------------------------------------------------- */ -+ -+#ifdef FLIP -+#undef FLIP -+#endif -+ -+#ifdef MAX -+#undef MAX -+#endif -+ -+#ifdef MIN -+#undef MIN -+#endif -+ -+#ifdef EMPTY -+#undef EMPTY -+#endif -+ -+#define PRIVATE static -+ -+/* FLIP is a "negation about -1", and is used to mark an integer i that is -+ * normally non-negative. FLIP (EMPTY) is EMPTY. FLIP of a number > EMPTY -+ * is negative, and FLIP of a number < EMTPY is positive. FLIP (FLIP (i)) = i -+ * for all integers i. UNFLIP (i) is >= EMPTY. */ -+#define EMPTY (-1) -+#define FLIP(i) (-(i)-2) -+#define UNFLIP(i) ((i < EMPTY) ? FLIP (i) : (i)) -+ -+/* for integer MAX/MIN, or for doubles when we don't care how NaN's behave: */ -+#define MAX(a,b) (((a) > (b)) ? (a) : (b)) -+#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -+ -+/* logical expression of p implies q: */ -+#define IMPLIES(p,q) (!(p) || (q)) -+ -+/* Note that the IBM RS 6000 xlc predefines TRUE and FALSE in . */ -+/* The Compaq Alpha also predefines TRUE and FALSE. */ -+#ifdef TRUE -+#undef TRUE -+#endif -+#ifdef FALSE -+#undef FALSE -+#endif -+ -+#define TRUE (1) -+#define FALSE (0) -+#define EMPTY (-1) -+ -+/* largest value of size_t */ -+#ifndef SIZE_T_MAX -+#ifdef SIZE_MAX -+/* C99 only */ -+#define SIZE_T_MAX SIZE_MAX -+#else -+#define SIZE_T_MAX ((size_t) (-1)) -+#endif -+#endif -+ -+/* ------------------------------------------------------------------------- */ -+/* integer type for AMD: int32_t or int64_t */ -+/* ------------------------------------------------------------------------- */ -+ -+#if defined (DLONG) || defined (ZLONG) -+ -+#define Int int64_t -+#define UInt uint64_t -+#define ID "%" PRId64 -+#define Int_MAX INT64_MAX -+ -+#define AMD_order amd_l_order -+#define AMD_defaults amd_l_defaults -+#define AMD_control amd_l_control -+#define AMD_info amd_l_info -+#define AMD_1 amd_l1 -+#define AMD_2 amd_l2 -+#define AMD_valid amd_l_valid -+#define AMD_aat amd_l_aat -+#define AMD_postorder amd_l_postorder -+#define AMD_post_tree amd_l_post_tree -+#define AMD_dump amd_l_dump -+#define AMD_debug amd_l_debug -+#define AMD_debug_init amd_l_debug_init -+#define AMD_preprocess amd_l_preprocess -+ -+#else -+ -+#define Int int32_t -+#define UInt uint32_t -+#define ID "%d" -+#define Int_MAX INT32_MAX -+ -+#define AMD_order amd_order -+#define AMD_defaults amd_defaults -+#define AMD_control amd_control -+#define AMD_info amd_info -+#define AMD_1 amd_1 -+#define AMD_2 amd_2 -+#define AMD_valid amd_valid -+#define AMD_aat amd_aat -+#define AMD_postorder amd_postorder -+#define AMD_post_tree amd_post_tree -+#define AMD_dump amd_dump -+#define AMD_debug amd_debug -+#define AMD_debug_init amd_debug_init -+#define AMD_preprocess amd_preprocess -+ -+#endif -+ -+/* ------------------------------------------------------------------------- */ -+/* AMD routine definitions (not user-callable) */ -+/* ------------------------------------------------------------------------- */ -+ -+size_t AMD_aat -+( -+ Int n, -+ const Int Ap [ ], -+ const Int Ai [ ], -+ Int Len [ ], -+ Int Tp [ ], -+ double Info [ ] -+) ; -+ -+void AMD_1 -+( -+ Int n, -+ const Int Ap [ ], -+ const Int Ai [ ], -+ Int P [ ], -+ Int Pinv [ ], -+ Int Len [ ], -+ Int slen, -+ Int S [ ], -+ double Control [ ], -+ double Info [ ] -+) ; -+ -+void AMD_postorder -+( -+ Int nn, -+ Int Parent [ ], -+ Int Npiv [ ], -+ Int Fsize [ ], -+ Int Order [ ], -+ Int Child [ ], -+ Int Sibling [ ], -+ Int Stack [ ] -+) ; -+ -+Int AMD_post_tree -+( -+ Int root, -+ Int k, -+ Int Child [ ], -+ const Int Sibling [ ], -+ Int Order [ ], -+ Int Stack [ ] -+#ifndef NDEBUG -+ , Int nn -+#endif -+) ; -+ -+void AMD_preprocess -+( -+ Int n, -+ const Int Ap [ ], -+ const Int Ai [ ], -+ Int Rp [ ], -+ Int Ri [ ], -+ Int W [ ], -+ Int Flag [ ] -+) ; -+ -+/* ------------------------------------------------------------------------- */ -+/* debugging definitions */ -+/* ------------------------------------------------------------------------- */ -+ -+#ifndef NDEBUG -+ -+/* from assert.h: assert macro */ -+#include -+ -+extern Int AMD_debug ; -+ -+void AMD_debug_init ( char *s ) ; -+ -+void AMD_dump -+( -+ Int n, -+ Int Pe [ ], -+ Int Iw [ ], -+ Int Len [ ], -+ Int iwlen, -+ Int pfree, -+ Int Nv [ ], -+ Int Next [ ], -+ Int Last [ ], -+ Int Head [ ], -+ Int Elen [ ], -+ Int Degree [ ], -+ Int W [ ], -+ Int nel -+) ; -+ -+#ifdef ASSERT -+#undef ASSERT -+#endif -+ -+/* Use mxAssert if AMD is compiled into a mexFunction */ -+#ifdef MATLAB_MEX_FILE -+#define ASSERT(expression) (mxAssert ((expression), "")) -+#else -+#define ASSERT(expression) (assert (expression)) -+#endif -+ -+#define AMD_DEBUG0(params) { SUITESPARSE_PRINTF (params) ; } -+#define AMD_DEBUG1(params) { if (AMD_debug >= 1) SUITESPARSE_PRINTF (params) ; } -+#define AMD_DEBUG2(params) { if (AMD_debug >= 2) SUITESPARSE_PRINTF (params) ; } -+#define AMD_DEBUG3(params) { if (AMD_debug >= 3) SUITESPARSE_PRINTF (params) ; } -+#define AMD_DEBUG4(params) { if (AMD_debug >= 4) SUITESPARSE_PRINTF (params) ; } -+ -+#else -+ -+/* no debugging */ -+#define ASSERT(expression) -+#define AMD_DEBUG0(params) -+#define AMD_DEBUG1(params) -+#define AMD_DEBUG2(params) -+#define AMD_DEBUG3(params) -+#define AMD_DEBUG4(params) -+ -+#endif diff --git a/math/suitesparse-umfpack/pkg-plist b/math/suitesparse-umfpack/pkg-plist index 30698eab5ee9..8a5232b81c7e 100644 --- a/math/suitesparse-umfpack/pkg-plist +++ b/math/suitesparse-umfpack/pkg-plist @@ -6,7 +6,7 @@ lib/cmake/UMFPACK/UMFPACKTargets.cmake lib/libumfpack.a lib/libumfpack.so lib/libumfpack.so.6 -lib/libumfpack.so.6.2.0 +lib/libumfpack.so.6.2.1 libdata/pkgconfig/UMFPACK.pc %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_QuickStart.pdf %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_README.txt