From owner-svn-src-head@FreeBSD.ORG  Sun Aug 11 21:46:07 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2B8CB7D7;
 Sun, 11 Aug 2013 21:46:07 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 18D382917;
 Sun, 11 Aug 2013 21:46:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7BLk6js045308;
 Sun, 11 Aug 2013 21:46:06 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7BLk6Hp045307;
 Sun, 11 Aug 2013 21:46:06 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201308112146.r7BLk6Hp045307@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 11 Aug 2013 21:46:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254230 - head/usr.bin/vi/catalog
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Aug 2013 21:46:07 -0000

Author: peter
Date: Sun Aug 11 21:46:06 2013
New Revision: 254230
URL: http://svnweb.freebsd.org/changeset/base/254230

Log:
  Don't build the UTF-8 version of the catalogs without iconv enabled.
  
  Pointy-hat to:	peter (don't do things at 4am!)

Modified:
  head/usr.bin/vi/catalog/Makefile

Modified: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile	Sun Aug 11 21:21:02 2013	(r254229)
+++ head/usr.bin/vi/catalog/Makefile	Sun Aug 11 21:46:06 2013	(r254230)
@@ -5,13 +5,6 @@
 
 V=	${.CURDIR}/../../../contrib/nvi
 
-.if ${MK_ICONV} == yes
-UCAT=	dutch english french german polish spanish swedish
-.else
-# turn on WITH_ICONV=yes if you want UTF-8
-UCAT=
-.endif
-
 CAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
 	uk_UA.KOI8-U zh_CN.GB2312
 
@@ -23,7 +16,11 @@ all:		dump
 
 build-tools:	dump
 
-.for c in ${UCAT}
+# If we have iconv available, convert the ISO-8859 encoded files
+# to UTF-8 as well.
+.if ${MK_ICONV} == yes
+
+.for c in dutch english french german polish spanish swedish
 CAT+=	${c}.UTF-8
 CLEANFILES+=${c}.UTF-8.base
 $c.UTF-8.base:	${c}.base
@@ -45,6 +42,8 @@ uk_UA.UTF-8.base:	uk_UA.KOI8-U.base
 ru_RU.UTF-8.base:	ru_RU.KOI8-R.base
 	iconv -f KOI8-R -t UTF-8 ${.ALLSRC} > ${.TARGET}
 
+.endif
+
 .for c in ${CAT}
 ${c}:	${c}.base 
 	@echo "... $c";							\