get rid of autoconf dependency by patching configure. also, fix

configure.in patch

4 files changed, 260 insertions, 10 deletions

diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index f4678628ea3..c2348d5526e 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/03 22:16:51 jtb Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/02 20:56:34 dillo Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -11,8 +11,6 @@ COMMENT=		Matrix oriented, interactive programming environment
 DEPENDS+=		boehm-gc>=5.3:../../devel/boehm-gc
 DEPENDS+=		readline>=4.0:../../devel/readline
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-
 GNU_CONFIGURE=		yes
 USE_FORTRAN=		yes
 
@@ -57,9 +55,6 @@ CONFIGURE_ARGS+=	--enable-SUPERLU
 CONFIGURE_ENV+=		PAGER=${RLAB_PAGER}
 .endif
 
-pre-configure:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)
-
 post-install:
 .if (${RLAB_PLOT_PKG} == "pgraf")
 	${INSTALL_DATA} ${PGRAF_PREFIX}/share/examples/pgraf/pgraf.r \
diff --git a/math/rlab/distinfo b/math/rlab/distinfo
index 05effc2afa6..1c6f1610841 100644
--- a/math/rlab/distinfo
+++ b/math/rlab/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:44 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/10/02 20:56:34 dillo Exp $
 
 SHA1 (rlab-2.1.05.tar.gz) = 5b465b45ac1225c89f8375fc0945c485c0b1fa4b
 Size (rlab-2.1.05.tar.gz) = 2767728 bytes
-SHA1 (patch-aa) = d9225f401879e9eee9b11856c9cdef0dbf9a469e
+SHA1 (patch-aa) = 6b177a66de9262c4f6fcd6fcd48bc897f3a7bbe2
 SHA1 (patch-ab) = e1270ade1b430b67f8264eba76ef9bd220db7d9f
 SHA1 (patch-ac) = 44004dd04c217494dc556fe678c087b4a5a15cc2
 SHA1 (patch-ad) = 595ef1b4f1ebc21fbdf6b3fec61a9380f61936ca
@@ -17,3 +17,4 @@ SHA1 (patch-al) = 824c825d0ab47328ed43127a0680067c666a7ac0
 SHA1 (patch-am) = efa48be1acecfee52d091d01eb68b07c72a8d0e2
 SHA1 (patch-an) = b489b9b02bd1a717f1312e88c827dbdbbca5b487
 SHA1 (patch-ao) = 203a9ba6e25a7e7d7e2aff60979f66e619c2160c
+SHA1 (patch-ap) = a96d358d5f44f92ea718abfadc74b88d9f0ae93e
diff --git a/math/rlab/patches/patch-aa b/math/rlab/patches/patch-aa
index 8076aee4de5..7d9a2b1ecd8 100644
--- a/math/rlab/patches/patch-aa
+++ b/math/rlab/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2001/02/11 23:06:03 jtb Exp $
+$NetBSD: patch-aa,v 1.5 2002/10/02 20:56:35 dillo Exp $
 
 --- configure.in.orig	Fri Dec 17 16:01:06 1999
 +++ configure.in
@@ -119,7 +119,7 @@ $NetBSD: patch-aa,v 1.4 2001/02/11 23:06:03 jtb Exp $
 +             AC_DEFINE(HAVE_GC)
 +	     LIBGC="-L$withval/lib -lgc"
 +             IGC="-I$withval/include -I./gc"
-+])
++)
 +
  dnl ------------------------------------------------------------------
  
