git: d48600078347 - main - math/form: Update to 4.3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 25 Nov 2022 20:18:58 UTC
The branch main has been updated by ehaupt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d486000783478d771ae61d8b78b364542c510229
commit d486000783478d771ae61d8b78b364542c510229
Author: Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2022-11-25 20:14:32 +0000
Commit: Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2022-11-25 20:14:32 +0000
math/form: Update to 4.3.0
---
math/form/Makefile | 37 ++++++++++++++++++-------------------
math/form/distinfo | 6 +++---
math/form/files/patch-configure.ac | 34 ++++++++++++++++------------------
3 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/math/form/Makefile b/math/form/Makefile
index 87d68618d970..bc2e5a8c19bb 100644
--- a/math/form/Makefile
+++ b/math/form/Makefile
@@ -1,6 +1,5 @@
PORTNAME= form
-PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTVERSION= 4.3.0
DISTVERSIONPREFIX= v
CATEGORIES= math
@@ -11,34 +10,34 @@ WWW= https://www.nikhef.nl/~form/
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
+# https://github.com/vermaseren/form/issues/422
+NOT_FOR_ARCHS= i386
+NOT_FOR_ARCHS_REASON= fails to compile: error: no member named 'numinprimelist' in 'struct R_const'
+
LIB_DEPENDS= libgmp.so:math/gmp
USES= autoreconf gmake localbase
USE_GITHUB= yes
-
-GNU_CONFIGURE= yes
-
GH_ACCOUNT= vermaseren
-OPTIONS_DEFINE= DOXYGEN OPENMPI
-OPTIONS_SUB= yes
-
-CONFIGURE_ARGS+= --enable-scalar \
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-native \
--enable-largefile \
- --with-api=posix \
- --disable-native
+ --enable-scalar \
+ --with-api=posix
-MPICC?= ${LOCALBASE}/mpi/openmpi/bin/mpicc
-MPICXX?= ${LOCALBASE}/mpi/openmpi/bin/mpic++
+OPTIONS_DEFINE= DOXYGEN OPENMPI
+OPTIONS_SUB= yes
-DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
+MPICC?= ${LOCALBASE}/mpi/openmpi/bin/mpicc
+MPICXX?= ${LOCALBASE}/mpi/openmpi/bin/mpic++
+DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
+OPENMPI_LIB_DEPENDS= libgcc_s.so.1:lang/gcc9 \
+ libmpi.so:net/openmpi
OPENMPI_CONFIGURE_ENABLE= parform
-
-OPENMPI_CONFIGURE_ENV+= MPICC="${MPICC}" MPICXX="${MPICXX}"
-
-OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi \
- libgcc_s.so.1:lang/gcc9
+OPENMPI_CONFIGURE_ENV+= MPICC="${MPICC}" \
+ MPICXX="${MPICXX}"
post-build-DOXYGEN-on:
(cd ${WRKSRC}/doc/manual; ${MAKE_CMD} html pdf)
diff --git a/math/form/distinfo b/math/form/distinfo
index 4e2af1ee3b31..8a7f7bdf64cd 100644
--- a/math/form/distinfo
+++ b/math/form/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549437926
-SHA256 (vermaseren-form-v4.2.1_GH0.tar.gz) = 6f32c7470d00e8ab6934dc352f5a78e29290146a00e5775f8cd5fef7810bbbb8
-SIZE (vermaseren-form-v4.2.1_GH0.tar.gz) = 1275044
+TIMESTAMP = 1669033375
+SHA256 (vermaseren-form-v4.3.0_GH0.tar.gz) = b0b09e1fd74b11e76cd527c1ece9383a34560e57513df76a4cc1fbe2e8df93a8
+SIZE (vermaseren-form-v4.3.0_GH0.tar.gz) = 1285467
diff --git a/math/form/files/patch-configure.ac b/math/form/files/patch-configure.ac
index 166b7b9ef8c8..30b228134f2d 100644
--- a/math/form/files/patch-configure.ac
+++ b/math/form/files/patch-configure.ac
@@ -1,22 +1,20 @@
---- configure.ac.orig 2018-11-21 06:20:16 UTC
+--- configure.ac.orig 2022-11-15 09:35:49 UTC
+++ configure.ac
-@@ -22,8 +22,8 @@ m4_define([FORM_VERSION], m4_esyscmd_s([
- echo "$major_version.$minor_version" >.version
- echo "#define REPO_MAJOR_VERSION $major_version" >sources/version.h.in
- echo "#define REPO_MINOR_VERSION $minor_version" >>sources/version.h.in
-- echo '\\def\\repomajorversion'"{$major_version}" >doc/manual/version.tex.in
-- echo '\\def\\repominorversion'"{$minor_version}" >>doc/manual/version.tex.in
-+ echo "\\def\\repomajorversion{$major_version}" >doc/manual/version.tex.in
-+ echo "\\def\\repominorversion{$minor_version}" >>doc/manual/version.tex.in
- cp doc/manual/version.tex.in doc/devref/version.tex.in
- fi
- cat <<END >&2
-@@ -742,7 +742,7 @@ my_test_COMPILEFLAGS=${COMPILEFLAGS+set}
- if test "$my_test_COMPILEFLAGS" != set; then
- if test "x$vendor" = xgnu; then
- # We don't use -pedantic option because of horrible warnings.
-- COMPILEFLAGS="-Wall -Wextra -Wpadded -O3"
-+ COMPILEFLAGS="-Wall -Wextra -Wpadded"
+@@ -768,8 +768,6 @@ AC_DEFUN([AX_HANDLE_EXTRA_WARNING],
+ [$1="$$1 -Wno-misleading-indentation"])
+ # Too many false positives.
+ # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88443
+- AX_CHECK_COMPILE_FLAG([-Wno-stringop-overflow],
+- [$1="$$1 -Wno-stringop-overflow"])
+ fi[]dnl
+ ])
+
+@@ -780,7 +778,7 @@ if test "$my_test_COMPILEFLAGS" != set; then
+ COMPILEFLAGS="-Wall -Wextra -Wpadded"
+ AX_HANDLE_EXTRA_WARNING([COMPILEFLAGS])
+ # Enable optimizations.
+- COMPILEFLAGS="$COMPILEFLAGS -O3"
++ COMPILEFLAGS="$COMPILEFLAGS"
if test "x$enable_profile" != xgprof; then
# -pg conflicts with -fomit-frame-pointer.
COMPILEFLAGS="$COMPILEFLAGS -fomit-frame-pointer"