From owner-svn-ports-head@freebsd.org  Sun Sep 27 08:34:00 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76BC7A08923;
 Sun, 27 Sep 2015 08:34:00 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 676B0E33;
 Sun, 27 Sep 2015 08:34:00 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8R8Y0vP072759;
 Sun, 27 Sep 2015 08:34:00 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8R8Y0lL072758;
 Sun, 27 Sep 2015 08:34:00 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201509270834.t8R8Y0lL072758@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Sun, 27 Sep 2015 08:34:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398027 - head/devel/boost-libs
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Sep 2015 08:34:00 -0000

Author: truckman
Date: Sun Sep 27 08:33:59 2015
New Revision: 398027
URL: https://svnweb.freebsd.org/changeset/ports/398027

Log:
  Unbreak the build when the ICU option is unset on FreeBSD 9.3.
  
  USES must be set before including bsd.port.pre.mk, which is included
  by boost-all/compiled.mk.  The easiest fix for the conditional
  USES+=iconv being too late seems to be to use an option helper.
  For consistency use an option helper for the LIB_DEPENDS.
  
  PR:		203285

Modified:
  head/devel/boost-libs/Makefile

Modified: head/devel/boost-libs/Makefile
==============================================================================
--- head/devel/boost-libs/Makefile	Sun Sep 27 08:31:28 2015	(r398026)
+++ head/devel/boost-libs/Makefile	Sun Sep 27 08:33:59 2015	(r398027)
@@ -13,6 +13,9 @@ OPTIONS_DEFAULT=	ICU
 VERBOSE_BUILD_DESC=	Show compiler messages
 ICU_DESC=		Boost.Regex with ICU unicode support
 
+ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_USES_OFF=		iconv
+
 .include "${.CURDIR}/../boost-all/common.mk"
 
 .include "${.CURDIR}/../boost-all/compiled.mk"
@@ -28,11 +31,9 @@ PLIST_SUB+=	COROUTINE="" CONTEXT="" LOCA
 .endif
 
 .if ${PORT_OPTIONS:MICU}
-LIB_DEPENDS+=	libicuuc.so:${PORTSDIR}/devel/icu
 BJAM_ARGS+=	-sICU_PATH=${LOCALBASE}
 .else
-USES+=		iconv
-BJAM_ARGS+=	-sICONV_PATH=${LOCALBASE}
+BJAM_ARGS+=	-sICONV_PATH=${ICONV_PREFIX}
 .endif
 
 do-build: