From: wen heping <wenheping2000@hotmail.com>
Subject: [update]math/flintlib: update to 3.3.1
To: "jrick@openbsd.org" <jrick@openbsd.org>, "ports@openbsd.org" <ports@openbsd.org>
Date: Mon, 28 Jul 2025 07:04:03 +0000

Hi,

   Here is a patch for math/flintlib to update to 3.3.1.
   It build well and pass all tests on my amd64-current system.


Cheers !
wen
Index: math/flintlib/Makefile
===================================================================
RCS file: /cvs/ports/math/flintlib/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- math/flintlib/Makefile	5 Apr 2024 22:05:31 -0000	1.3
+++ math/flintlib/Makefile	28 Jul 2025 07:02:10 -0000
@@ -2,10 +2,10 @@ COMMENT =		fast library for number theor
 
 DPB_PROPERTIES =	parallel
 
-V =			3.1.2
+V =			3.3.1
 PKGNAME =		flintlib-${V}
 DISTNAME =		flint-${V}
-SHARED_LIBS =		flint		1.0	# 19.0.0
+SHARED_LIBS =		flint		2.0	# 21.0.0
 CATEGORIES =		math
 
 HOMEPAGE =		https://flintlib.org/
Index: math/flintlib/distinfo
===================================================================
RCS file: /cvs/ports/math/flintlib/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- math/flintlib/distinfo	5 Apr 2024 22:05:31 -0000	1.2
+++ math/flintlib/distinfo	28 Jul 2025 07:02:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (flint-3.1.2.tar.gz) = /bOkMaN0ZINKz/O9wUX0/o0PlR3VMnxMb5P0y6xcJwA=
-SIZE (flint-3.1.2.tar.gz) = 8098136
+SHA256 (flint-3.3.1.tar.gz) = ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs=
+SIZE (flint-3.3.1.tar.gz) = 8400253
Index: math/flintlib/patches/patch-Makefile_in
===================================================================
RCS file: math/flintlib/patches/patch-Makefile_in
diff -N math/flintlib/patches/patch-Makefile_in
--- math/flintlib/patches/patch-Makefile_in	5 Apr 2024 22:05:31 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,186 +0,0 @@
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -104,7 +104,7 @@ arith_CFLAGS:=-funroll-loops
- endif
- 
- LDFLAGS:=@LDFLAGS@
--EXTRA_SHARED_FLAGS:=@EXTRA_SHARED_FLAGS@ $(foreach path, $(sort $(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH) $(NTL_LIB_PATH)), @WL@-rpath,$(path))
-+EXTRA_SHARED_FLAGS:=-Wl,-soname,$(FLINT_LIB_FULL) $(foreach path, $(sort $(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH) $(NTL_LIB_PATH)), @WL@-rpath,$(path))
- EXE_LDFLAGS:=$(LDFLAGS) $(foreach path, $(sort $(ABS_FLINT_DIR) $(GMP_LIB_PATH) $(MPFR_LIB_PATH) $(BLAS_LIB_PATH) $(GC_LIB_PATH) $(NTL_LIB_PATH)), @WL@-rpath,$(path))
- 
- # Obtain level of parallel
-@@ -427,11 +427,11 @@ MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(di
- 
- $(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
- 	@echo "Building $(FLINT_LIB_FULL)"
--	@$(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o $(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
--	@$(RM_F) $(FLINT_LIB)
--	@$(RM_F) $(FLINT_LIB_MAJOR)
--	@$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)
--	@$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB_MAJOR)
-+	$(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o $(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
-+	$(RM_F) $(FLINT_LIB)
-+	$(RM_F) $(FLINT_LIB_MAJOR)
-+	$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)
-+	$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB_MAJOR)
- endif
- 
- ifneq ($(STATIC), 0)
-@@ -582,14 +582,12 @@ endif
- ifneq ($(STATIC), 0)
- define xxx_OBJS_rule
- $(BUILD_DIR)/$(1)/%.o: $(SRC_DIR)/$(1)/%.c | $(BUILD_DIR)/$(1)
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@ $$(DEPFLAGS)
-+	$(CC) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@ $$(DEPFLAGS)
- endef
- 
- ifeq ($(WANT_ADX_ASSEMBLY),1)
- %.o: %.s
--	@echo "  CC  $(<:$(BUILD_DIR)/%.s=%.asm)"
--	@$(CC) $(ASM_OBJ_FLAGS) -c $< -o $@
-+	$(CC) $(ASM_OBJ_FLAGS) -c $< -o $@
- endif
- 
- $(foreach dir, $(DIRS), $(eval $(call xxx_OBJS_rule,$(dir))))
-@@ -602,14 +600,12 @@ endif
- ifneq ($(SHARED), 0)
- define xxx_LOBJS_rule
- $(BUILD_DIR)/$(1)/%.lo: $(SRC_DIR)/$(1)/%.c | $(BUILD_DIR)/$(1)
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(PIC_FLAG) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@ $$(DEPFLAGS)
-+	$(CC) $(PIC_FLAG) $(CFLAGS) $($(1)_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) -c $$< -o $$@ $$(DEPFLAGS)
- endef
- 
- ifeq ($(WANT_ADX_ASSEMBLY),1)
- %.lo: %_pic.s
--	@echo "  CC  $(<:$(BUILD_DIR)/%.s=%.asm)"
--	@$(CC) $(ASM_LOBJ_FLAGS) -c $< -o $@
-+	$(CC) $(ASM_LOBJ_FLAGS) -c $< -o $@
- endif
- 
- $(foreach dir, $(DIRS), $(eval $(call xxx_LOBJS_rule,$(dir))))
-@@ -621,25 +617,21 @@ endif
- 
- ifeq ($(SHARED), 0)
- $(BUILD_DIR)/profile/%$(EXEEXT): $(SRC_DIR)/profile/%.c $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/profile
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- else
- $(BUILD_DIR)/profile/%$(EXEEXT): $(SRC_DIR)/profile/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/profile
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- endif
- 
- ifeq ($(SHARED), 0)
- define xxx_PROFS_rule
- $(BUILD_DIR)/$(1)/profile/%$(EXEEXT): $(SRC_DIR)/$(1)/profile/%.c $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/$(1)/profile
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
- endef
- else
- define xxx_PROFS_rule
- $(BUILD_DIR)/$(1)/profile/%$(EXEEXT): $(SRC_DIR)/$(1)/profile/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/$(1)/profile
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
- endef
- endif
- 
-@@ -647,25 +639,21 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_PROFS_rule,$
- 
- ifeq ($(SHARED), 0)
- $(BUILD_DIR)/test/%$(EXEEXT): $(SRC_DIR)/test/%.c $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/test
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- else
- $(BUILD_DIR)/test/%$(EXEEXT): $(SRC_DIR)/test/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/test
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- endif
- 
- ifeq ($(SHARED), 0)
- define xxx_TESTS_rule
- $(BUILD_DIR)/$(1)/test/%$(EXEEXT): $(SRC_DIR)/$(1)/test/%.c $(FLINT_DIR)/libflint.a | $(BUILD_DIR)/$(1)/test
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
- endef
- else
- define xxx_TESTS_rule
- $(BUILD_DIR)/$(1)/test/%$(EXEEXT): $(SRC_DIR)/$(1)/test/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/$(1)/test
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
- endef
- endif
- 
-@@ -674,36 +662,30 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_TESTS_rule,$
- ifneq ($(WANT_NTL), 0)
- ifeq ($(SHARED), 0)
- $(BUILD_DIR)/interfaces/test/t-NTL-interface$(EXEEXT): $(SRC_DIR)/interfaces/test/t-NTL-interface.cpp $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/interfaces/test
--	@echo "  CXX $(<:$(SRC_DIR)/%=%)"
--	@$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- else
- $(BUILD_DIR)/interfaces/test/t-NTL-interface$(EXEEXT): $(SRC_DIR)/interfaces/test/t-NTL-interface.cpp | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/interfaces/test
--	@echo "  CXX $(<:$(SRC_DIR)/%=%)"
--	@$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- endif
- endif
- 
- ifeq ($(SHARED), 0)
- $(BUILD_DIR)/tune/%$(EXEEXT): $(SRC_DIR)/tune/%.c $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/tune
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- else
- $(BUILD_DIR)/tune/%$(EXEEXT): $(SRC_DIR)/tune/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/tune
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- endif
- 
- ifeq ($(SHARED), 0)
- define xxx_TUNES_rule
- $(BUILD_DIR)/$(1)/tune/%$(EXEEXT): $(SRC_DIR)/$(1)/tune/%.c $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/$(1)/tune
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
- endef
- else
- define xxx_TUNES_rule
- $(BUILD_DIR)/$(1)/tune/%$(EXEEXT): $(SRC_DIR)/$(1)/tune/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/$(1)/tune
--	@echo "  CC  $$(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $$< -o $$@ $(EXE_LDFLAGS) $(LIBS2) $$(DEPFLAGS)
- endef
- endif
- 
-@@ -711,12 +693,10 @@ $(foreach dir, $(DIRS), $(eval $(call xxx_TUNES_rule,$
- 
- ifeq ($(SHARED), 0)
- $(BUILD_DIR)/examples/%$(EXEEXT): $(FLINT_DIR)/examples/%.c $(FLINT_DIR)/$(FLINT_LIB_STATIC) | $(BUILD_DIR)/examples
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- else
- $(BUILD_DIR)/examples/%$(EXEEXT): $(FLINT_DIR)/examples/%.c | $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BUILD_DIR)/examples
--	@echo "  CC  $(<:$(SRC_DIR)/%=%)"
--	@$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
-+	$(CC) $(TESTCFLAGS) $(CPPFLAGS2) $< -o $@ $(EXE_LDFLAGS) $(LIBS2) $(DEPFLAGS)
- endif
- 
- ################################################################################
-@@ -966,4 +946,3 @@ print-%:
- 	@echo "$*=$($*)"
- 
- .PHONY: all library shared static examples checkexamples profile tests check tune valgrind clean distclean install uninstall dist %_TEST_RUN %_VALGRIND_RUN print-% coverage coverage_html
--.SILENT: $(mpn_extras_S_SOURCES)
Index: math/flintlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/flintlib/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- math/flintlib/pkg/PLIST	5 Apr 2024 22:05:31 -0000	1.2
+++ math/flintlib/pkg/PLIST	28 Jul 2025 07:02:10 -0000
@@ -32,8 +32,10 @@ include/flint/ca_ext.h
 include/flint/ca_field.h
 include/flint/ca_mat.h
 include/flint/ca_poly.h
+include/flint/ca_types.h
 include/flint/ca_vec.h
 include/flint/calcium.h
+include/flint/config.h
 include/flint/crt_helpers.h
 include/flint/d_mat.h
 include/flint/d_vec.h
@@ -44,8 +46,9 @@ include/flint/double_interval.h
 include/flint/fexpr.h
 include/flint/fexpr_builtin.h
 include/flint/fft.h
-include/flint/fft_tuning.h
+include/flint/fft_small.h
 include/flint/flint-config.h
+include/flint/flint-mparam.h
 include/flint/flint.h
 include/flint/fmpq.h
 include/flint/fmpq_mat.h
@@ -112,6 +115,7 @@ include/flint/fq_zech_poly.h
 include/flint/fq_zech_poly_factor.h
 include/flint/fq_zech_types.h
 include/flint/fq_zech_vec.h
+include/flint/gettimeofday.h
 include/flint/gmpcompat.h
 include/flint/gr.h
 include/flint/gr_generic.h
@@ -119,6 +123,7 @@ include/flint/gr_mat.h
 include/flint/gr_mpoly.h
 include/flint/gr_poly.h
 include/flint/gr_special.h
+include/flint/gr_types.h
 include/flint/gr_vec.h
 include/flint/hypgeom.h
 include/flint/limb_types.h
@@ -126,6 +131,7 @@ include/flint/long_extras.h
 include/flint/longlong.h
 include/flint/longlong_asm_clang.h
 include/flint/longlong_asm_gcc.h
+include/flint/longlong_asm_gnu.h
 include/flint/longlong_div_gnu.h
 include/flint/longlong_msc_arm64.h
 include/flint/longlong_msc_x86.h
@@ -135,12 +141,14 @@ include/flint/mpf-impl.h
 include/flint/mpfr_mat.h
 include/flint/mpfr_vec.h
 include/flint/mpn_extras.h
+include/flint/mpn_mod.h
 include/flint/mpoly.h
 include/flint/mpoly_types.h
 include/flint/n_poly.h
 include/flint/n_poly_types.h
 include/flint/nf.h
 include/flint/nf_elem.h
+include/flint/nfloat.h
 include/flint/nmod.h
 include/flint/nmod_mat.h
 include/flint/nmod_mpoly.h
@@ -162,18 +170,22 @@ include/flint/qfb.h
 include/flint/qqbar.h
 include/flint/qsieve.h
 include/flint/templates.h
+include/flint/test_helpers.h
 include/flint/thread_pool.h
 include/flint/thread_support.h
 include/flint/ulong_extras.h
 @comment @so lib/libflint.so
 @lib lib/libflint.so.${LIBflint_VERSION}
 @comment lib/libflint.so.19
+lib/libflint.so.21
 lib/pkgconfig/flint.pc
 share/doc/flint/
 share/doc/flint/README.md
 share/examples/flint/
+share/examples/flint/AKS.c
 share/examples/flint/bernoulli.c
 share/examples/flint/binet.c
+share/examples/flint/check_n_is_prime.c
 share/examples/flint/class_poly.c
 share/examples/flint/complex_plot.c
 share/examples/flint/crt.c
@@ -193,6 +205,7 @@ share/examples/flint/hilbert_matrix.c
 share/examples/flint/hilbert_matrix_ca.c
 share/examples/flint/huge_expr.c
 share/examples/flint/integrals.c
+share/examples/flint/integrals_double_exp.c
 share/examples/flint/keiper_li.c
 share/examples/flint/lcentral.c
 share/examples/flint/logistic.c