From ea5a037d1f7b17969046da0165700dcc51245472 Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Thu, 17 Jul 2014 18:24:34 +0000
Subject: Replace all uses of libncurses and libtermcap with their wide
 character variants.  This allows usable file system images (i.e. those with
 both a shell and an editor) to be created with only one copy of the curses
 library.

Exp-run:	antoine
PR:		189842
Discussed with:	bapt
Sponsored by:	DARPA, AFRL
---
 usr.bin/vi/Makefile | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'usr.bin/vi')

diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index e3ee3f6e..6ed95ee 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -36,14 +36,9 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
 DPADD=		${LIBUTIL}
 LDADD=		-lutil
 
-.if defined(RESCUE) || defined(RELEASE_CRUNCH)
-DPADD+=		${LIBNCURSES}
-LDADD+=		-lncurses
-.else
 CFLAGS+=	-DUSE_WIDECHAR
 DPADD+=		${LIBNCURSESW}
 LDADD+=		-lncursesw
-.endif
 
 .if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
 CFLAGS+=	-DUSE_ICONV
-- 
cgit v1.1