From 7f1fea25650ff3530591eddb58c168a88b01e4ce Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 22 Apr 2023 12:04:06 +0200 Subject: [PATCH] pari, bump version (#8486) --- ...{pari-2.11.0.recipe => pari-2.15.3.recipe} | 18 ++- sci-mathematics/pari/pari-2.7.6.recipe | 98 ------------- .../pari/patches/pari-2.11.0.patchset | 129 ------------------ .../pari/patches/pari-2.15.3.patchset | 79 +++++++++++ .../pari/patches/pari-2.7.6.patchset | 129 ------------------ 5 files changed, 90 insertions(+), 363 deletions(-) rename sci-mathematics/pari/{pari-2.11.0.recipe => pari-2.15.3.recipe} (83%) delete mode 100644 sci-mathematics/pari/pari-2.7.6.recipe delete mode 100644 sci-mathematics/pari/patches/pari-2.11.0.patchset create mode 100644 sci-mathematics/pari/patches/pari-2.15.3.patchset delete mode 100644 sci-mathematics/pari/patches/pari-2.7.6.patchset diff --git a/sci-mathematics/pari/pari-2.11.0.recipe b/sci-mathematics/pari/pari-2.15.3.recipe similarity index 83% rename from sci-mathematics/pari/pari-2.11.0.recipe rename to sci-mathematics/pari/pari-2.15.3.recipe index b7bdc1fab..fe06cbf77 100644 --- a/sci-mathematics/pari/pari-2.11.0.recipe +++ b/sci-mathematics/pari/pari-2.15.3.recipe @@ -13,15 +13,17 @@ the above-mentioned systems, only Magma provides similar features)." HOMEPAGE="https://pari.math.u-bordeaux.fr/" COPYRIGHT="2000-2018 The PARI Group, Bordeaux" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-$portVersion.tar.gz" -CHECKSUM_SHA256="3835caccaa3e0c64764521032d89efeb8773cce841f6655fec6d58e790f4c9a1" +CHECKSUM_SHA256="adf5a58638cdafd72a8b48bc9f444972b23329c8d545a1d3ed1bbeb1b6569268" PATCHES="pari-$portVersion.patchset" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86_gcc2 x86" portVers=${portVersion%.*} +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= 8" PROVIDES=" pari$secondaryArchSuffix = $portVersion compat >= 2 @@ -29,7 +31,7 @@ PROVIDES=" cmd:gp_$portVers$secondaryArchSuffix cmd:gphelp$secondaryArchSuffix cmd:tex2mail$secondaryArchSuffix - lib:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2 + lib:libpari_gmp$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -40,7 +42,8 @@ REQUIRES=" PROVIDES_devel=" pari${secondaryArchSuffix}_devel = $portVersion compat >= 2 - devel:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2 + devel:libpari$secondaryArchSuffix = $libVersionCompat + devel:libpari_gmp$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" pari$secondaryArchSuffix == $portVersion base @@ -72,8 +75,9 @@ BUILD_PREREQUIRES=" BUILD() { + chmod +x config/arch-osname ./Configure --prefix=$prefix --bindir=$binDir --includedir=$includeDir \ - --libdir=$libDir --mandir=$manDir --datadir=$dataDir \ + --libdir=$libDir --mandir=$manDir/man1 --datadir=$dataDir/$portName \ --sysdatadir=$libDir/pari make -C Ohaiku-* $jobArgs all } @@ -81,15 +85,15 @@ BUILD() INSTALL() { make install - rm $libDir/libpari.so if [ -n "$secondaryArchSuffix" ]; then rm -rf $dataDir $documentationDir else packageEntries data $dataDir fi - prepareInstalledDevelLib libpari-gmp + prepareInstalledDevelLibs libpari libpari-gmp fixPkgconfig + packageEntries devel $developDir } diff --git a/sci-mathematics/pari/pari-2.7.6.recipe b/sci-mathematics/pari/pari-2.7.6.recipe deleted file mode 100644 index f358d25e5..000000000 --- a/sci-mathematics/pari/pari-2.7.6.recipe +++ /dev/null @@ -1,98 +0,0 @@ -SUMMARY="A specialized computer algebra system" -DESCRIPTION="PARI/GP is a specialized computer algebra system, primarily \ -aimed at number theorists, but has been put to good use in many other \ -different fields, from topology or numerical analysis to physics. - -Although quite an amount of symbolic manipulation is possible, PARI does \ -badly compared to systems like Axiom, Magma, Maple, Mathematica, Maxima, or \ -Reduce on such tasks, e.g.~multivariate polynomials, formal integration, \ -etc. On the other hand, the three main advantages of the system are its \ -speed, the possibility of using directly data types which are familiar to \ -mathematicians, and its extensive algebraic number theory module (from \ -the above-mentioned systems, only Magma provides similar features)." -HOMEPAGE="http://pari.math.u-bordeaux.fr/" -COPYRIGHT="2000-2016 The PARI Group, Bordeaux" -LICENSE="GNU GPL v2" -REVISION="4" -SOURCE_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/2.7/pari-$portVersion.tar.gz" -CHECKSUM_SHA256="39a797222e33b8498777d4bca7b0d64acebddecc9f478578ada87d769289b811" -PATCHES="pari-$portVersion.patchset" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - pari$secondaryArchSuffix = $portVersion compat >= 2 - cmd:gp$secondaryArchSuffix - cmd:gp_2.7$secondaryArchSuffix - cmd:gphelp$secondaryArchSuffix - cmd:tex2mail$secondaryArchSuffix - lib:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES=" - haiku$secondaryArchSuffix - pari_data == $portVersion - lib:libgmp$secondaryArchSuffix - lib:libncurses$secondaryArchSuffix - " - -PROVIDES_devel=" - pari${secondaryArchSuffix}_devel = $portVersion compat >= 2 - devel:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES_devel=" - pari$secondaryArchSuffix == $portVersion base - devel:libgmp$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - " - -if [ -z "$secondaryArchSuffix" ]; then - SUMMARY_data="A specialized computer algebra system (data files)" - ARCHITECTURES_data="any" - PROVIDES_data=" - pari_data = $portVersion - " - REQUIRES_data="" -fi - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libgmp$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:diff - cmd:ld$secondaryArchSuffix - cmd:make - cmd:sed - " - -BUILD() -{ - ./Configure --prefix=$prefix --bindir=$binDir --includedir=$includeDir \ - --libdir=$libDir --mandir=$manDir --datadir=$dataDir \ - --sysdatadir=$libDir/pari - make -C Ohaiku-* $jobArgs all -} - -INSTALL() -{ - make install - rm $libDir/libpari.so - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $dataDir $documentationDir - else - packageEntries data $dataDir - fi - - prepareInstalledDevelLib libpari-gmp - fixPkgconfig - packageEntries devel $developDir -} - -TEST() -{ - make dobench -# make test-all -} diff --git a/sci-mathematics/pari/patches/pari-2.11.0.patchset b/sci-mathematics/pari/patches/pari-2.11.0.patchset deleted file mode 100644 index 3a210cb15..000000000 --- a/sci-mathematics/pari/patches/pari-2.11.0.patchset +++ /dev/null @@ -1,129 +0,0 @@ -From a71c50f4f494ceee10efae235abc92997cb7c0ac Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 10 May 2014 12:15:25 +0000 -Subject: we only use release versions, no point in checking .git - - -diff --git a/config/version b/config/version -index ed2635b..5f29f62 100644 ---- a/config/version -+++ b/config/version -@@ -19,15 +19,6 @@ patchlevel_verbose= - - case "$stat" in # $stat rewritten by config/settar ? - *git-*) patchlevel_verbose="[ $stat ]";; -- *) if test -d "$TOP/.git"; then -- t=`git rev-list HEAD 2>/dev/null | wc -l` # ~ svn revision number -- t=`echo $t | sed -e 's/ //g'` # some broken wc prepend spaces -- T=`git log -1 --pretty=format:%h` # commit hash -- if test -z "$t"; then t=0; fi -- vcsversion=$t-$T -- status="$stat $vcsversion" -- patchlevel_verbose="[ $status ]" -- fi - esac - version=$VersionMajor.$VersionMinor - pari_release="$version.$patch" --- -2.13.1 - - -From 746e5c106c55cf182606df557625b983e3d0a84c Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 10 May 2014 12:44:58 +0000 -Subject: Haiku support. - - -diff --git a/config/arch-osname b/config/arch-osname -index 5da1bc8..3527f2f 100755 ---- a/config/arch-osname -+++ b/config/arch-osname -@@ -74,6 +74,8 @@ if test -n "$myuname"; then - case $arch in i386-*) arch=i386;;esac;; - aix) arch=`uname -p`; - case $arch in powerpc) arch=ppc;;esac;; -+ haiku) arch=`uname -p` -+ ;; - esac - fi - echo $arch-$osname -diff --git a/config/get_dlld b/config/get_dlld -index c0054c0..ff184eb 100644 ---- a/config/get_dlld -+++ b/config/get_dlld -@@ -9,7 +9,7 @@ DLSUFFIX=so - soname=.$soname_num - do_dll=yes - case "$osname" in -- gnu*|aix|osf1|solaris|linux|freebsd|netbsd) -+ gnu*|aix|osf1|solaris|linux|freebsd|netbsd|haiku) - case $pari_release_verbose in - *STABLE*) sodest=.$version.$patch;; # released version - *DEVELOPMENT*) sodest=.$patch.0.0;; # unstable version -diff --git a/config/get_ld b/config/get_ld -index c140024..087895b 100644 ---- a/config/get_ld -+++ b/config/get_ld -@@ -3,6 +3,7 @@ - _ld_list='LD LDFLAGS LIBS runpathprexix LDneedsWl LDused GNULDused' - case "$osname" in - darwin) LIBS= ;; -+ haiku) LIBS= ;; - osf1) LIBS='-lm -lots';; - *) LIBS=-lm;; - esac -diff --git a/config/get_libc b/config/get_libc -index 8b1f5a8..88afba1 100644 ---- a/config/get_libc -+++ b/config/get_libc -@@ -2,7 +2,7 @@ - exe=$osname-$arch-tmp$$$exe_suff - _has_list= - echo Looking in C lib for some symbols... --extra_flags=-lm -+#extra_flags=-lm - - if test "$arch" = "x86_64" && test "$sizeof_long" = "8"; then - list=sse2; . ./look --- -2.13.1 - - -From 20c2c18ede8952adaf07d027d88f9415ae52ae41 Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Thu, 14 Apr 2016 22:46:58 +0000 -Subject: Install man pages in $MANDIR/man1/ instead of $MANDIR. - - -diff --git a/config/Makefile.SH b/config/Makefile.SH -index 27c6d5b..a4cc165 100644 ---- a/config/Makefile.SH -+++ b/config/Makefile.SH -@@ -399,17 +399,17 @@ install-bin-sta: gp-sta$exe_suff - -cd \$(BINDIR); $postconfig gp-$version$exe_suff - - install-man:: -- -mkdir -p \$(MANDIR) -- -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1 -- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR) -- \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1 -- -\$(LN) gp.1 \$(MANDIR)/pari.1 -- -\$(LN) gp-$version.1 \$(MANDIR)/gp.1 -+ -mkdir -p \$(MANDIR)/man1 -+ -\$(RM) \$(MANDIR)/man1/pari.1 \$(MANDIR)/man1/gp.1 \$(MANDIR)/man1/gp-$version.1 -+ \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)/man1 -+ \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/man1/gp-$version.1 -+ -\$(LN) gp.1 \$(MANDIR)/man1/pari.1 -+ -\$(LN) gp-$version.1 \$(MANDIR)/man1/gp.1 - - install-misc: - -mkdir -p \$(MISCDIR) \$(BINDIR) - \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR) -- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR) -+ \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)/man1 - \$(INSTALL_DATA) $misc/README \$(MISCDIR) - \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR) - \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR) --- -2.13.1 - diff --git a/sci-mathematics/pari/patches/pari-2.15.3.patchset b/sci-mathematics/pari/patches/pari-2.15.3.patchset new file mode 100644 index 000000000..3d033007e --- /dev/null +++ b/sci-mathematics/pari/patches/pari-2.15.3.patchset @@ -0,0 +1,79 @@ +From eb88d504cbfea312e6d65ab89e48eea43fa560ac Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 10 May 2014 12:15:25 +0000 +Subject: we only use release versions, no point in checking .git + + +diff --git a/config/version b/config/version +index 2e18bdf..bd8fe96 100644 +--- a/config/version ++++ b/config/version +@@ -19,15 +19,6 @@ patchlevel_verbose= + + case "$stat" in # $stat rewritten by config/settar ? + *git-*) patchlevel_verbose="[ $stat ]";; +- *) if test -d "$TOP/.git"; then +- t=`git rev-list HEAD 2>/dev/null | wc -l` # ~ svn revision number +- t=`echo $t | sed -e 's/ //g'` # some broken wc prepend spaces +- T=`git log -1 --pretty=format:%h` # commit hash +- if test -z "$t"; then t=0; fi +- vcsversion=$t-$T +- status="$stat $vcsversion" +- patchlevel_verbose="[ $status ]" +- fi + esac + version=$VersionMajor.$VersionMinor + pari_release="$version.$patch" +-- +2.37.3 + + +From c54ecc88ae843f1ff1defc08aa63fb38d3ad4869 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 10 May 2014 12:44:58 +0000 +Subject: Haiku support. + + +diff --git a/config/arch-osname b/config/arch-osname +old mode 100755 +new mode 100644 +index 735130c..f35a044 +--- a/config/arch-osname ++++ b/config/arch-osname +@@ -74,6 +74,8 @@ if test -n "$myuname"; then + case $arch in i386-*) arch=i386;;esac;; + aix) arch=`uname -p`; + case $arch in powerpc) arch=ppc;;esac;; ++ haiku) arch=`uname -p` ++ ;; + esac + fi + echo $arch-$osname +diff --git a/config/get_dlld b/config/get_dlld +index 596ad2a..0d6aeda 100644 +--- a/config/get_dlld ++++ b/config/get_dlld +@@ -9,7 +9,7 @@ DLSUFFIX=so + soname=.$soname_num + do_dll=yes + case "$osname" in +- gnu*|aix|osf1|solaris|linux|*bsd) ++ gnu*|aix|osf1|solaris|linux|*bsd|haiku) + case $pari_release_verbose in + *STABLE*) sodest=.$version.$patch;; # released version + *DEVELOPMENT*) sodest=.$patch.0.0;; # unstable version +diff --git a/config/get_ld b/config/get_ld +index c140024..087895b 100644 +--- a/config/get_ld ++++ b/config/get_ld +@@ -3,6 +3,7 @@ + _ld_list='LD LDFLAGS LIBS runpathprexix LDneedsWl LDused GNULDused' + case "$osname" in + darwin) LIBS= ;; ++ haiku) LIBS= ;; + osf1) LIBS='-lm -lots';; + *) LIBS=-lm;; + esac +-- +2.37.3 + diff --git a/sci-mathematics/pari/patches/pari-2.7.6.patchset b/sci-mathematics/pari/patches/pari-2.7.6.patchset deleted file mode 100644 index d849e7f2d..000000000 --- a/sci-mathematics/pari/patches/pari-2.7.6.patchset +++ /dev/null @@ -1,129 +0,0 @@ -From c34479129ddc5c5517c534a5650af347fa3fc537 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 10 May 2014 12:15:25 +0000 -Subject: we only use release versions, no point in checking .git - - -diff --git a/config/version b/config/version -index db70d45..8cf820a 100644 ---- a/config/version -+++ b/config/version -@@ -19,15 +19,6 @@ patchlevel_verbose= - - case "$stat" in # $stat rewritten by config/settar ? - *git-*) patchlevel_verbose="[ $stat ]";; -- *) if test -d "$TOP/.git"; then -- t=`git rev-list HEAD 2>/dev/null | wc -l` # ~ svn revision number -- t=`echo $t | sed -e 's/ //g'` # some broken wc prepend spaces -- T=`git log -1 --pretty=format:%h` # commit hash -- if test -z "$t"; then t=0; fi -- vcsversion=$t-$T -- status="$stat $vcsversion" -- patchlevel_verbose="[ $status ]" -- fi - esac - version=$VersionMajor.$VersionMinor - pari_release="$version.$patch" --- -1.8.3.4 - - -From 1ef615f242aa68b60b9ce3c4f23c0e628688c266 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 10 May 2014 12:44:58 +0000 -Subject: Haiku support. - - -diff --git a/config/arch-osname b/config/arch-osname -index 5da1bc8..515bcfd 100755 ---- a/config/arch-osname -+++ b/config/arch-osname -@@ -74,6 +74,8 @@ if test -n "$myuname"; then - case $arch in i386-*) arch=i386;;esac;; - aix) arch=`uname -p`; - case $arch in powerpc) arch=ppc;;esac;; -+ haiku) arch=`uname -p` -+ ;; - esac - fi - echo $arch-$osname -diff --git a/config/get_dlld b/config/get_dlld -index 4b41be0..17edd4b 100644 ---- a/config/get_dlld -+++ b/config/get_dlld -@@ -9,7 +9,7 @@ DLSUFFIX=so - soname=.$soname_num - do_dll=yes - case "$osname" in -- gnu*|aix|osf1|solaris|linux|freebsd|netbsd) -+ gnu*|aix|osf1|solaris|linux|freebsd|netbsd|haiku) - case $pari_release_verbose in - *STABLE*) sodest=.$version.$patch;; # released version - *DEVELOPMENT*) sodest=.$patch.0.0;; # unstable version -diff --git a/config/get_ld b/config/get_ld -index 9a8482d..ec7b9da 100644 ---- a/config/get_ld -+++ b/config/get_ld -@@ -3,6 +3,7 @@ - _ld_list='LD LDFLAGS LIBS runpathprexix LDneedsWl LDused GNULDused' - case "$osname" in - darwin) LIBS= ;; -+ haiku) LIBS= ;; - osf1) LIBS='-lm -lots';; - *) LIBS=-lm;; - esac -diff --git a/config/get_libc b/config/get_libc -index 513a983..1e42fdd 100644 ---- a/config/get_libc -+++ b/config/get_libc -@@ -2,7 +2,7 @@ - exe=$osname-$arch-tmp$$ - _has_list= - echo Looking in C lib for some symbols... --extra_flags=-lm -+#extra_flags=-lm - list=exp2; . ./look - list=log2; . ./look - extra_flags= --- -1.8.3.4 - - -From b3b6fe12d21426142d2d54c9fbf77dd8f88eebfe Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Thu, 14 Apr 2016 22:46:58 +0000 -Subject: Install man pages in $MANDIR/man1/ instead of $MANDIR. - - -diff --git a/config/Makefile.SH b/config/Makefile.SH -index acd5f58..c4c2266 100644 ---- a/config/Makefile.SH -+++ b/config/Makefile.SH -@@ -397,17 +397,17 @@ install-bin-sta: gp-sta - -cd \$(BINDIR); $postconfig gp-$version$exe_suff - - install-man:: -- -mkdir -p \$(MANDIR) -- -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1 -- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR) -- \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1 -- -\$(LN) gp.1 \$(MANDIR)/pari.1 -- -\$(LN) gp-$version.1 \$(MANDIR)/gp.1 -+ -mkdir -p \$(MANDIR)/man1 -+ -\$(RM) \$(MANDIR)/man1/pari.1 \$(MANDIR)/man1/gp.1 \$(MANDIR)/man1/gp-$version.1 -+ \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)/man1 -+ \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/man1/gp-$version.1 -+ -\$(LN) gp.1 \$(MANDIR)/man1/pari.1 -+ -\$(LN) gp-$version.1 \$(MANDIR)/man1/gp.1 - - install-misc: - -mkdir -p \$(MISCDIR) \$(BINDIR) - \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR) -- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR) -+ \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)/man1 - \$(INSTALL_DATA) $misc/README \$(MISCDIR) - \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR) - \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR) --- -2.7.0 -