Index: head/sysutils/facter/Makefile
===================================================================
--- head/sysutils/facter/Makefile	(revision 490026)
+++ head/sysutils/facter/Makefile	(revision 490027)
@@ -1,64 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	facter
 PORTVERSION=	3.12.2
 CATEGORIES?=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/facter/
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Cross-platform library for retrieving facts from OS
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_DragonFly=	DragonFly is not supported upstream
 BROKEN_powerpc64=	fails to compile: collection.cc: 'stoi' was not declared in this scope
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libleatherman_locale.so:devel/leatherman \
 		liblibcpp-hocon.so:devel/cpp-hocon \
 		libyaml-cpp.so:devel/yaml-cpp
 
 CONFLICTS_INSTALL=	rubygem-facter-2*
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 USES=		cmake:noninja compiler:c++11-lib ssl
 USE_LDCONFIG=	yes
 USE_RUBY=	yes
 CMAKE_ARGS+=	-DMAN_PATH=${MANPREFIX}/man
 CMAKE_OFF=	ENABLE_CXX_WERROR
 
 OPTIONS_DEFINE=	FACTER_JAVA
 FACTER_JAVA_DESC=	Build with Java bindings for puppetserver
 FACTER_JAVA_USE=	java=yes
 FACTER_JAVA_VARS=	JAVA_BUILD=yes
 FACTER_JAVA_CMAKE_ON=	-DJAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFAULT=	FACTER_JAVA
 
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/lib/src/facts/posix/collection.cc \
 		${WRKSRC}/lib/src/util/config/posix/config.cc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications
 	${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${DISTNAME}.gemspec
 
 test: build
 	cd ${WRKSRC}/lib && bundle install --path vendor
-	cd ${WRKSRC} && ${MAKE_CMD} test
+	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++}
 BROKEN=		Build with system libstdc++ is unsupported
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/facter/files/patch-lib_CMakeLists.txt
===================================================================
--- head/sysutils/facter/files/patch-lib_CMakeLists.txt	(nonexistent)
+++ head/sysutils/facter/files/patch-lib_CMakeLists.txt	(revision 490027)
@@ -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}
+ )
+ 

Property changes on: head/sysutils/facter/files/patch-lib_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property