Bl3ify and use gmp from devel/gmp not the supplied and older one. This

fix build with gcc3. Note that the somewhat aging gmp autoconf test
had been removed wholesale.

Bump PKGREVISION.

5 files changed, 317 insertions, 155 deletions

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index d244ee2cd9e..6c03ab15113 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2003/08/09 11:11:37 seb Exp $
+# $NetBSD: Makefile,v 1.29 2004/03/08 21:13:55 seb Exp $
 #
 
 DISTNAME=	pspp-0.3.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	ftp://franz.stat.wisc.edu/pub/PSPP/ \
 		ftp://alpha.gnu.org/gnu/pspp/ \
@@ -19,7 +19,7 @@ COMMENT=	Program for statistical analysis of sampled data
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-Dunix=1
@@ -34,5 +34,6 @@ CONF_FILES+=	${EGDIR}/html-prologue ${PKG_SYSCONFDIR}/html-prologue
 CONF_FILES+=	${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
 CONF_FILES+=	${EGDIR}/ps-prologue ${PKG_SYSCONFDIR}/ps-prologue
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index 8332b13fe32..06d846c2e82 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.7 2003/07/29 13:21:56 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/03/08 21:13:55 seb Exp $
 
 SHA1 (pspp-0.3.0.tar.gz) = 1d07a7e7ef0677e5934331ed0b80b92c7bba7074
 Size (pspp-0.3.0.tar.gz) = 1122999 bytes
 SHA1 (patch-aa) = 7d332aa82e51da9192cefd6a450d20e2d7c493c8
 SHA1 (patch-ab) = b6e70c52e780cd58fc8bed770b22642e0d67d820
 SHA1 (patch-ac) = 9b7c87e6729616b3c21d683764719c894480624a
-SHA1 (patch-ad) = 38d9173ac9fdc7f40c2ef01250d897763fd57ebd
+SHA1 (patch-ad) = 64e9141e75096761f8ee3f8fbce1903aa32f9866
 SHA1 (patch-ae) = 9f3f6cbe2817ab5282e70559e245cf7df0016ba3
 SHA1 (patch-ag) = 3a565a2becf76af67e1cf6b443ed51e24b4fd0f0
 SHA1 (patch-ah) = 8fd5821c09fcc5ea4f96a198186c99e0d958842d
 SHA1 (patch-ai) = f6886d4cd3779f71353dc0e013f3b37b86fe7474
 SHA1 (patch-aj) = e34a0638b8226efdf33cee4eccd40fc4dcaf6210
-SHA1 (patch-ak) = 468aa3904e044acb429c8b467897e6fccee44669
+SHA1 (patch-ak) = db897ff986bd8747be46e96a4ed5cd8fc4e46c2a
 SHA1 (patch-al) = b998fc5f7f6c11bc4b862c0c25fd6a810c60ec97
 SHA1 (patch-am) = 0a9cf92a8b15faa73002d7000a4fa8f6e86e1973
 SHA1 (patch-an) = 1bcb30f7a0a21a9a05cf022d18c9cf806c204f85
+SHA1 (patch-ao) = c918fe9d3837ea5902405a0faca885528b31a6f6
diff --git a/math/pspp/patches/patch-ad b/math/pspp/patches/patch-ad
index 44bf6755616..a365d28dec6 100644
--- a/math/pspp/patches/patch-ad
+++ b/math/pspp/patches/patch-ad
@@ -1,8 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2003/07/29 13:21:57 jmmv Exp $
+$NetBSD: patch-ad,v 1.4 2004/03/08 21:13:55 seb Exp $
 
---- configure.in.orig	2000-01-02 05:05:50.000000000 +0100
+--- configure.in.orig	2000-01-02 04:05:50.000000000 +0000
 +++ configure.in
-@@ -47,22 +47,26 @@ AC_CHECK_LIB(gmp, mpf_get_str, 
+@@ -41,28 +41,30 @@ fi
+ AC_SUBST(LOCAL_CC)
+ 
+ AC_CHECK_LIB(m, sin)
+-AC_CHECK_LIB(gmp, mpf_get_str, 
+-  LIBS="-lgmp $LIBS" GMP_SUBDIRS= GMP_LIBS=,
+-  GMP_SUBDIRS=gmp GMP_LIBS='$(GMP_LIBS)')
++LIBS="-lgmp $LIBS";GMP_SUBDIRS=;GMP_LIBS=
  AC_SUBST(GMP_SUBDIRS)
  AC_SUBST(GMP_LIBS)
  
@@ -37,7 +44,7 @@ $NetBSD: patch-ad,v 1.3 2003/07/29 13:21:57 jmmv Exp $
      AC_DEFINE(HAVE_LIBHISTORY)
    fi
  fi
-@@ -201,7 +205,7 @@ AC_PROG_LN_S
+@@ -201,7 +203,7 @@ AC_PROG_LN_S
  
  dnl This must be after other tests so warnings don't provoke errors above.
  if test "$ac_cv_prog_gcc" = yes; then
diff --git a/math/pspp/patches/patch-ak b/math/pspp/patches/patch-ak
index ad598f78148..cd926a3dc95 100644
--- a/math/pspp/patches/patch-ak
+++ b/math/pspp/patches/patch-ak
@@ -1,153 +1,233 @@
-$NetBSD: patch-ak,v 1.2 2003/07/29 13:21:57 jmmv Exp $
+$NetBSD: patch-ak,v 1.3 2004/03/08 21:13:55 seb Exp $
 
---- configure.orig	2000-01-08 02:36:11.000000000 +0100
+--- configure.orig	2000-01-08 01:36:11.000000000 +0000
 +++ configure
-@@ -3611,46 +3611,8 @@ fi
- 
+@@ -1744,7 +1744,7 @@ else
+ int main() {
  
+ /* Ultrix mips cc rejects this.  */
+-typedef int charset[2]; const charset x = {0,0};
++typedef int charset[2]; const charset x;
+ /* SunOS 4.1.1 cc rejects this.  */
+ char const *const *ccp;
+ char **p;
+@@ -3567,16 +3567,20 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
  
--echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:3616: checking for tgetent in -lncurses" >&5
--ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lncurses  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3624 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char tgetent();
--
--int main() {
--tgetent()
--; return 0; }
--EOF
--if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  LIBS="-lncurses $LIBS" termcap=yes
--else
--  echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:3654: checking for tgetent in -ltermcap" >&5
-+echo "configure:3616: checking for tgetent in -ltermcap" >&5
- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for mpf_get_str in -lgmp""... $ac_c" 1>&6
+-echo "configure:3572: checking for mpf_get_str in -lgmp" >&5
+-ac_lib_var=`echo gmp'_'mpf_get_str | sed 'y%./+-%__p_%'`
++LIBS="-lgmp $LIBS";GMP_SUBDIRS=;GMP_LIBS=
++
++
++
++echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
++echo "configure:3576: checking for tgetent in -ltermcap" >&5
++ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3690,8 +3652,6 @@ else
- termcap=no
- fi
- 
--fi
--
- if test "$termcap" = yes; then
-   for ac_hdr in termcap.h
- do
-@@ -3739,8 +3699,46 @@ EOF
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgmp  $LIBS"
++LIBS="-ltermcap  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3580 "configure"
++#line 3584 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3581,13 +3585,13 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char mpf_get_str();
++char tgetent();
  
+ int main() {
+-mpf_get_str()
++tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3602,25 +3606,69 @@ LIBS="$ac_save_LIBS"
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LIBS="-lgmp $LIBS" GMP_SUBDIRS= GMP_LIBS=
++  LIBS="-ltermcap $LIBS" termcap=yes
+ else
+   echo "$ac_t""no" 1>&6
+-GMP_SUBDIRS=gmp GMP_LIBS='$(GMP_LIBS)'
++termcap=no
  fi
  
-+echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
-+echo "configure:3704: checking for readline in -ledit" >&5
-+ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++if test "$termcap" = yes; then
++  for ac_hdr in termcap.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:3621: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ledit  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 3712 "configure"
++  cat > conftest.$ac_ext <<EOF
++#line 3626 "configure"
 +#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char readline();
-+
-+int main() {
-+readline()
-+; return 0; }
++#include <$ac_hdr>
 +EOF
-+if { (eval echo configure:3723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:3631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
 +  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
++  eval "ac_cv_header_$ac_safe=yes"
 +else
++  echo "$ac_err" >&5
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
++  eval "ac_cv_header_$ac_safe=no"
 +fi
 +rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
 +fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
-+  readlinelib=edit have_readline=yes
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
 +else
 +  echo "$ac_t""no" 1>&6
- echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
--echo "configure:3744: checking for readline in -lreadline" >&5
-+echo "configure:3742: checking for readline in -lreadline" >&5
- ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
++fi
++done
+ 
++  cat >> confdefs.h <<\EOF
++#define HAVE_LIBTERMCAP 1
++EOF
+ 
++fi
+ 
+-echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
+-echo "configure:3616: checking for tgetent in -lncurses" >&5
+-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
++echo "configure:3664: checking for readline in -ledit" >&5
++ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3774,20 +3772,17 @@ LIBS="$ac_save_LIBS"
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lncurses  $LIBS"
++LIBS="-ledit  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3624 "configure"
++#line 3672 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3625,13 +3673,13 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char tgetent();
++char readline();
+ 
+ int main() {
+-tgetent()
++readline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3646,19 +3694,19 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
--
--  LIBS="-lreadline $LIBS"
--
+-  LIBS="-lncurses $LIBS" termcap=yes
++  readlinelib=edit have_readline=yes
+ else
+   echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+-echo "configure:3654: checking for tgetent in -ltermcap" >&5
+-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
++echo "configure:3702: checking for readline in -lreadline" >&5
++ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltermcap  $LIBS"
++LIBS="-lreadline  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3662 "configure"
++#line 3710 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3663,13 +3711,13 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char tgetent();
++char readline();
+ 
+ int main() {
+-tgetent()
++readline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3684,16 +3732,17 @@ LIBS="$ac_save_LIBS"
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LIBS="-ltermcap $LIBS" termcap=yes
 +  readlinelib=readline have_readline=yes
  else
    echo "$ac_t""no" 1>&6
+-termcap=no
 +readline=no
  fi
  
--if test "$ac_cv_lib_readline_readline" = yes; then
--  for ac_hdr in readline/readline.h
-+fi
-+
+ fi
+ 
+-if test "$termcap" = yes; then
+-  for ac_hdr in termcap.h
 +if test "$have_readline" = yes; then
 +  LIBS="-l$readlinelib $LIBS"
 +  for ac_hdr in readline.h readline/readline.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3827,16 +3822,63 @@ else
- fi
+@@ -3734,21 +3783,19 @@ fi
  done
  
--  echo $ac_n "checking for add_history in -lreadline""... $ac_c" 1>&6
--echo "configure:3832: checking for add_history in -lreadline" >&5
--ac_lib_var=`echo readline'_'add_history | sed 'y%./+-%__p_%'`
-+  cat >> confdefs.h <<\EOF
+   cat >> confdefs.h <<\EOF
+-#define HAVE_LIBTERMCAP 1
 +#define HAVE_LIBREADLINE 1
-+EOF
-+
+ EOF
+ 
+-fi
+-
+-echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+-echo "configure:3744: checking for readline in -lreadline" >&5
+-ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 +  echo $ac_n "checking for tilde_expand in -l$readlinelib""... $ac_c" 1>&6
-+echo "configure:3831: checking for tilde_expand in -l$readlinelib" >&5
++echo "configure:3791: checking for tilde_expand in -l$readlinelib" >&5
 +ac_lib_var=`echo $readlinelib'_'tilde_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -155,56 +235,107 @@ $NetBSD: patch-ak,v 1.2 2003/07/29 13:21:57 jmmv Exp $
    ac_save_LIBS="$LIBS"
 -LIBS="-lreadline  $LIBS"
 +LIBS="-l$readlinelib  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 3839 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
+ cat > conftest.$ac_ext <<EOF
+-#line 3752 "configure"
++#line 3799 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3753,13 +3800,13 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char readline();
 +char tilde_expand();
-+
-+int main() {
+ 
+ int main() {
+-readline()
 +tilde_expand()
-+; return 0; }
-+EOF
-+if { (eval echo configure:3850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3774,69 +3821,24 @@ LIBS="$ac_save_LIBS"
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
 +  cat >> confdefs.h <<\EOF
 +#define HAVE_TILDE_EXPAND 1
-+EOF
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
+ EOF
+ 
+-  LIBS="-lreadline $LIBS"
+-
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "$ac_cv_lib_readline_readline" = yes; then
+-  for ac_hdr in readline/readline.h
+-do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3795: checking for $ac_hdr" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 3800 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+- 
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-done
+-
+-  echo $ac_n "checking for add_history in -lreadline""... $ac_c" 1>&6
+-echo "configure:3832: checking for add_history in -lreadline" >&5
+-ac_lib_var=`echo readline'_'add_history | sed 'y%./+-%__p_%'`
 +  echo $ac_n "checking for add_history in -l$readlinelib""... $ac_c" 1>&6
-+echo "configure:3874: checking for add_history in -l$readlinelib" >&5
++echo "configure:3834: checking for add_history in -l$readlinelib" >&5
 +ac_lib_var=`echo $readlinelib'_'add_history | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lreadline  $LIBS"
 +LIBS="-l$readlinelib  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 3840 "configure"
-+#line 3882 "configure"
++#line 3842 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3909,7 +3951,7 @@ fi
+@@ -3909,7 +3911,7 @@ fi
  fi
  
    if test "$history" = yes; then
@@ -213,7 +344,16 @@ $NetBSD: patch-ak,v 1.2 2003/07/29 13:21:57 jmmv Exp $
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -5573,7 +5615,7 @@ fi
+@@ -4367,7 +4369,7 @@ else
+ int main() {
+ 
+ /* Ultrix mips cc rejects this.  */
+-typedef int charset[2]; const charset x = {0,0};
++typedef int charset[2]; const charset x;
+ /* SunOS 4.1.1 cc rejects this.  */
+ char const *const *ccp;
+ char **p;
+@@ -5573,7 +5575,7 @@ fi
  
  
  if test "$ac_cv_prog_gcc" = yes; then
diff --git a/math/pspp/patches/patch-ao b/math/pspp/patches/patch-ao
new file mode 100644
index 00000000000..08fc7701540
--- /dev/null
+++ b/math/pspp/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2004/03/08 21:13:55 seb Exp $
+
+--- src/pfm-write.c.orig	2000-01-03 03:32:06.000000000 +0000
++++ src/pfm-write.c
+@@ -30,7 +30,7 @@
+ #include "avl.h"
+ #include "error.h"
+ #include "file-handle.h"
+-#include "gmp/gmp.h"
++#include <gmp.h>
+ #include "magic.h"
+ #include "pfm.h"
+ #include "str.h"