git: c82bae03d88e - main - math/m4rie: Use upstream release archive
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 08 Feb 2025 15:05:28 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c82bae03d88e4c66c51e4e7fcb7f402c7c8f09f2
commit c82bae03d88e4c66c51e4e7fcb7f402c7c8f09f2
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-02-08 11:38:39 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-02-08 13:51:16 +0000
math/m4rie: Use upstream release archive
* Use upstream release archive
* Fix build after PR 284367 being committed
* Adjust Makefile to closer follow Porters Handbook
PR: 284368
Approved by: portmgr (maintainer timeout, 2 weeks)
---
math/m4rie/Makefile | 15 ++++++---------
math/m4rie/distinfo | 6 +++---
math/m4rie/files/patch-Makefile.am | 10 ++++++++++
math/m4rie/files/patch-m4_ax__m4ri__flags.m4 | 11 +++++++++++
math/m4rie/files/patch-tests_Makefile.am | 10 ++++++++++
5 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/math/m4rie/Makefile b/math/m4rie/Makefile
index f326ca5bef14..6a934d32b9b5 100644
--- a/math/m4rie/Makefile
+++ b/math/m4rie/Makefile
@@ -1,7 +1,8 @@
PORTNAME= M4RIE
-PORTVERSION= 20250103
-DISTVERSIONPREFIX= release-
+DISTVERSION= 20250103
CATEGORIES= math
+MASTER_SITES= https://bitbucket.org/malb/${PORTNAME:tl}/downloads/
+DISTNAME= ${PORTNAME:tl}-${DISTVERSION}
MAINTAINER= thierry@FreeBSD.org
COMMENT= Library for fast arithmetic with dense matrices over GF(2^e)
@@ -11,16 +12,12 @@ LICENSE= GPLv2+
LIB_DEPENDS= libm4ri.so:math/m4ri
-USE_GITHUB= yes
-GH_ACCOUNT= malb
-GH_PROJECT= ${PORTNAME:tl}
-
-USES= autoreconf libtool localbase pathfix pkgconfig
+USES= autoreconf libtool localbase:ldflags pathfix pkgconfig
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-USE_LDCONFIG= yes
+INSTALL_TARGET= install-strip
TEST_TARGET= check
PLIST_SUB= VER=${PORTVERSION}
diff --git a/math/m4rie/distinfo b/math/m4rie/distinfo
index 0c5c501cb340..9fc949ab110b 100644
--- a/math/m4rie/distinfo
+++ b/math/m4rie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737838251
-SHA256 (malb-m4rie-release-20250103_GH0.tar.gz) = 249fc10b665fd7d902bae6d0e872b5dbf120942c4f15f934de40096b84f9549d
-SIZE (malb-m4rie-release-20250103_GH0.tar.gz) = 167745
+TIMESTAMP = 1737891154
+SHA256 (m4rie-20250103.tar.gz) = 57e233fad69ae9f821179c05e9df001b4893a468b2dff1607ea2adef87cba35c
+SIZE (m4rie-20250103.tar.gz) = 509373
diff --git a/math/m4rie/files/patch-Makefile.am b/math/m4rie/files/patch-Makefile.am
new file mode 100644
index 000000000000..6a862ee5d564
--- /dev/null
+++ b/math/m4rie/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- Makefile.am.orig 2025-01-26 11:33:54 UTC
++++ Makefile.am
+@@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+ ACLOCAL_AMFLAGS = -I m4
+-AM_CFLAGS=${SIMD_FLAGS} ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${M4RIE_M4RI_CFLAGS} ${M4RI_CFLAGS}
++AM_CFLAGS= ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${M4RIE_M4RI_CFLAGS} ${M4RI_CFLAGS}
+ EXTRA_DIST = m4rie/Doxyfile
+
+ lib_LTLIBRARIES = libm4rie.la
diff --git a/math/m4rie/files/patch-m4_ax__m4ri__flags.m4 b/math/m4rie/files/patch-m4_ax__m4ri__flags.m4
new file mode 100644
index 000000000000..672256ad3aa4
--- /dev/null
+++ b/math/m4rie/files/patch-m4_ax__m4ri__flags.m4
@@ -0,0 +1,11 @@
+--- m4/ax_m4ri_flags.m4.orig 2025-01-26 11:38:37 UTC
++++ m4/ax_m4ri_flags.m4
+@@ -34,7 +34,7 @@ AC_DEFUN([AX_M4RI_CFLAGS],
+ [[
+ FILE *f;
+ f = fopen("conftest_m4ri_cflags", "w"); if (!f) return 1;
+- fprintf(f,"%s %s",__M4RI_SIMD_CFLAGS, __M4RI_OPENMP_CFLAGS);
++ fprintf(f,"%s",__M4RI_OPENMP_CFLAGS);
+ fclose(f);
+ return 0;
+ ]])],
diff --git a/math/m4rie/files/patch-tests_Makefile.am b/math/m4rie/files/patch-tests_Makefile.am
new file mode 100644
index 000000000000..2dcf266cb571
--- /dev/null
+++ b/math/m4rie/files/patch-tests_Makefile.am
@@ -0,0 +1,10 @@
+--- tests/Makefile.am.orig 2025-01-26 11:34:18 UTC
++++ tests/Makefile.am
+@@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+
+-AM_CFLAGS = ${SIMD_FLAGS} ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${M4RIE_M4RI_CFLAGS} ${M4RI_CFLAGS} -I${top_srcdir}
++AM_CFLAGS = ${OPENMP_CFLAGS} ${DEBUG_FLAGS} ${M4RIE_M4RI_CFLAGS} ${M4RI_CFLAGS} -I${top_srcdir}
+ LDADD = ${top_builddir}/libm4rie.la -lm4ri -lm
+ AM_LDFLAGS = ${M4RIE_M4RI_LDFLAGS} -no-install
+