From owner-svn-ports-head@freebsd.org Sun Jan 13 03:33:13 2019
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:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F2A01487078;
Sun, 13 Jan 2019 03:33:13 +0000 (UTC)
(envelope-from romain@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id A8DBE8926D;
Sun, 13 Jan 2019 03:33:12 +0000 (UTC)
(envelope-from romain@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F34EDA52;
Sun, 13 Jan 2019 03:33:12 +0000 (UTC)
(envelope-from romain@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0D3XC9G079756;
Sun, 13 Jan 2019 03:33:12 GMT (envelope-from romain@FreeBSD.org)
Received: (from romain@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0D3XC8k079755;
Sun, 13 Jan 2019 03:33:12 GMT (envelope-from romain@FreeBSD.org)
Message-Id: <201901130333.x0D3XC8k079755@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: romain set sender to
romain@FreeBSD.org using -f
From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org>
Date: Sun, 13 Jan 2019 03:33:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r490112 - head/sysutils/facter/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: romain
X-SVN-Commit-Paths: head/sysutils/facter/files
X-SVN-Commit-Revision: 490112
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: A8DBE8926D
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.98 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.99)[-0.986,0];
NEURAL_HAM_LONG(-1.00)[-0.999,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
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, 13 Jan 2019 03:33:13 -0000
Author: romain
Date: Sun Jan 13 03:33:12 2019
New Revision: 490112
URL: https://svnweb.freebsd.org/changeset/ports/490112
Log:
Fix build when rapidjson is installed (again)
PR: 233426
Submitted by: vladislav.movchan@gmail.com
Modified:
head/sysutils/facter/files/patch-lib_CMakeLists.txt
Modified: head/sysutils/facter/files/patch-lib_CMakeLists.txt
==============================================================================
--- head/sysutils/facter/files/patch-lib_CMakeLists.txt Sun Jan 13 03:23:46 2019 (r490111)
+++ head/sysutils/facter/files/patch-lib_CMakeLists.txt Sun Jan 13 03:33:12 2019 (r490112)
@@ -1,10 +1,14 @@
--- lib/CMakeLists.txt.orig 2018-12-17 18:05:06 UTC
+++ lib/CMakeLists.txt
-@@ -307,11 +307,11 @@ endif()
+@@ -306,12 +306,15 @@ endif()
+
# Set include directories
include_directories(
- inc
++ BEFORE
+ ${LEATHERMAN_INCLUDE_DIRS}
++)
++include_directories(
+ inc
${Boost_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIRS}
${YAMLCPP_INCLUDE_DIRS}