diff --git a/math/sollya/Makefile b/math/sollya/Makefile index c3b32df6bc8b..61848d06b259 100644 --- a/math/sollya/Makefile +++ b/math/sollya/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2022/10/28 19:59:03 alnsn Exp $ +# $NetBSD: Makefile,v 1.8 2022/10/28 23:49:43 alnsn Exp $ -DISTNAME= sollya-7.0 -PKGREVISION= 5 +DISTNAME= sollya-8.0 CATEGORIES= math -MASTER_SITES= https://www.sollya.org/releases/sollya-7.0/ +MASTER_SITES= https://www.sollya.org/releases/sollya-8.0/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.sollya.org/ @@ -12,8 +11,11 @@ LICENSE= cecill-2.0 AND gnu-lgpl-v3 GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_TOOLS+= gmake USE_LANGUAGES= c c++ +CONFIGURE_ARGS+= --with-xml2-include=${PREFIX}/include/libxml2 + TEST_TARGET= check .include "../../devel/gmp/buildlink3.mk" diff --git a/math/sollya/PLIST b/math/sollya/PLIST index b4fe84814a6b..0b711593cd7d 100644 --- a/math/sollya/PLIST +++ b/math/sollya/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2020/05/19 14:45:21 riastradh Exp $ +@comment $NetBSD: PLIST,v 1.2 2022/10/28 23:49:43 alnsn Exp $ bin/sollya include/sollya-messages.h include/sollya.h lib/libsollya.la man/man1/sollya.1 -share/doc/sollya/sollya.pdf diff --git a/math/sollya/distinfo b/math/sollya/distinfo index bb42807dc4e6..6426a87ec3ee 100644 --- a/math/sollya/distinfo +++ b/math/sollya/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 10:56:08 nia Exp $ +$NetBSD: distinfo,v 1.5 2022/10/28 23:49:43 alnsn Exp $ -BLAKE2s (sollya-7.0.tar.gz) = fcaf6e48a6bcb67f5858035dcc4cc93d0ecfea99c192ceb797b2b1d3e71966d9 -SHA512 (sollya-7.0.tar.gz) = 14dc25ffdfae16c52b335525eb26c787e561a5b9787fe65a9858e84d49f7386dfe2f7c0b7d18268a54a2f7227f506f6dbeecf7455d1ad49bef9dafbc25c30bef -Size (sollya-7.0.tar.gz) = 3722904 bytes -SHA1 (patch-configure) = 0a63ec954969fe7f78804c430f1775fb0e9e0313 -SHA1 (patch-configure.ac) = 3c6c1804d1504265bf02cb6d984d6d60d39f0c16 -SHA1 (patch-general.c) = 66a0175d043c25c55e33c4e771bd11902b85f973 +BLAKE2s (sollya-8.0.tar.gz) = 4e64185625bf5a1f475c7088399b417039a8643018955e5c24fa7852faf1d9a3 +SHA512 (sollya-8.0.tar.gz) = 6c80a1f6dc671bf7ef0fa9095dba235167f8ce279e67095834be1b81f459d6d21aa5f25037c706dd1b628a8f6a9b5c5cfef2dca1deff4254fb8f6005e1768a64 +Size (sollya-8.0.tar.gz) = 4425491 bytes diff --git a/math/sollya/patches/patch-configure b/math/sollya/patches/patch-configure deleted file mode 100644 index ca89a2359d0d..000000000000 --- a/math/sollya/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2020/07/17 17:30:13 riastradh Exp $ - -Fix shell portability. - -https://lists.gforge.inria.fr/pipermail/sollya-devl/2020-July/000018.html - ---- configure.orig 2018-09-20 12:01:05.000000000 +0000 -+++ configure -@@ -16641,7 +16641,7 @@ $as_echo_n "checking whether help2man su - $as_echo "$HELP2MAN_SUPPORTS_LOCALE" >&6; } - rm -rf .tmp_help2man - fi -- if test "x$HELP2MAN_SUPPORTS_LOCALE" == "xyes"; then -+ if test "x$HELP2MAN_SUPPORTS_LOCALE" = "xyes"; then - HAVE_HELP2MAN_LOCALE_TRUE= - HAVE_HELP2MAN_LOCALE_FALSE='#' - else diff --git a/math/sollya/patches/patch-configure.ac b/math/sollya/patches/patch-configure.ac deleted file mode 100644 index 48e23d1028d4..000000000000 --- a/math/sollya/patches/patch-configure.ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.2 2020/07/17 17:30:13 riastradh Exp $ - -Fix shell portability. - -https://lists.gforge.inria.fr/pipermail/sollya-devl/2020-July/000018.html - ---- configure.ac.orig 2018-09-20 11:11:30.000000000 +0000 -+++ configure.ac -@@ -63,7 +63,7 @@ then - AC_MSG_RESULT($HELP2MAN_SUPPORTS_LOCALE) - rm -rf .tmp_help2man - fi --AM_CONDITIONAL([HAVE_HELP2MAN_LOCALE], [test "x$HELP2MAN_SUPPORTS_LOCALE" == "xyes"]) -+AM_CONDITIONAL([HAVE_HELP2MAN_LOCALE], [test "x$HELP2MAN_SUPPORTS_LOCALE" = "xyes"]) - - #Checking for pdflatex with the required packages - AC_PATH_PROG([PDFLATEX],[pdflatex],[no]) diff --git a/math/sollya/patches/patch-general.c b/math/sollya/patches/patch-general.c deleted file mode 100644 index 7384581a962a..000000000000 --- a/math/sollya/patches/patch-general.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-general.c,v 1.2 2020/07/17 17:30:13 riastradh Exp $ - -Get declarations for gettimeofday and clock_gettime on NetBSD. - -https://lists.gforge.inria.fr/pipermail/sollya-devl/2020-July/000019.html - ---- general.c.orig 2018-08-27 08:32:07.000000000 +0000 -+++ general.c -@@ -73,7 +73,7 @@ - #include "signalhandling.h" - - #define _POSIX_SOURCE --#define _POSIX_C_SOURCE 199309L -+#define _POSIX_C_SOURCE 200112L - - #include - #include