From owner-svn-ports-head@freebsd.org Thu Oct 1 22:55:27 2015 Return-Path: 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 68833A0EB0A; Thu, 1 Oct 2015 22:55:27 +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 407921D5D; Thu, 1 Oct 2015 22:55:27 +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 t91MtR4D043866; Thu, 1 Oct 2015 22:55:27 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t91MtQWN043864; Thu, 1 Oct 2015 22:55:26 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201510012255.t91MtQWN043864@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Thu, 1 Oct 2015 22:55:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398395 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2015 22:55:27 -0000 Author: truckman Date: Thu Oct 1 22:55:26 2015 New Revision: 398395 URL: https://svnweb.freebsd.org/changeset/ports/398395 Log: Add a separate option to allow iconv support to be disabled, but leave it enabled by default to avoid a regression in the science/orthanc unit tests. Set USES=iconv whenever ICONV is enabled, rather than only when ICU is disabled. With the default option settings, this will bring in converters/iconv on FreeBSD 9, which will unbreak the failing unit tests in science/orthanc. At least one of the ICONV or ICU options must be set. Fix PR 198658 in the default case by setting BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX} whenever iconv support is enabled, not only when ICU is disabled as was done in r398027 (before that was broken by r398060 and fixed again in the ports framework by r398258). Pet portlint. PR: 198658 Modified: head/devel/boost-libs/Makefile head/devel/boost-libs/pkg-descr Modified: head/devel/boost-libs/Makefile ============================================================================== --- head/devel/boost-libs/Makefile Thu Oct 1 22:30:32 2015 (r398394) +++ head/devel/boost-libs/Makefile Thu Oct 1 22:55:26 2015 (r398395) @@ -2,21 +2,26 @@ # $FreeBSD$ PORTNAME= boost-libs -COMMENT= Free portable C++ libraries (without Boost.Python) +PORTREVISION= 9 -PORTREVISION= 8 +COMMENT= Free portable C++ libraries (without Boost.Python) BUILD_DEPENDS+= bjam:${PORTSDIR}/devel/boost-jam -OPTIONS_DEFINE= VERBOSE_BUILD DEBUG ICU OPTIMIZED_CFLAGS -OPTIONS_DEFAULT= ICU +OPTIONS_DEFINE= VERBOSE_BUILD DEBUG OPTIMIZED_CFLAGS +OPTIONS_MULTI= LOCALE +OPTIONS_MULTI_LOCALE= ICONV ICU +OPTIONS_DEFAULT= ICONV ICU VERBOSE_BUILD_DESC= Show compiler messages -ICU_DESC= Boost.Regex with ICU unicode support +ICONV_DESC= Boost.Locale with iconv encoding support +ICU_DESC= Boost.Regex/Locale with ICU unicode support +ICONV_USES= iconv +ICONV_VARS= BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX} +ICONV_VARS_OFF= BJAM_ARGS+=boost.locale.iconv=off ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu ICU_VARS= BJAM_ARGS+=-sICU_PATH=${LOCALBASE} -ICU_USES_OFF= iconv -ICU_VARS_OFF= BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX} +ICU_VARS_OFF= BJAM_ARGS+=boost.locale.icu=off .include "${.CURDIR}/../boost-all/common.mk" Modified: head/devel/boost-libs/pkg-descr ============================================================================== --- head/devel/boost-libs/pkg-descr Thu Oct 1 22:30:32 2015 (r398394) +++ head/devel/boost-libs/pkg-descr Thu Oct 1 22:55:26 2015 (r398395) @@ -16,4 +16,4 @@ libraries are proposed for TR2. NOTE: This package does not contain Boost.Python, it's in 'devel/boost-python-libs'. -WWW: http://www.boost.org/ +WWW: http://www.boost.org/