diff --git a/math/rlab/patches/patch-ap b/math/rlab/patches/patch-ap
new file mode 100644
index 00000000000..2725b50b520
--- /dev/null
+++ b/math/rlab/patches/patch-ap
@@ -0,0 +1,254 @@
+$NetBSD: patch-ap,v 1.1 2002/10/02 20:56:35 dillo Exp $
+
+--- configure.orig	Wed Oct  2 21:50:59 2002
++++ configure
+@@ -38,7 +38,7 @@ ac_help="$ac_help
+ ac_help="$ac_help
+    --with-pgplot           use PGplot"
+ ac_help="$ac_help
+-  --disable-GC            disable use of the Garbage-Collector"
++  --with-GC            use the Garbage-Collector"
+ 
+ # Initialize some variables set by options.
+ # The variables have the same names as the options, with
+@@ -1950,7 +1950,7 @@ echo "configure:1947: checking C -> Fort
+   ar r libfitest_f.a fitest_f.o
+   OLD_LIBS="$LIBS"
+   LIBS="-L. -lfitest_f"  
+-  CFLAGS="-DUSE_UPPER"
++  CFLAGS="$CFLAGS -DUSE_UPPER"
+ 
+ 
+   if test "$cross_compiling" = yes; then
+@@ -1982,7 +1982,7 @@ fi
+ 
+ 
+  if test "$F77CONV" = "no" ; then 
+-  CFLAGS="-DUSE_F2C" 
++  CFLAGS="$CFLAGS -DUSE_F2C" 
+ if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+@@ -2013,7 +2013,7 @@ fi
+  fi 
+ 
+  if test "$F77CONV" = "no" ; then 
+-  CFLAGS="-DUSE_LOWER" 
++  CFLAGS="$CFLAGS -DUSE_LOWER" 
+ if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+@@ -2044,7 +2044,7 @@ fi
+  fi 
+ 
+  if test "$F77CONV" = "no" ; then 
+-  CFLAGS="-DUSE_FRONT" 
++  CFLAGS="$CFLAGS -DUSE_FRONT" 
+ if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+@@ -3926,7 +3926,7 @@ fi
+ if test -z "$x_libraries" ; then
+   xlibdir=""
+ else
+-  xlibdir="-L$x_libraries"
++  xlibdir="-Wl,-R$x_libraries -L$x_libraries"
+ fi
+ 
+ X11LIB="$xlibdir -lX11"
+@@ -4025,41 +4025,6 @@ fi
+ 
+ 
+ 
+-if test -n "$PLOT_PROG" ; then
+-   # Extract the first word of "gnuplot", so it can be a program name with args.
+-set dummy gnuplot; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4033: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_PLOT_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$PLOT_PROG"; then
+-  ac_cv_prog_PLOT_PROG="$PLOT_PROG" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_PLOT_PROG="gnuplot"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_PLOT_PROG" && ac_cv_prog_PLOT_PROG="nothing"
+-fi
+-fi
+-PLOT_PROG="$ac_cv_prog_PLOT_PROG"
+-if test -n "$PLOT_PROG"; then
+-  echo "$ac_t""$PLOT_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+- 
+-fi
+-
+-
+-
+ # Check whether --with-plplot or --without-plplot was given.
+ if test "${with_plplot+set}" = set; then
+   withval="$with_plplot"
+@@ -4073,11 +4038,15 @@ if test "${with_plplot+set}" = set; then
+     exit 1;
+   fi
+ 
++  cat >> confdefs.h <<\EOF
++#define HAVE_RLAB_PLPLOT 1
++EOF
++
+   PLOT_PROG="plplot"
+-  PLIB_DIR=-L$withval
++  PLIB_DIR=-L$withval/lib
+   PLOT_DIR="$withval"
+-  PLIB_INC_DIR="-I$withval"
+-  PLIBS="-L$withval -lplplotdX $X11LIB"
++  PLIB_INC_DIR=-I$withval/include
++  PLIBS=`plplot_linkage`
+ 
+ fi
+ 
+@@ -4098,41 +4067,6 @@ fi
+ 
+ 
+ 
+-if test "$PLOT_PROG" = "plotmtv" ; then
+-   # Extract the first word of "plotmtv", so it can be a program name with args.
+-set dummy plotmtv; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4106: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_PLOT_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$PLOT_PROG"; then
+-  ac_cv_prog_PLOT_PROG="$PLOT_PROG" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_PLOT_PROG="plotmtv"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_PLOT_PROG" && ac_cv_prog_PLOT_PROG="nothing"
+-fi
+-fi
+-PLOT_PROG="$ac_cv_prog_PLOT_PROG"
+-if test -n "$PLOT_PROG"; then
+-  echo "$ac_t""$PLOT_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+- 
+-fi
+-
+-
+-
+ # Check whether --with-pgraf or --without-pgraf was given.
+ if test "${with_pgraf+set}" = set; then
+   withval="$with_pgraf"
+@@ -4148,41 +4082,6 @@ fi
+ 
+ 
+ 
+-if test "$PLOT_PROG" = "pgraf" ; then
+-   # Extract the first word of "pgraf", so it can be a program name with args.
+-set dummy pgraf; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4156: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_PLOT_PROG'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$PLOT_PROG"; then
+-  ac_cv_prog_PLOT_PROG="$PLOT_PROG" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_PLOT_PROG="pgraf"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_PLOT_PROG" && ac_cv_prog_PLOT_PROG="nothing"
+-fi
+-fi
+-PLOT_PROG="$ac_cv_prog_PLOT_PROG"
+-if test -n "$PLOT_PROG"; then
+-  echo "$ac_t""$PLOT_PROG" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+- 
+-fi
+-
+-
+-
+ # Check whether --with-pgplot or --without-pgplot was given.
+ if test "${with_pgplot+set}" = set; then
+   withval="$with_pgplot"
+@@ -4209,27 +4108,22 @@ fi
+ 
+ 
+ 
+-# Check whether --enable-GC or --disable-GC was given.
+-if test "${enable_GC+set}" = set; then
+-  enableval="$enable_GC"
+-  if test "$enableval" = "yes" ; then
+-               cat >> confdefs.h <<\EOF
+-#define HAVE_GC 1
+-EOF
+- LIBGC="../gc/gc.a"; 
+-                                   IGC="-I./gc"
+-             fi
+-else
++# Check whether --with-GC or --without-GC was given.
++if test "${with_GC+set}" = set; then
++  withval="$with_GC"
+   cat >> confdefs.h <<\EOF
+ #define HAVE_GC 1
+ EOF
+- LIBGC="./gc/gc.a";
+-                                 IGC="-I./gc"
++
++	     LIBGC="-L$withval/lib -lgc"
++             IGC="-I$withval/include -I./gc"
++
+ fi
+ 
+ 
++
+ cat > conftest.$ac_ext <<EOF
+-#line 4233 "configure"
++#line 4127 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+@@ -4526,12 +4421,13 @@ s%@CC@%$CC%g
+ s%@CPP@%$CPP%g
+ s%@PAGER@%$PAGER%g
+ s%@ALLOCA@%$ALLOCA%g
+ s%@PLOT_PROG@%$PLOT_PROG%g
+ s%@BUILD_DIR@%$BUILD_DIR%g
+ s%@SYSTEM@%$SYSTEM%g
+ s%@VER@%$VER%g
+ s%@F2C@%$F2C%g
+ s%@INSTALL@%$INSTALL%g
++s%@LDLAGS@%$LDLAGS%g
+ s%@EXFLAGS@%$EXFLAGS%g
+ s%@C_SH_FLAGS@%$C_SH_FLAGS%g
+ s%@F_SH_FLAGS@%$F_SH_FLAGS%g