summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/p5-Math-Pari/Makefile8
-rw-r--r--math/p5-Math-Pari/distinfo12
-rw-r--r--math/p5-Math-Pari/patches/patch-aa55
3 files changed, 39 insertions, 36 deletions
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index a16fd0e0e05..605220b751b 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.47 2015/06/12 10:50:29 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/12/29 23:21:11 wiz Exp $
-DISTNAME= Math-Pari-2.01080605
-PKGNAME= p5-${DISTNAME:S/01080605/010806.05/}
-PKGREVISION= 4
+DISTNAME= Math-Pari-2.010808
+PKGNAME= p5-${DISTNAME}
CATEGORIES+= perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Math/}
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Math-Pari/
diff --git a/math/p5-Math-Pari/distinfo b/math/p5-Math-Pari/distinfo
index 2ec4b481077..aaf85e5f86d 100644
--- a/math/p5-Math-Pari/distinfo
+++ b/math/p5-Math-Pari/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2015/11/03 23:33:39 agc Exp $
+$NetBSD: distinfo,v 1.22 2015/12/29 23:21:11 wiz Exp $
-SHA1 (Math-Pari-2.01080605.tar.gz) = 95a46ba418bf14584925dfae971d598af4214894
-RMD160 (Math-Pari-2.01080605.tar.gz) = 2cc1e02f9666873999379f8130262da68a8801b9
-SHA512 (Math-Pari-2.01080605.tar.gz) = a92ff01afce8d52c5d7c4fec1a5759b5d7b786c8f359348ac8f4e7fc95be9338b990879d4d89598dc5333f79c53a92e54f6756d0e6c9a0e9e72a4dfd15b0b263
-Size (Math-Pari-2.01080605.tar.gz) = 122627 bytes
-SHA1 (patch-aa) = 89de98c7c993654087faf4130509bbd70c5f8b24
+SHA1 (Math-Pari-2.010808.zip) = 722315027efa634aea1eb9620fae81d6d976f81b
+RMD160 (Math-Pari-2.010808.zip) = 4c869bbdf56326eb0f98a06f7abf09891f4627f7
+SHA512 (Math-Pari-2.010808.zip) = 006e77328f0d8e61b89addbb6b8b8a8adb8c8c1591a1d3cdf80f5183a5fb30bb19219cbfc2624d15ffcdb6b0dc5cff4d69e6e27eb7cb6c29796bbab36ecfda88
+Size (Math-Pari-2.010808.zip) = 153838 bytes
+SHA1 (patch-aa) = 08b366ed26c69c6795e0e9e4066c62e10f3a1f66
SHA1 (patch-ab) = 32ddc27824bbb5ac88adc0dece0f436044b8d9c7
diff --git a/math/p5-Math-Pari/patches/patch-aa b/math/p5-Math-Pari/patches/patch-aa
index b023caf0abe..64ee8040884 100644
--- a/math/p5-Math-Pari/patches/patch-aa
+++ b/math/p5-Math-Pari/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
+$NetBSD: patch-aa,v 1.7 2015/12/29 23:21:11 wiz Exp $
---- Makefile.PL.orig 2010-03-03 21:26:10.000000000 +0000
+--- Makefile.PL.orig 2014-06-01 19:12:16.000000000 +0000
+++ Makefile.PL
@@ -2,9 +2,6 @@
use ExtUtils::MakeMaker;
@@ -12,9 +12,9 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
# Uncomment and change this line if I fail to find it
# $paridir = "..";
-@@ -16,137 +13,16 @@ unless (-t STDOUT) { # Better reports i
- select $odef;
- }
+@@ -18,137 +15,16 @@ unless (-t STDOUT) { # Better reports i
+
+ chmod 0400, 'typemap' if $^O =~ /cygwin/ and -f 'typemap' and not -r 'typemap'; # bug in some installations of cygwin???
-my $ok23 = 0;
-grep {/^machine=(.*)$/i and $common::machine = $1} @ARGV;
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
-grep {/^version23_ok=(.*)$/i and $ok23 = $1} @ARGV;
-
-# The REx should anchored-match versions to skip
--$common::skip_versions = $ok23 ? '(?!)' : '2\.(?:[3-9]|\d\d+)\.';
+-$common::skip_versions = $ok23 ? '2\.(?:[4-9]|\d\d+)\.' : '2\.(?:[3-9]|\d\d+)\.';
-
-@ARGV = grep !/^((machine|paridir|pari_tgz|parilib|version23_ok)=.*|configure|force_download)$/i, @ARGV;
-
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
-EOP
-
-if ($common::parilib) {
-- $pari_version = '2001004'; # XXXX How to get a correct one?
+- $pari_version = '2001007'; # XXXX How to get a correct one?
- $define = '-DNO_HIGHLEVEL_PARI';
- print <<EOP;
-Trying to use existing PARI library (at $common::parilib)
@@ -97,7 +97,14 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
-}
-
-$os = $Config{osname};
--
++my $pariprefix;
++my $addlibs;
++my $libpari = "pari";
++
++grep {/^pariprefix=(.*)$/i and $pariprefix = $1} @ARGV;
++grep {/^addlibs=(.*)$/i and $addlibs = $1} @ARGV;
++grep {/^libpari=(.*)$/i and $libpari = $1} @ARGV;
+
-$define .= " -DPARI_VERSION_EXP=$pari_version -DDEBUG_PARI";
-$define .= " -DUSE_SLOW_ARRAY_ACCESS -DUSE_SLOW_NARGS_ACCESS" if $] >= 5.009;
-$libs = "-lm";
@@ -124,14 +131,7 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
-} elsif ($os eq 'linux') {
- $noexp2 = 1;
-}
-+my $pariprefix;
-+my $addlibs;
-+my $libpari = "pari";
-+
-+grep {/^pariprefix=(.*)$/i and $pariprefix = $1} @ARGV;
-+grep {/^addlibs=(.*)$/i and $addlibs = $1} @ARGV;
-+grep {/^libpari=(.*)$/i and $libpari = $1} @ARGV;
-
+-
-my %opts;
-unless ($common::parilib) {
- build_tests $paridir; # Convert the test suite
@@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
# We want to find the offset of the least significant byte
# of SV.flags inside an SV.
-@@ -164,67 +40,40 @@ my $perl_int_size = $Config{'ivsize'} ||
+@@ -166,74 +42,36 @@ my $perl_int_size = $Config{'ivsize'} ||
$define .= ' -DLONG_SHORTER_THAN_IV' if $perl_int_size > $longsize;
$define .= ' -Derr=pari_err'; # On linux it can get a wrong dynamic loading
@@ -172,10 +172,10 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
-# XXXX because functions_hash = NULL???
-# $define .= ' -DNO_HIGHLEVEL_PARI' if $pari_version >= 2003000;
-$define .= ' -DNO_GRAPHICS_PARI' if $pari_version >= 2003000;
--
+
-# This is done in Makefile in GP/PARI, and in paricfg.h without do_configure
-$define .= ' -DDL_DFLT_NAME=NULL' if $common::do_configure;
-
+-
-my $extra_inc = extra_includes($paridir);
+$define .= " -DNO_HIGHLEVEL_PARI";
@@ -199,12 +199,15 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
- macro => { %patchrc,
- PARI_DIR => $paridir,
- },
-+# clean => { FILES => 'pari.ps test_eng/ex.t- libPARI.dumb.pod libPARI.pod t/55_*.t ftp-cmd' },
-+# macro => { %patchrc,
-+# PARI_DIR => $paridir,
-+# },
);
+-if (not $common::patches_run or @common::patches_fail) {
+- my @patches_needed = patches_for($pari_version);
+- my $msg = $common::patches_run ? "failed when applied" : "were not applied";
+- push @common::patches_fail, @patches_needed unless $common::patches_run;
+- warn "\nThe following patches were judged to be beneficial, but $msg:\n\t@common::patches_fail\n";
+-}
+-
-
-# Remake POD if the source changed.
-# Go to a subdirectory to build the headers and the library.
@@ -238,15 +241,15 @@ $NetBSD: patch-aa,v 1.6 2015/08/10 08:23:49 dholland Exp $
+ open( $fh, "<", "${pariprefix}/include/pari/paricfg.h" ) or die $!;
+ while( my $line = <$fh> )
+ {
-+ next unless ( $line =~ m/^#define\s+PARIVERSION.*(\d+)\.(\d+)\.(\d+)/ );
-+ $formatted_version = sprintf( "%d%03d%03d", $1, $2, $3 );
++ next unless ( $line =~ m/^#define\s+PARIVERSION.*(\d+)\.(\d+)\.(\d+)/ );
++ $formatted_version = sprintf( "%d%03d%03d", $1, $2, $3 );
+ }
+ close($fh);
+ return $formatted_version;
}
# Rewrite pic option to PIC in CCCDLFLAGS,
-@@ -234,7 +83,8 @@ sub MY::const_config
+@@ -243,7 +81,8 @@ sub MY::const_config
my $self = shift;
my $flags = $self->{'CCCDLFLAGS'}; # Tmp var needed with Perl4 !
$flags =~ s/(-[fK]?\s*)pic\b/${1}PIC/;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 23:30:28 +0000