From owner-svn-soc-all@FreeBSD.ORG  Wed Aug 17 07:38:49 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 5CE161065673
	for <svn-soc-all@FreeBSD.org>; Wed, 17 Aug 2011 07:38:47 +0000 (UTC)
	(envelope-from zy@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Wed, 17 Aug 2011 07:38:47 +0000
Date: Wed, 17 Aug 2011 07:38:47 +0000
From: zy@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110817073847.5CE161065673@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r225179 - soc2011/zy/nvi-iconv/head/rescue/rescue
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Aug 2011 07:38:49 -0000

Author: zy
Date: Wed Aug 17 07:38:47 2011
New Revision: 225179
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=225179

Log:
  Links to libcursesw if WITH_ICONV is defined.
   - Fixes vi (multibyte nvi2) in rescue.

Modified:
  soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile

Modified: soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile
==============================================================================
--- soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile	Wed Aug 17 06:21:34 2011	(r225178)
+++ soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile	Wed Aug 17 07:38:47 2011	(r225179)
@@ -52,7 +52,7 @@
 CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
 	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lutil
 CRUNCH_BUILDTOOLS+= bin/sh
 
 # Additional options for specific programs
@@ -118,7 +118,13 @@
 # crunchgen does not like C++ programs; this should be fixed someday
 # CRUNCH_PROGS+= devd
 
-CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
+.ifdef (WITH_ICONV)
+CRUNCH_LIBS+= -lcursesw
+.else
+CRUNCH_LIBS+= -lcurses -ltermcap
+.endif
+
+CRUNCH_LIBS+= -lalias -lcam -ldevstat -lipsec
 .if ${MK_IPX} != "no"
 CRUNCH_LIBS+= -lipx
 .endif