svn commit: r407617 - in head/editors/nvi-m17n: . files

[John Marino]

Author: marino
Date: Sun Jan 31 12:11:03 2016
New Revision: 407617
URL: https://svnweb.freebsd.org/changeset/ports/407617

Log:
  editors/nvi-m17n: document ncurses requirement (USES+=ncurses)
  
  Also modify configure to ensure it's linking with ncurses and not
  termlib or older version of curses.

Modified:
  head/editors/nvi-m17n/Makefile
  head/editors/nvi-m17n/files/patch-configure

Modified: head/editors/nvi-m17n/Makefile
==============================================================================
--- head/editors/nvi-m17n/Makefile	Sun Jan 31 11:59:45 2016	(r407616)
+++ head/editors/nvi-m17n/Makefile	Sun Jan 31 12:11:03 2016	(r407617)
@@ -22,7 +22,7 @@ LICENSE=	BSD4CLAUSE
 PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0 -f
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 
-USES=		perl5
+USES=		ncurses perl5
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"' \

Modified: head/editors/nvi-m17n/files/patch-configure
==============================================================================
--- head/editors/nvi-m17n/files/patch-configure	Sun Jan 31 11:59:45 2016	(r407616)
+++ head/editors/nvi-m17n/files/patch-configure	Sun Jan 31 12:11:03 2016	(r407617)
@@ -1,4 +1,4 @@
---- configure.orig	2014-01-15 15:12:44.000000000 +0000
+--- configure.orig	2016-01-31 11:55:44 UTC
 +++ configure
 @@ -1805,10 +1805,8 @@ if test "$vi_cv_canna" = "yes"; then
  		case "$host_os" in
@@ -13,3 +13,19 @@
  		*)
  			vi_cannapath="/usr/local/canna";;
  		esac
+@@ -2155,13 +2153,13 @@ fi
+ #	[  --disable-curses        DON'T use the nvi-provided curses routines.],
+ #	[vi_cv_curses="other curses"], [vi_cv_curses="bundled curses"])
+ #AC_MSG_RESULT($vi_cv_curses)
+-vi_cv_curses="bundled curses"
++vi_cv_curses="other curses"
+ case "$vi_cv_curses" in
+ "bundled curses")
+ 	CPPFLAGS="-I\$(srcdir)/curses $CPPFLAGS"
+ 	cobjs="\$(COBJS)";;
+ "other curses")
+-	LIBS="-lcurses $LIBS";;
++	LIBS="-lncurses $LIBS";;
+ esac
+ 
+ echo $ac_n "checking for sys/mman.h""... $ac_c" 1>&6