[pkgsrc/trunk]: pkgsrc/devel/gmp revert previous; this wasn't tested very wel...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30deb9ba8805
branches:  trunk
changeset: 495574:30deb9ba8805
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Tue Jun 14 14:28:32 2005 +0000

description:
revert previous; this wasn't tested very well.  Sorry.

diffstat:

 devel/gmp/distinfo         |     3 +-
 devel/gmp/patches/patch-ad |  2535 --------------------------------------------
 2 files changed, 1 insertions(+), 2537 deletions(-)

diffs (truncated from 2553 to 300 lines):

diff -r 9dcd5ece75f5 -r 30deb9ba8805 devel/gmp/distinfo
--- a/devel/gmp/distinfo        Tue Jun 14 11:26:37 2005 +0000
+++ b/devel/gmp/distinfo        Tue Jun 14 14:28:32 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/06/14 03:08:30 jschauma Exp $
+$NetBSD: distinfo,v 1.15 2005/06/14 14:28:32 jschauma Exp $
 
 SHA1 (gmp-4.1.4.tar.bz2) = 21bf0e934fb31784487827f358e00077602145e7
 RMD160 (gmp-4.1.4.tar.bz2) = bde4d1f217606f79490372eed8356039b06d4aac
@@ -6,4 +6,3 @@
 SHA1 (patch-aa) = 6e143257bd0ce6a99fa81fc2e2b4476c7be77077
 SHA1 (patch-ab) = 6c8eccf2c483018f7e1326899924d88554a39edf
 SHA1 (patch-ac) = 6a21b0ab4ba56aabc5b9d66586003063c537777a
