Re: nvi with split system ncurses

[adr <adr%SDF.ORG@localhost>]

Something went wrong with the other mail...

Index: patches/patch-dist_configure.in
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nvi/patches/patch-dist_configure.in,v
retrieving revision 1.2
diff -u -r1.2 patch-dist_configure.in
--- patches/patch-dist_configure.in	20 Sep 2013 14:50:49 -0000	1.2
+++ patches/patch-dist_configure.in	13 Jun 2020 23:43:59 -0000
@@ -16,7 +16,24 @@

  dnl Configure setup.
  AC_PROG_INSTALL()
-@@ -601,6 +601,7 @@ AC_CHECK_FUNCS(select)
+@@ -525,13 +525,15 @@ dnl 	[
+ 	    CURSHEADER=curses.h
+ 	    if test "$vi_cv_curses" = "ncurses"; then
+ 		AC_CHECK_HEADERS(ncurses.h, [CURSHEADER=ncurses.h])
++		AC_CHECK_LIB(ncurses, cbreak, ,[CURSLIBS="-ltinfo "], )
+ 	    fi
+ 	    if test "$vi_cv_curses" = "ncursesw"; then
+ 		AC_CHECK_HEADERS(ncursesw/ncurses.h, 
+ 			[CURSHEADER=ncursesw/ncurses.h])
++		AC_CHECK_LIB(ncursesw, cbreak, ,[CURSLIBS="-ltinfow "], )
+ 	    fi
+ 	    vi_programs="vi $vi_programs"
+-	    CURSLIBS="-l$vi_cv_curses"
++	    CURSLIBS+="-l$vi_cv_curses"
+ 	else
+ 	    AC_MSG_WARN([*** No suitable curses library found.])
+ 	    if test "$vi_programs"X = X; then
+@@ -601,6 +603,7 @@ AC_CHECK_FUNCS(select)
  AC_CHECK_FUNCS(setenv, [need_env=no], [need_env=yes])
  AC_CHECK_FUNCS(strsep, [need_strsep=no], [need_strsep=yes])
  AC_CHECK_FUNCS(unsetenv,, [need_env=yes])
@@ -24,7 +41,7 @@

  AC_FUNC_MMAP
  AC_FUNC_VFORK
-@@ -787,6 +788,8 @@ if test "$vi_cv_gettimeofday" = broken;
+@@ -787,6 +790,8 @@ if test "$vi_cv_gettimeofday" = broken;
  fi
  AC_MSG_RESULT($vi_cv_gettimeofday)