From owner-svn-ports-all@freebsd.org Sat Jan 12 06:39:43 2019 Return-Path: Delivered-To: svn-ports-all@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 4225B1488033; Sat, 12 Jan 2019 06:39:43 +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 D44A9728BE; Sat, 12 Jan 2019 06:39:42 +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 C333E27766; Sat, 12 Jan 2019 06:39:42 +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 x0C6dgdT012253; Sat, 12 Jan 2019 06:39:42 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0C6dgnY012251; Sat, 12 Jan 2019 06:39:42 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201901120639.x0C6dgnY012251@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?= Date: Sat, 12 Jan 2019 06:39:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490027 - in head/sysutils/facter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/facter: . files X-SVN-Commit-Revision: 490027 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D44A9728BE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.937,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2019 06:39:43 -0000 Author: romain Date: Sat Jan 12 06:39:42 2019 New Revision: 490027 URL: https://svnweb.freebsd.org/changeset/ports/490027 Log: Fix build when devel/rapidjson is installed devel/leatherman include an old version of RapidJSON that is not compatible with what devel/rapidjson install. Reorder includes so that the version included with devel/leatherman is found before the one of devel/rapidjson because it is what is wanted. While here, fix `make test`. No need to bump PORTREVISION. PR: 233426 Reported by: vladislav.movchan@gmail.com Added: head/sysutils/facter/files/patch-lib_CMakeLists.txt (contents, props changed) Modified: head/sysutils/facter/Makefile Modified: head/sysutils/facter/Makefile ============================================================================== --- head/sysutils/facter/Makefile Sat Jan 12 05:47:56 2019 (r490026) +++ head/sysutils/facter/Makefile Sat Jan 12 06:39:42 2019 (r490027) @@ -53,7 +53,7 @@ post-install: test: build cd ${WRKSRC}/lib && bundle install --path vendor - cd ${WRKSRC} && ${MAKE_CMD} test + cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} test .include Added: head/sysutils/facter/files/patch-lib_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/facter/files/patch-lib_CMakeLists.txt Sat Jan 12 06:39:42 2019 (r490027) @@ -0,0 +1,15 @@ +--- lib/CMakeLists.txt.orig 2018-12-17 18:05:06 UTC ++++ lib/CMakeLists.txt +@@ -307,11 +307,11 @@ endif() + # Set include directories + include_directories( + inc ++ ${LEATHERMAN_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIRS} + ${YAMLCPP_INCLUDE_DIRS} + ${CURL_INCLUDE_DIRS} +- ${LEATHERMAN_INCLUDE_DIRS} + ${CPPHOCON_INCLUDE_DIRS} + ) +