MAIN__ need to be undefined during some of the fortran configure tests

or valid programs will fail with link problems.

2 files changed, 25 insertions, 44 deletions

diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index ccf3e711bf9..05c68880c75 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 00:13:14 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2001/04/19 00:25:23 dmcmahill Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
-SHA1 (patch-aa) = 92a3ee9859884768036cee30dee0370f8eec3e9d
+SHA1 (patch-aa) = fbd416adf8cbd6c36863bba413d768e781af6936
 SHA1 (patch-ab) = 99b395668fd8a48ec03e47f2d24613128c0289da
 SHA1 (patch-ac) = b565c7694d7ea3af80744081d0a2cb6306eb9c68
 SHA1 (patch-ad) = c73ef38aacd83cf97bd1ca31276de3edfbcff611
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index 0545c9dee49..948df2c16dd 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/19 00:25:23 dmcmahill Exp $
 
---- configure.orig	Fri Jan  5 18:37:51 2001
-+++ configure	Mon Mar 26 16:05:52 2001
-@@ -798,9 +798,9 @@
- ### Allow the user disable support for command line editing using GNU
+--- configure.orig	Fri Jan  5 12:37:51 2001
++++ configure	Wed Apr 18 20:22:03 2001
+@@ -799,7 +799,7 @@
  ### readline.
  
 -READLINE_DIR=readline
@@ -13,27 +12,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 +LIBREADLINE='${LOCALBASE}/lib/libreadline.so'
  # Check whether --enable-readline or --disable-readline was given.
  if test "${enable_readline+set}" = set; then
-   enableval="$enable_readline"
-@@ -820,7 +820,7 @@
- 
+@@ -821,5 +821,5 @@
  
  
 -LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
 +LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.a'
  
  
- ### Make it possible to have Octave's array and matrix classes do bounds
-@@ -2434,7 +2434,7 @@
-   echo "$ac_t""defining F77 to be $F77" 1>&6
+@@ -2435,5 +2435,5 @@
  elif $use_g77; then
    if test "$with_g77" = yes; then
 -    F77=g77
 +    F77=${CC}
    else
      F77="$with_g77"
-   fi
-@@ -2724,13 +2724,8 @@
- 
+@@ -2725,11 +2725,6 @@
  
  
 -if test "$cross_compiling" = yes; then
@@ -46,9 +39,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 -  fi
  else
    echo $ac_n "checking ${F77-f77}/f2c compatibility""... $ac_c" 1>&6
- echo "configure:2737: checking ${F77-f77}/f2c compatibility" >&5
-@@ -2864,10 +2859,8 @@
- %.c : %.f
+@@ -2776,5 +2771,5 @@
+ #if defined (sun)
+ int MAIN_ () { return 0; }
+-#elif defined (linux) && defined (__ELF__)
++#elif (defined (linux) && defined (__ELF__)) || defined (__NetBSD) 
+ int MAIN__ () { return 0; }
+ #endif
+@@ -2865,8 +2860,6 @@
  
  %.o : %.f
 -	$(FC) -c $(ALL_FFLAGS) -o $@ $<
@@ -58,9 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 -	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
  
  EOF
- elif $have_f2c; then
-@@ -3046,11 +3039,11 @@
- fi
+@@ -3047,9 +3040,9 @@
  
  FORTRAN_MAIN_FLAG=
 -case "$canonical_host_type" in
@@ -75,27 +71,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 +fi
  if test -n "$FORTRAN_MAIN_FLAG"; then
    echo "$ac_t""defining FORTRAN_MAIN_FLAG to be $FORTRAN_MAIN_FLAG" 1>&6
- fi
-@@ -5065,7 +5058,7 @@
- 
+@@ -5066,5 +5059,5 @@
  GLOB_DIR=glob
  LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o'
 -GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob'
 +GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob -I${LOCALBASE}/include'
  if test "$ac_cv_header_fnmatch_h" = yes \
    && test "$ac_cv_header_glob_h" = yes; then
-   cat > conftest.$ac_ext <<EOF
-@@ -6225,7 +6218,7 @@
- 
+@@ -6226,5 +6219,5 @@
  
  TERMLIBS=""
 -for termlib in ncurses curses termcap terminfo termlib; do
 +for termlib in curses termcap termlib; do
    echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
  echo "configure:6231: checking for tputs in -l${termlib}" >&5
- ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
-@@ -6276,13 +6269,11 @@
- 
+@@ -6277,11 +6270,9 @@
  
  if test "$ac_cv_lib_termcap_tputs" = yes \
 -    || test "$ac_cv_lib_terminfo_tputs" = yes \
@@ -108,9 +98,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 +  warn_termlibs="I couldn't find -ltermcap, -lcurses, or -ltermlib!"
    echo "configure: warning: $warn_termlibs" 1>&2
  fi
- 
-@@ -6989,19 +6980,19 @@
-     cat << \EOF > $bsd_gcc_kluge_targets_frag
+@@ -6990,17 +6981,17 @@
  
  lex.o: lex.cc 
 -	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
@@ -133,27 +121,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 +	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
  
  EOF
-   ;;
-@@ -7270,7 +7261,7 @@
- # ./install, which can be erroneously created by make from ./install.sh.
+@@ -7271,5 +7262,5 @@
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
  echo "configure:7273: checking for a BSD compatible install" >&5
 -if test -z "$INSTALL"; then
 +if true; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7914,7 +7905,7 @@
- done
+@@ -7915,5 +7906,5 @@
  
  ac_given_srcdir=$srcdir
 -ac_given_INSTALL="$INSTALL"
 +ac_given_INSTALL="${INSTALL}"
  
  trap 'rm -fr `echo "Makefile octMakefile Makeconf install-octave \
-   test/Makefile dlfcn/Makefile \
-@@ -8153,10 +8144,6 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+@@ -8154,8 +8145,4 @@
    esac
  
 -  case "$ac_given_INSTALL" in
@@ -162,4 +144,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
 -  esac
  
    echo creating "$ac_file"
-   rm -f "$ac_file"