-SHA1 (patch-ad) = 72c957026373df40ac73f5b765b4b739e3420998
diff -r 9dcd5ece75f5 -r 30deb9ba8805 devel/gmp/patches/patch-ad
--- a/devel/gmp/patches/patch-ad        Tue Jun 14 11:26:37 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2535 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/06/14 03:08:31 jschauma Exp $
-
---- configure.orig     Tue Sep 21 09:06:47 2004
-+++ configure  Thu Mar  3 09:39:01 2005
-@@ -207,7 +207,7 @@
-   as_expr=false
- fi
- 
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -rf conf$$ conf$$.exe conf$$.file
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-   # We could just check for DJGPP; but this test a) works b) is more generic
-@@ -223,7 +223,7 @@
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -rf conf$$ conf$$.exe conf$$.file
- 
- as_executable_p="test -f"
- 
-@@ -1211,7 +1211,7 @@
-   ac_path_separator=:
- fi
- PATH_SEPARATOR="$ac_path_separator"
--rm -f conftest.sh
-+rm -fr conftest.sh
- 
- # If --target is not used then $target_alias is empty, but if say
- # "./configure athlon-pc-freebsd3.5" is used, then all three of
-@@ -1420,7 +1420,7 @@
-       # -L didn't work.
-       set X `ls -t $srcdir/configure conftest.file`
-    fi
--   rm -f conftest.file
-+   rm -fr conftest.file
-    if test "$*" != "X $srcdir/configure conftest.file" \
-       && test "$*" != "X conftest.file $srcdir/configure"; then
- 
-@@ -1530,7 +1530,7 @@
- else
-   eval ac_cv_prog_make_${ac_make}_set=no
- fi
--rm -f conftest.make
-+rm -fr conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-   echo "$as_me:1536: result: yes" >&5
-@@ -2269,7 +2269,7 @@
- echo "include_mpn(\`mips32/mips-defs.m4')" >> $gmp_tmpconfigm4i
- 
-     case $host in
--      mips64*-*-* | mips*-*-irix6789*)
-+      mips64*-*-* | mips*-*-irix6*)
-         abilist="n32 64 o32"
- 
-         cclist_n32="gcc cc"
-@@ -2844,7 +2844,7 @@
-   ac_status=$?
-   echo "$as_me:2845: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  rm -f conftest*
-+  rm -rf conftest*
-   echo "$as_me:2848: checking whether $cc is gcc" >&5
- echo $ECHO_N "checking whether $cc is gcc... $ECHO_C" >&6
-   echo "$as_me:2850: result: yes" >&5
-@@ -2851,7 +2851,7 @@
- echo "${ECHO_T}yes" >&6
-   ccbase=gcc
- else
--  rm -f conftest*
-+  rm -rf conftest*
-   :
- fi
- 
-@@ -2941,7 +2941,7 @@
-     gmp_prog_cc_works=yes
-   fi
- fi
--rm -f conftest* a.out a.exe
-+rm -rf conftest* a.out a.exe
- echo "$as_me:2945: result: $gmp_prog_cc_works" >&5
- echo "${ECHO_T}$gmp_prog_cc_works" >&6
- if test $gmp_prog_cc_works = yes; then
-@@ -3037,7 +3037,7 @@
-     result=no
-   fi
- fi
--rm -f conftest.*
-+rm -rf conftest.*
- echo "$as_me:3041: result: $result" >&5
- echo "${ECHO_T}$result" >&6
- if test $result = yes; then
-@@ -3135,7 +3135,7 @@
-     fi
-   fi
-   cat conftest.out >&5
--  rm -f conftest* a.out
-+  rm -rf conftest* a.out
-   echo "$as_me:3139: result: $result" >&5
- echo "${ECHO_T}$result" >&6
-   if test "$result" = yes; then
-@@ -3168,7 +3168,7 @@
-   fi
- fi
- cat conftest.out >&5
--rm -f conftest*
-+rm -rf conftest*
- echo "$as_me:3172: result: $result" >&5
- echo "${ECHO_T}$result" >&6
- if test "$result" = yes; then
-@@ -3228,7 +3228,7 @@
-     gmp_prog_cc_works=yes
-   fi
- fi
--rm -f conftest* a.out a.exe
-+rm -rf conftest* a.out a.exe
- echo "$as_me:3232: result: $gmp_prog_cc_works" >&5
- echo "${ECHO_T}$gmp_prog_cc_works" >&6
- if test $gmp_prog_cc_works = yes; then
-@@ -3749,11 +3749,11 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--rm -f conftest$ac_cv_exeext
-+rm -rf conftest$ac_cv_exeext
- echo "$as_me:3753: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
--rm -f conftest.$ac_ext
-+rm -rf conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
- echo "$as_me:3759: checking for object suffix" >&5
-@@ -3773,7 +3773,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.o conftest.obj
-+rm -rf conftest.o conftest.obj
- if { (eval echo "$as_me:3777: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3794,7 +3794,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+rm -rf conftest.$ac_cv_objext conftest.$ac_ext
- fi
- echo "$as_me:3799: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
-@@ -3820,7 +3820,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
-+rm -rf conftest.$ac_objext
- if { (eval echo "$as_me:3824: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3838,7 +3838,7 @@
- cat conftest.$ac_ext >&5
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
-@@ -3865,7 +3865,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
-+rm -rf conftest.$ac_objext
- if { (eval echo "$as_me:3869: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3883,7 +3883,7 @@
- cat conftest.$ac_ext >&5
- ac_cv_prog_cc_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:3888: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -3911,7 +3911,7 @@
-   choke me
- #endif
- _ACEOF
--rm -f conftest.$ac_objext
-+rm -rf conftest.$ac_objext
- if { (eval echo "$as_me:3915: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3945,7 +3945,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
-+rm -fr conftest.$ac_objext
- if { (eval echo "$as_me:3949: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3963,7 +3963,7 @@
- cat conftest.$ac_ext >&5
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -fr conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
- #line 3968 "configure"
- #include "confdefs.h"
-@@ -3976,7 +3976,7 @@
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
-+rm -fr conftest.$ac_objext
- if { (eval echo "$as_me:3980: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3993,9 +3993,9 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -fr conftest.$ac_objext conftest.$ac_ext
- done
--rm -f conftest*
-+rm -fr conftest*
- if test -n "$ac_declaration"; then
-   echo '#ifdef __cplusplus' >>confdefs.h
-   echo $ac_declaration      >>confdefs.h
-@@ -4006,7 +4006,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -fr conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4050,7 +4050,7 @@
- 
- echo "$as_me:4051: result: $_am_result" >&5
- echo "${ECHO_T}$_am_result" >&6
--rm -f confinc confmf
-+rm -fr confinc confmf
- 
- depcc="$CC"   am_compiler_list=
- 
-@@ -4176,7 +4176,7 @@
- for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
-+  rm -fr conftest.$ac_objext
- if { (eval echo "$as_me:4180: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -4194,9 +4194,9 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
--rm -f conftest.$ac_objext
-+rm -fr conftest.$ac_objext
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -fr conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
- 
- fi
-@@ -4246,7 +4246,7 @@
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
-+  rm -fr conftest.er1