Updating math/pari from 2.3.5 to 2.3.5nb1

- Math::Pari requires one more function declaration from src/language/anal.h
  (moved into src/headers/paripriv.h, too)

4 files changed, 21 insertions, 11 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 26faefeeeab..983dc0b3440 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2010/02/06 10:37:06 sno Exp $
+# $NetBSD: Makefile,v 1.44 2010/02/12 18:18:29 sno Exp $
 
 DISTNAME=	pari-2.3.5
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
 EXTRACT_SUFX=	.tar.gz
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 9cdc4838169..320f26664dc 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2010/02/06 10:37:06 sno Exp $
+$NetBSD: distinfo,v 1.17 2010/02/12 18:18:29 sno Exp $
 
 SHA1 (pari-2.3.5.tar.gz) = f211ccfe42a4b18dbcde832dfd1ece6f477f4966
 RMD160 (pari-2.3.5.tar.gz) = 488adf3af5398d0ab5390eb86b65cd79bd1044c5
@@ -16,5 +16,5 @@ SHA1 (patch-aj) = 9231890613515ceb2c7018189dc549872f04a14d
 SHA1 (patch-ak) = 622a06c67fd16c61ca8219c01e7f9dc9de202df4
 SHA1 (patch-al) = 3cb64ea5b1caeaeeeebb7297a7e061d235925686
 SHA1 (patch-am) = 09e158e5cd3a680d786aa876ce66d034df0c3b86
-SHA1 (patch-an) = 235aec62e4344307427270f084c4491e7abba8b3
-SHA1 (patch-ao) = b0854d8e32953c99f7c8fe9fafae59e8bccfa316
+SHA1 (patch-an) = 4e1f9c8e0c63e2f1922bb8b181212b3e09c56ce6
+SHA1 (patch-ao) = 44bf077f1585e20277dcd42a7c5fd38d12b19af5
diff --git a/math/pari/patches/patch-an b/math/pari/patches/patch-an
index 0cf04852172..f3fb0c9213b 100644
--- a/math/pari/patches/patch-an
+++ b/math/pari/patches/patch-an
@@ -1,8 +1,16 @@
-$NetBSD: patch-an,v 1.2 2010/02/06 10:37:06 sno Exp $
+$NetBSD: patch-an,v 1.3 2010/02/12 18:18:29 sno Exp $
 
---- src/language/anal.h.orig	2010-02-05 15:33:40.000000000 +0000
+--- src/language/anal.h.orig	2008-06-10 15:43:14.000000000 +0000
 +++ src/language/anal.h
-@@ -80,23 +80,15 @@ void hit_return(void);
+@@ -61,7 +61,6 @@ void   changevalue_p(entree *ep, GEN x);
+ void   changevalue(entree *ep, GEN val);
+ entree *do_alias(entree *ep);
+ int    is_identifier(char *s);
+-entree *is_entry_intern(char *s, entree **table, long *hash);
+ long   is_keyword_char(char c);
+ char   *readstring(char *src, char *s);
+ long   loop_break(void);
+@@ -80,23 +79,15 @@ void hit_return(void);
  extern char *gp_function_name;
  extern int  (*whatnow_fun)(char *, int);
  extern void (*sigint_fun)(void);
@@ -26,7 +34,7 @@ $NetBSD: patch-an,v 1.2 2010/02/06 10:37:06 sno Exp $
  
  /* Variables containing the list of old PARI fonctions (up to 1.39.15) */
  extern entree **funct_old_hash;    /* hashtable */
-@@ -118,13 +110,6 @@ enum { RET_GEN, RET_INT, RET_LONG, RET_V
+@@ -118,13 +109,6 @@ enum { RET_GEN, RET_INT, RET_LONG, RET_V
  extern void *PARI_stack_limit;
  #endif
  
diff --git a/math/pari/patches/patch-ao b/math/pari/patches/patch-ao
index 33975c7ff25..96a29078c4c 100644
--- a/math/pari/patches/patch-ao
+++ b/math/pari/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2010/02/06 10:37:06 sno Exp $
+$NetBSD: patch-ao,v 1.3 2010/02/12 18:18:29 sno Exp $
 
---- src/headers/paripriv.h.orig	2010-02-05 15:33:33.000000000 +0000
+--- src/headers/paripriv.h.orig	2008-03-31 11:43:59.000000000 +0000
 +++ src/headers/paripriv.h
-@@ -850,4 +850,23 @@ GEN     kbesselnew(GEN n, GEN z, long pr
+@@ -850,4 +850,24 @@ GEN     kbesselnew(GEN n, GEN z, long pr
  GEN     polylogd0(long m, GEN x, long flag, long prec);
  GEN     twistpartialzeta(GEN p, GEN q, long f, long c, GEN va, GEN cff);
  
@@ -18,6 +18,7 @@ $NetBSD: patch-ao,v 1.2 2010/02/06 10:37:06 sno Exp $
 +extern entree **functions_hash;    /* functions hashtable */
 +extern entree functions_basic[];
 +extern entree  functions_highlevel[];
++extern entree *is_entry_intern(char *s, entree **table, long *hash);
 +
 +extern void *foreignHandler;
 +extern GEN  (*foreignExprHandler)(char*);