Include a patch for the generated configure script so that we don't have

to depend on auto* tools at build-time.  This fixes pkg/14916 by Brook
Milligan <brook@biology.nmsu.edu>.

3 files changed, 159 insertions, 7 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index dbcedea133d..dd7ca3b7f8a 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/10/24 22:11:04 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/12/11 22:35:07 jlam Exp $
 
 DISTNAME=		R-1.3.0
 CATEGORIES=		math
@@ -19,8 +19,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.R-project.org/
 COMMENT=		Statistical language for data analysis and graphics
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-
 USE_BUILDLINK_ONLY=	# defined
 USE_X11=		# defined
 USE_PERL5=		# defined
@@ -80,9 +78,6 @@ INSTALL_DIRS=		${R_LIBDIR}
 REPLACE_BUILDLINK=	src/scripts/R.fe
 REPLACE_BUILDLINK_SED=	-e "s|${BUILDLINK_DIR}/|${LOCALBASE}/|g"
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf --force
-
 # Generate the PLIST dynamically as it changes in each version only in a
 # specific subtree.  This will make maintaining this package a little easier
 # when updating.
diff --git a/math/R/distinfo b/math/R/distinfo
index 60a2e7c7ec5..c6e2c9f47ac 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/07/23 13:14:44 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/12/11 22:35:07 jlam Exp $
 
 SHA1 (R-1.3.0.tgz) = 9e59492f0f2bb5dbf3e324e9f92046882aa9f344
 Size (R-1.3.0.tgz) = 4423354 bytes
 SHA1 (patch-aa) = 588b85346a942f54bf27de4115ee2d7bbec270cb
 SHA1 (patch-ab) = ef2832039b92a5c5c323b7c61039f2ccd3d067e8
+SHA1 (patch-ac) = 823c7877dfefdf80d163f975a56eaee6500d432f
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
new file mode 100644
index 00000000000..509cbb25374
--- /dev/null
+++ b/math/R/patches/patch-ac
@@ -0,0 +1,156 @@
+$NetBSD: patch-ac,v 1.3 2001/12/11 22:35:44 jlam Exp $
+
+--- configure.orig	Fri Jun 22 06:32:10 2001
++++ configure	Tue Dec 11 17:10:49 2001
+@@ -6973,6 +6973,9 @@
+ 
+ extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
+ 
++int MAIN_ () { return 0; }
++int MAIN__ () { return 0; }
++
+ int main () {
+   int a[3] = {17, 237, 2000000000}, b[2], res = 0;
+   double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
+@@ -7676,16 +7679,16 @@
+ fi
+ 
+ fi
+-echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
+-echo "configure:7681: checking for main in -lncurses" >&5
+-ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
++echo "configure:7684: checking for main in -ltermcap" >&5
++ac_lib_var=`echo termcap'_'main | 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"
++LIBS="-ltermcap  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7689 "configure"
++#line 7692 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -7707,26 +7710,26 @@
+ 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 ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lncurses $LIBS"
++  LIBS="-ltermcap $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
+-echo "configure:7722: checking for main in -ltermcap" >&5
+-ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6
++echo "configure:7725: checking for main in -ltermlib" >&5
++ac_lib_var=`echo termlib'_'main | 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="-ltermlib  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7730 "configure"
++#line 7733 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -7748,26 +7751,26 @@
+ 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 termcap | sed -e 's/^a-zA-Z0-9_/_/g' \
++    ac_tr_lib=HAVE_LIB`echo termlib | sed -e 's/^a-zA-Z0-9_/_/g' \
+     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-ltermcap $LIBS"
++  LIBS="-ltermlib $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6
+-echo "configure:7763: checking for main in -ltermlib" >&5
+-ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
++echo "configure:7766: checking for main in -lncurses" >&5
++ac_lib_var=`echo ncurses'_'main | 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="-ltermlib  $LIBS"
++LIBS="-lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7771 "configure"
++#line 7774 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -7789,13 +7792,13 @@
+ 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 termlib | sed -e 's/^a-zA-Z0-9_/_/g' \
++    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/^a-zA-Z0-9_/_/g' \
+     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+   cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-ltermlib $LIBS"
++  LIBS="-lncurses $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+@@ -10587,10 +10590,9 @@
+   ac_cv_sizeof_long=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10591 "configure"
++#line 10594 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-#include <sys/types.h>
+ main()
+ {
+   FILE *f=fopen("conftestval", "w");
+@@ -10627,10 +10629,9 @@
+   ac_cv_sizeof_long_long=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10631 "configure"
++#line 10633 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-#include <sys/types.h>
+ main()
+ {
+   FILE *f=fopen("conftestval", "w");
+@@ -10667,10 +10668,9 @@
+   ac_cv_sizeof_long_double=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10671 "configure"
++#line 10672 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-#include <sys/types.h>
+ main()
+ {
+   FILE *f=fopen("conftestval", "w");