Add DragonFly support. Fix test for exp2, GCC 3.4 would inline it away.

3 files changed, 57 insertions, 8 deletions

diff --git a/math/pari/distinfo b/math/pari/distinfo
index 07ae05cc15f..49be1a920fd 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2005/09/08 08:39:59 adam Exp $
+$NetBSD: distinfo,v 1.14 2005/12/03 00:54:11 joerg Exp $
 
 SHA1 (pari-2.1.6.tgz) = 54bd40fa70a02e76d78d0ea19c0f56f7da62de8e
 RMD160 (pari-2.1.6.tgz) = 6b79e84b639d1862df148b253136deacd73bf4f0
 Size (pari-2.1.6.tgz) = 1541464 bytes
-SHA1 (patch-aa) = e169471d22d5f9fab10a074ea8f676c6754c6462
+SHA1 (patch-aa) = 5e12a0e5f91ee0646cd86515134eb586745e1df1
 SHA1 (patch-ab) = 772ee298763d3fd8b63f77f6a277e347299205d5
 SHA1 (patch-ac) = 84af235f319ae108aadeedea5a25e005540160ac
 SHA1 (patch-ad) = 82c0532ba6bc23b1c91865591c2bdfbee144bcf9
@@ -20,3 +20,4 @@ SHA1 (patch-an) = 881878c2903b4f1114b41349b103bb70574fcecb
 SHA1 (patch-ao) = d6f818278f2ef0599479d2a58efc412a9eedc779
 SHA1 (patch-ap) = 985c5c49efb52c04f53f098480f0de1209fa16ef
 SHA1 (patch-aq) = 43a6f7a4b74a2affbdffca7bf781009e3e1dece0
+SHA1 (patch-ar) = 753d10a31dbf106c3217976b6dd16a4d3f864428
diff --git a/math/pari/patches/patch-aa b/math/pari/patches/patch-aa
index bb4e9df78d2..d5d49cf051a 100644
--- a/math/pari/patches/patch-aa
+++ b/math/pari/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2005/09/08 08:39:59 adam Exp $
+$NetBSD: patch-aa,v 1.12 2005/12/03 00:54:11 joerg Exp $
 
 --- Configure.orig	2004-11-25 15:58:25.000000000 +0000
 +++ Configure
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.11 2005/09/08 08:39:59 adam Exp $
  I know of the following Operating Systems
  EOM
 -  rep='os2 freebsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix';
-+  rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix';
++  rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly';
    . ./display
    echo $n ..."Any of these apply ? $c"
    dflt=$osname; . ./myread
@@ -95,8 +95,12 @@ $NetBSD: patch-aa,v 1.11 2005/09/08 08:39:59 adam Exp $
    fx2800)        asmarch=none;          pretty="Alliant FX/2800" ;;
    none)          asmarch=none;          pretty="unknown" ;;
    *)             asmarch=none;          pretty=$arch
-@@ -329,6 +308,9 @@ case "$osname" in
-   nextstep|cygwin*|linux|freebsd|os2|gnu)
+@@ -326,9 +305,12 @@ esac
+ #   Modifications for pretty name and asm file
+ #
+ case "$osname" in
+-  nextstep|cygwin*|linux|freebsd|os2|gnu)
++  nextstep|cygwin*|linux|freebsd|os2|gnu|dragonfly)
         pretty="$pretty running $osname";
          if test "$arch" = m68k; then asmarch=none; fi ;;
 +  netbsd)
@@ -235,6 +239,15 @@ $NetBSD: patch-aa,v 1.11 2005/09/08 08:39:59 adam Exp $
          ";
          pth=`echo $x11pth | s,/lib,/include,g`
          x=`./locate X11/Xos.h '' $pth`
