diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index f142cb9c9827..b834570b48df 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,56 +1,56 @@ PORTNAME= facter PORTVERSION= 3.14.24 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES?= sysutils MASTER_SITES= https://downloads.puppetlabs.com/facter/ MAINTAINER= puppet@FreeBSD.org COMMENT= Cross-platform library for retrieving facts from OS WWW= https://puppetlabs.com/facter LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_DragonFly= DragonFly is not supported upstream 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 PLIST_SUB= PORTVERSION="${PORTVERSION}" USES= cmake:noninja compiler:c++11-lib cpe ruby ssl CPE_VENDOR= puppet USE_LDCONFIG= yes 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 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 ${CONFIGURE_WRKSRC} && ${MAKE_CMD} test .include diff --git a/sysutils/facter/files/patch-CMakeLists.txt b/sysutils/facter/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..246444a7eb8c --- /dev/null +++ b/sysutils/facter/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2024-02-25 16:48:32 UTC ++++ CMakeLists.txt +@@ -233,7 +233,7 @@ add_test(NAME "facter\\ smoke" COMMAND facter) + add_test(NAME "facter\\ smoke" COMMAND facter) + + # Install the man page +-if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD|FreeBSD") ++if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") + set(MANDIR man/man8/) + else() + set(MANDIR share/man/man8/) diff --git a/sysutils/facter/files/patch-lib_CMakeLists.txt b/sysutils/facter/files/patch-lib_CMakeLists.txt index dd3c706e3e65..c7d071bcee19 100644 --- a/sysutils/facter/files/patch-lib_CMakeLists.txt +++ b/sysutils/facter/files/patch-lib_CMakeLists.txt @@ -1,19 +1,19 @@ ---- lib/CMakeLists.txt.orig 2018-12-17 18:05:06 UTC +--- lib/CMakeLists.txt.orig 2022-07-18 15:00:22 UTC +++ lib/CMakeLists.txt -@@ -306,12 +306,15 @@ endif() +@@ -331,12 +331,15 @@ include_directories( # Set include directories include_directories( + BEFORE + ${LEATHERMAN_INCLUDE_DIRS} +) +include_directories( inc ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${YAMLCPP_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} - ${LEATHERMAN_INCLUDE_DIRS} ${CPPHOCON_INCLUDE_DIRS} ) diff --git a/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc index 3f9379f1de01..c56303c3c21f 100644 --- a/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc +++ b/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc @@ -1,10 +1,10 @@ https://bugs.gentoo.org/840116 ---- lib/src/facts/glib/load_average_resolver.cc +--- lib/src/facts/glib/load_average_resolver.cc.orig 2022-07-18 15:00:22 UTC +++ lib/src/facts/glib/load_average_resolver.cc @@ -1,5 +1,6 @@ #include #include +#include #include #ifdef __sun diff --git a/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc b/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc index 96b7dec427bf..b82d683ccf5e 100644 --- a/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc +++ b/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc @@ -1,11 +1,11 @@ ---- lib/src/facts/posix/collection.cc.orig 2017-09-12 21:43:10 UTC +--- lib/src/facts/posix/collection.cc.orig 2022-07-18 15:00:22 UTC +++ lib/src/facts/posix/collection.cc -@@ -29,6 +29,8 @@ namespace facter { namespace facts { +@@ -25,6 +25,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; } diff --git a/sysutils/facter/pkg-plist b/sysutils/facter/pkg-plist index c021f0d7a145..a3869e173c0e 100644 --- a/sysutils/facter/pkg-plist +++ b/sysutils/facter/pkg-plist @@ -1,29 +1,29 @@ bin/facter include/facter/cwrapper.hpp include/facter/export.h include/facter/facts/array_value.hpp include/facter/facts/base_resolver.hpp include/facter/facts/collection.hpp include/facter/facts/external/resolver.hpp include/facter/facts/external_resolvers_factory.hpp include/facter/facts/fact.hpp include/facter/facts/map_value.hpp include/facter/facts/os.hpp include/facter/facts/os_family.hpp include/facter/facts/resolver.hpp include/facter/facts/scalar_value.hpp include/facter/facts/value.hpp include/facter/facts/vm.hpp include/facter/logging/logging.hpp include/facter/ruby/ruby.hpp include/facter/util/aws_token.hpp include/facter/util/cli.hpp include/facter/util/config.hpp include/facter/util/string.hpp include/facter/version.h lib/libfacter.so lib/libfacter.so.%%PORTVERSION%% lib/ruby/gems/%%RUBY_VER%%/specifications/facter-%%PORTVERSION%%.gemspec lib/ruby/vendor_ruby/facter.rb -man/man8/facter.8.gz +share/man/man8/facter.8.gz %%FACTER_JAVA%%lib/ruby/vendor_ruby/facter.jar