git: 284408d4d2e3 - main - sysutils/facter: Moved man to share/man
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 25 Feb 2024 17:20:17 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=284408d4d2e340ee27aedecef3941fd48f532628 commit 284408d4d2e340ee27aedecef3941fd48f532628 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-02-25 16:50:44 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-02-25 17:19:03 +0000 sysutils/facter: Moved man to share/man Approved by: portmgr (blanket) --- sysutils/facter/Makefile | 2 +- sysutils/facter/files/patch-CMakeLists.txt | 11 +++++++++++ sysutils/facter/files/patch-lib_CMakeLists.txt | 4 ++-- .../files/patch-lib_src_facts_glib_load__average__resolver.cc | 2 +- sysutils/facter/files/patch-lib_src_facts_posix_collection.cc | 4 ++-- sysutils/facter/pkg-plist | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index f142cb9c9827..b834570b48df 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,6 +1,6 @@ PORTNAME= facter PORTVERSION= 3.14.24 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES?= sysutils MASTER_SITES= https://downloads.puppetlabs.com/facter/ 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,6 +1,6 @@ ---- 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( 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,5 +1,5 @@ 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 <internal/facts/glib/load_average_resolver.hpp> 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,6 +1,6 @@ ---- 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"); 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 @@ -25,5 +25,5 @@ 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