+@@ -867,7 +794,7 @@ else
+                   OPTFLAGS=-O; cflags=-Aa; DLCFLAGS=+z;;
+     # best tuning option, even for PPC604:
+     aix-*)        OPTFLAGS=-O2; cflags='-qlanglvl=ansi -qtune=601';;
+-    cygwin*|linux-i?86|freebsd-i?86)
++    cygwin*|linux-i?86|freebsd-i?86|dragonfly-i?86)
+                   OPTFLAGS=-O2; cflags=-m486;;
+     osf1-*)       OPTFLAGS='-O4 -migrate -ifo -Olimit 9999';;
+     sunos-*)      OPTFLAGS=-fast; PRFFLAGS='-pg -Bstatic';;
 @@ -877,7 +804,7 @@ else
    esac
    PRFFLAGS="$PRFFLAGS $OPTFLAGS"
@@ -252,7 +265,33 @@ $NetBSD: patch-aa,v 1.11 2005/09/08 08:39:59 adam Exp $
    osf1-alpha)
        LD=$ld; LIBS="$LIBS -lots -lc"; runpathprefix='-rpath '
        LDFLAGS='-std0 -call_shared /usr/lib/cmplrs/cc/crt0.o'
-@@ -1207,8 +1135,8 @@ if test -z "$share_prefix"; then
+@@ -1006,7 +934,7 @@ if test "$optimization" = profiling; the
+ #    aix-*)  DLSUFFIX=a  ;; dynamic linking does not work!
+     sunos-*) sodest=$VersionMajor$VersionMinor.$patch
+              soname=$sodest;;
+-    gnu-*|*-alpha|solaris-*|linux-*|freebsd-*)
++    gnu-*|*-alpha|solaris-*|linux-*|freebsd-*|dragonfly-*)
+       case $libpari_base in
+         pari) sodest=$version.$patch;; # released versions
+         *) sodest=$patch.0.0;; # unstable versions
+@@ -1042,6 +970,7 @@ if test -n "$DLLD"; then
+       aix-*)      DLLDFLAGS="-r" ;;
+       hpux-*)     DLLDFLAGS="-b -E" ;;
+       freebsd-*)  DLLDFLAGS="-Bshareable -x" ;;
++      dragonfly-*)  DLLDFLAGS="-Bshareable -x" ;;
+       gnu-*|linux-*)    DLLDFLAGS="-shared -soname \$(LIBPARI_SONAME)" ;;
+       irix-*)     DLLDFLAGS="-shared -elf -no_unresolved -all" ;;
+       *-alpha)    DLLDFLAGS="-shared"; EXTRADLLDFLAGS='${LIBS}'
+@@ -1054,7 +983,7 @@ if test -n "$DLLD"; then
+     esac
+   fi
+   case "$osname" in 
+-    freebsd|linux|sunos|solaris) DLLDFLAGS="$DLLDFLAGS -lc -lm";;
++    dragonfly|freebsd|linux|sunos|solaris) DLLDFLAGS="$DLLDFLAGS -lc -lm";;
+   esac
+ 
+   if test "$fastread" != yes; then
+@@ -1207,8 +1136,8 @@ if test -z "$share_prefix"; then
    dfltman=$prefix/man/man1
    dfltall=$prefix/lib/pari
  else
@@ -263,7 +302,7 @@ $NetBSD: patch-aa,v 1.11 2005/09/08 08:39:59 adam Exp $
  fi
  
  echo $n ..."\"gp\" executable ? $c"
-@@ -1289,6 +1217,7 @@ fi
+@@ -1289,6 +1218,7 @@ fi
  case "$osname" in
    *cygwin*) LDDYN="-L$libdir -lpari_dll" ; runpath="$libdir" ;
  	    DYNLIBS=-lpari_dll ; DYNFLAGS=-Dlibpari_USE_DLL ;;
diff --git a/math/pari/patches/patch-ar b/math/pari/patches/patch-ar
new file mode 100644
index 00000000000..b44b7096bd6
--- /dev/null
+++ b/math/pari/patches/patch-ar
@@ -0,0 +1,9 @@
+$NetBSD: patch-ar,v 1.1 2005/12/03 00:54:11 joerg Exp $
+
+--- config/has_exp2.c.orig	2005-12-03 00:14:25.000000000 +0000
++++ config/has_exp2.c
+@@ -1,2 +1,3 @@
+ #include <math.h>
+-main(){double x=exp2(1.0);}
++double testval;
++main(){double x=exp2(testval);}