This pkg doesn't actually use Curses, so build with libtermcap instead.

2 files changed, 30 insertions, 12 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 14403e72e5f..3fae25c412d 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/09 16:08:58 bad Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/23 04:19:25 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.13
@@ -14,7 +14,6 @@ HOMEPAGE=	http://www.che.wisc.edu/octave/
 
 BUILD_DEPENDS+=	tex:../../print/teTeX
 BUILD_DEPENDS+=	dvips:../../print/teTeX
-DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 DEPENDS+=	gnuplot-3.7:../../graphics/gnuplot
 
 GNU_CONFIGURE=		yes
@@ -26,10 +25,6 @@ LDFLAGS+=		-L${PREFIX}/lib
 INFO_FILES=	liboctave.info octave.info
 LIBOCTAVE_INFO=	liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
 
-post-extract:
-	${MKDIR} ${WRKDIR}/include
-	${LN} -s ${PREFIX}/include/ncurses.h ${WRKDIR}/include
-
 post-install:
 	${MKDIR} ${PREFIX}/share/octave/2.0.13/doc
 .for file in ${LIBOCTAVE_INFO}
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index 144f4004695..32980240398 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,8 +1,31 @@
-$NetBSD: patch-aa,v 1.2 1998/11/25 23:58:25 tron Exp $
+$NetBSD: patch-aa,v 1.3 1999/04/23 04:19:25 mycroft Exp $
 
---- configure.orig	Thu May 21 20:16:26 1998
-+++ configure	Fri Nov 20 17:02:39 1998
-@@ -6100,7 +6100,6 @@
+--- configure.orig	Thu May 21 14:16:26 1998
++++ configure	Thu Apr 22 20:30:57 1999
+@@ -5098,7 +5098,7 @@
+ 
+ 
+ TERMLIBS=""
+-for termlib in ncurses curses termcap terminfo termlib; do
++for termlib in termcap terminfo termlib; do
+   echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
+ echo "configure:5104: checking for tputs in -l${termlib}" >&5
+ ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
+@@ -5150,12 +5150,10 @@
+ 
+ if test "$ac_cv_lib_termcap_tputs" = yes \
+   || test "$ac_cv_lib_terminfo_tputs" = yes \
+-  || test "$ac_cv_lib_ncurses_tputs" = yes \
+-  || test "$ac_cv_lib_curses_tputs" = yes \
+   || test "$ac_cv_lib_termlib_tputs" = yes; then
+   true
+ else
+-  warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!"
++  warn_termlibs="I couldn't find -ltermcap, -lterminfo, or -ltermlib!"
+   echo "configure: warning: $warn_termlibs" 1>&2
+ fi
+ 
+@@ -6100,7 +6098,6 @@
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
  echo "configure:6103: checking for a BSD compatible install" >&5
@@ -10,7 +33,7 @@ $NetBSD: patch-aa,v 1.2 1998/11/25 23:58:25 tron Exp $
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6139,7 +6138,6 @@
+@@ -6139,7 +6136,6 @@
      # removed, or if the path is relative.
      INSTALL="$ac_install_sh"
    fi
@@ -18,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 1998/11/25 23:58:25 tron Exp $
  echo "$ac_t""$INSTALL" 1>&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -7126,10 +7124,7 @@
+@@ -7126,10 +7122,7 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac