5 files changed, 33 insertions, 34 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index a7cbc6578b34..3fee4439f4d6 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	pari
-PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTVERSION=	2.1.6
 CATEGORIES=	math
-MASTER_SITES=	ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.1/ \
-		http://www.gn-50uma.de/ftp/pari-2.1/
+MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 COMMENT=	Mathmatics library and advanced calculator package
 
+EXTRACT_SUFX=   .tgz
 INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
@@ -38,7 +37,7 @@ PLIST=		${PKGDIR}/pkg-plist.emacs
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 502126
-EXTRA_PATCHES=	${FILESDIR}/hack-src:headers::paricom.h
+USE_GCC=    3.2
 .endif
 
 .if ${ARCH} == "amd64"
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 2dad64cb3fb0..53c2b3a6ebeb 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,2 +1,2 @@
-MD5 (pari-2.1.5.tar.gz) = 194e9d1cc11926e457028c6a7cba15f0
-SIZE (pari-2.1.5.tar.gz) = 1540679
+MD5 (pari-2.1.6.tgz) = 506a061c8dcdec33d18876f3c551e951
+SIZE (pari-2.1.6.tgz) = 1541464
diff --git a/math/pari/files/hack-src:headers::paricom.h b/math/pari/files/hack-src:headers::paricom.h
deleted file mode 100644
index a02b299ee7dd..000000000000
--- a/math/pari/files/hack-src:headers::paricom.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/headers/paricom.h.orig	Fri Nov  3 13:00:24 2000
-+++ src/headers/paricom.h	Wed Sep 29 20:22:41 2004
-@@ -86,3 +86,2 @@
- 
--#ifdef NOEXP2
- #  ifdef __cplusplus
-@@ -92,12 +91,4 @@
- #    define exp2(x) (exp((double)(x)*LOG2))
--#    ifndef __CYGWIN32__
--#      define log2(x) (log((double)(x))/LOG2)
--#    endif
-+#    define log2(x) (log((double)(x))/LOG2)
- #  endif
--#else
--  BEGINEXTERN
--    double exp2(double);
--    double log2(double);
--  ENDEXTERN
--#endif
- 
diff --git a/math/pari/files/patch-Configure b/math/pari/files/patch-Configure
index e440df66750e..f79872eac213 100644
--- a/math/pari/files/patch-Configure
+++ b/math/pari/files/patch-Configure
@@ -1,14 +1,14 @@
---- Configure	2002/05/22 08:28:37	1.1
-+++ Configure	2002/05/22 08:30:16
-@@ -1005,7 +1005,10 @@
+--- Configure.orig	Fri Nov 26 00:58:25 2004
++++ Configure	Sun Jan  9 18:53:28 2005
+@@ -1006,7 +1006,10 @@
  #    aix-*)  DLSUFFIX=a  ;; dynamic linking does not work!
      sunos-*) sodest=$VersionMajor$VersionMinor.$patch
               soname=$sodest;;
--    *-alpha|solaris-*|linux-*|freebsd-*)
+-    gnu-*|*-alpha|solaris-*|linux-*|freebsd-*)
 +    freebsd-*)
-+	sodest=1
-+	soname=$sodest;;
-+    *-alpha|solaris-*|linux-*)
++      sodest=1
++      soname=$sodest;;
++    gnu-*|*-alpha|solaris-*|linux-*)
        case $libpari_base in
          pari) sodest=$version.$patch;; # released versions
          *) sodest=$patch.0.0;; # unstable versions
diff --git a/math/pari/files/patch-ah b/math/pari/files/patch-ah
new file mode 100644
index 000000000000..e8fe82a805d8
--- /dev/null
+++ b/math/pari/files/patch-ah
@@ -0,0 +1,20 @@
+diff -urN files_orig/patch-has_exp2.c files/patch-has_exp2.c
+--- files_orig/patch-has_exp2.c	Wed Dec 31 18:00:00 1969
++++ files/patch-has_exp2.c	Thu Sep 16 14:30:23 2004
+@@ -0,0 +1,6 @@
++--- config/has_exp2.c_orig	Thu Sep 16 08:46:59 1999
+++++ config/has_exp2.c	Thu Sep 16 14:27:18 2004
++@@ -1,2 +1,2 @@
++ #include &lt;math.h&gt;
++-main(){double x=exp2(1.0);}
+++main(){double x=exp2(0.666);}
+diff -urN files_orig/patch-has_log2.c files/patch-has_log2.c
+--- files_orig/patch-has_log2.c	Wed Dec 31 18:00:00 1969
++++ files/patch-has_log2.c	Thu Sep 16 14:30:50 2004
+@@ -0,0 +1,6 @@
++--- config/has_log2.c_orig	Wed Jan  8 18:16:55 2003
+++++ config/has_log2.c	Thu Sep 16 14:27:07 2004
++@@ -1,2 +1,2 @@
++ #include &lt;math.h&gt;
++-main(){double x=log2(1.0);}
+++main(){double x=log2(0.666);}