Index: head/sysutils/facter/Makefile =================================================================== --- head/sysutils/facter/Makefile (revision 450360) +++ head/sysutils/facter/Makefile (revision 450361) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= facter -PORTVERSION= 3.8.0 -PORTREVISION?= 2 +PORTVERSION= 3.9.0 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= http://downloads.puppetlabs.com/facter/ MAINTAINER= puppet@FreeBSD.org COMMENT= Cross-platform library for retrieving facts from OS LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake .if !defined(PKGNAMEPREFIX) BROKEN_DragonFly= DragonFly is not supported upstream BROKEN_powerpc64= fails to compile: collection.cc: 'stoi' was not declared in this scope CONFLICTS_INSTALL= rubygem-facter-2* LIB_DEPENDS= libboost_system.so:devel/boost-libs \ liblibcpp-hocon.so:devel/cpp-hocon \ libleatherman_locale.so:devel/leatherman \ libyaml-cpp.so:devel/yaml-cpp PLIST_SUB+= PORTVERSION="${PORTVERSION}" USE_LDCONFIG= yes USE_RUBY= yes USES+= compiler:c++11-lib ssl CMAKE_ARGS+= -DMAN_PATH=${MANPREFIX}/man post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/lib/src/facts/posix/collection.cc \ ${WRKSRC}/lib/src/util/config/posix/config.cc test: build cd ${WRKSRC}/lib && bundle install --path vendor - cd ${WRKSRC} && ninja test + cd ${WRKSRC} && ${MAKE_CMD} test .elif ${PKGNAMEPREFIX} == java- LIB_DEPENDS= libfacter.so:sysutils/facter ALL_TARGET= facter-jruby USE_JAVA= yes JAVA_BUILD= yes CMAKE_ARGS+= -DJAVA_HOME=${JAVA_HOME} # Ignore sysutils/facter's pkg-plist by providing a non-existent file PLIST= ${WRKDIR}/no-plist PLIST_FILES= ${PREFIX}/lib/ruby/vendor_ruby/facter.jar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby cd ${WRKSRC} && ${INSTALL_DATA} lib/facter.jar ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby .endif .include .if !defined(PKGNAMEPREFIX) && ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++} BROKEN= Build with system libstdc++ is unsupported .endif .include Index: head/sysutils/facter/distinfo =================================================================== --- head/sysutils/facter/distinfo (revision 450360) +++ head/sysutils/facter/distinfo (revision 450361) @@ -1,3 +1,3 @@ -TIMESTAMP = 1503037047 -SHA256 (facter-3.8.0.tar.gz) = a53f1646614f774cc150e7edcca40ef2512650e1cbafdcaf0f2739969c6b59c6 -SIZE (facter-3.8.0.tar.gz) = 334042 +TIMESTAMP = 1505384928 +SHA256 (facter-3.9.0.tar.gz) = 5c80cae72e7d9457b8a0d28dfc3c030d7dbe5dc38c5418aa8f237928290ac9f7 +SIZE (facter-3.9.0.tar.gz) = 335644 Index: head/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake =================================================================== --- head/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake (revision 450360) +++ head/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake (revision 450361) @@ -1,9 +1,9 @@ ---- cmake/FindCPPHOCON.cmake.orig 2017-06-27 17:42:22 UTC +--- cmake/FindCPPHOCON.cmake.orig 2017-09-12 21:43:10 UTC +++ cmake/FindCPPHOCON.cmake @@ -1,5 +1,5 @@ include(FindDependency) -find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a") +find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "liblibcpp-hocon.so") include(FeatureSummary) set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon") Index: head/sysutils/facter/files/patch-lib_CMakeLists.txt =================================================================== --- head/sysutils/facter/files/patch-lib_CMakeLists.txt (revision 450360) +++ head/sysutils/facter/files/patch-lib_CMakeLists.txt (revision 450361) @@ -1,14 +1,14 @@ ---- lib/CMakeLists.txt.orig 2017-07-18 18:49:09 UTC +--- lib/CMakeLists.txt.orig 2017-09-12 21:43:10 UTC +++ lib/CMakeLists.txt -@@ -203,6 +203,11 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES " - "src/facts/freebsd/dmi_resolver.cc" - "src/facts/freebsd/networking_resolver.cc" +@@ -189,6 +189,11 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES " + "src/facts/linux/processor_resolver.cc" + "src/facts/linux/virtualization_resolver.cc" "src/util/bsd/scoped_ifaddrs.cc" + "src/facts/freebsd/virtualization_resolver.cc" + "src/facts/freebsd/memory_resolver.cc" + "src/facts/freebsd/zfs_resolver.cc" + "src/facts/freebsd/zpool_resolver.cc" + "src/facts/freebsd/operating_system_resolver.cc" ) - elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") - set(LIBFACTER_PLATFORM_SOURCES + set(LIBFACTER_PLATFORM_LIBRARIES + ${BLKID_LIBRARIES} Index: head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc =================================================================== --- head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc (revision 450360) +++ head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc (revision 450361) @@ -1,11 +1,11 @@ ---- lib/src/facts/posix/cache.cc.orig +--- lib/src/facts/posix/cache.cc.orig 2017-09-12 21:43:10 UTC +++ lib/src/facts/posix/cache.cc @@ -3,7 +3,7 @@ namespace facter { namespace facts { namespace cache { std::string fact_cache_location() { - return "/opt/puppetlabs/facter/cache/cached_facts/"; + return "/var/facter/cache/cached_facts/"; } }}} // namespace facter::facts::cache Index: head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc =================================================================== --- head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc (revision 450360) +++ head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc (revision 450361) @@ -1,11 +1,11 @@ ---- lib/src/facts/posix/collection.cc.orig +--- lib/src/facts/posix/collection.cc.orig 2017-09-12 21:43:10 UTC +++ lib/src/facts/posix/collection.cc -@@ -29,6 +29,8 @@ +@@ -29,6 +29,8 @@ namespace facter { namespace facts { directories.emplace_back("/opt/puppetlabs/facter/facts.d"); directories.emplace_back("/etc/facter/facts.d"); directories.emplace_back("/etc/puppetlabs/facter/facts.d"); + directories.emplace_back("%%PREFIX%%/etc/facter/facts.d"); + directories.emplace_back("%%PREFIX%%/etc/puppetlabs/facter/facts.d"); } return directories; } Index: head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc =================================================================== --- head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc (revision 450360) +++ head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc (revision 450361) @@ -1,10 +1,10 @@ ---- lib/src/util/config/posix/config.cc.orig +--- lib/src/util/config/posix/config.cc.orig 2017-09-12 21:43:10 UTC +++ lib/src/util/config/posix/config.cc -@@ -7,6 +7,6 @@ +@@ -7,6 +7,6 @@ namespace facter { namespace util { name } std::string default_config_location() { - return "/etc/puppetlabs/facter/facter.conf"; + return "%%PREFIX%%/etc/facter/facter.conf"; } }}} // namespace facter::util::config