From nobody Sun Feb 25 17:20:17 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TjVr14cD1z5BdMq; Sun, 25 Feb 2024 17:20:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjVr12KnRz4vZ4; Sun, 25 Feb 2024 17:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708881617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUQfzAOF7HHtg8X1eHV7FrsSF0qdXbgjwucN7FCThjo=; b=pePYrg5HxZ2esxzL1t6oxewBv7bgBQBd/I/ZRwZDD2gVfaEMm8hdSlyrvyYqwKIvnjUiy6 1Zj4ucqs+R2Yh9h5zLuP8tyZ0hPRpXwFREI6EVSH6Oen/awhlrFlzcEP7uUIkp72iLlVdU A/MtJdVOcFcFimmEPM8U9SdcyEaKqOrw740MREZ2Zq6nNMV+2pFFcjXdMmG+2SknHsNsfV DZqc/e8puIshBfh4G9ONf1sGRIRln/XkqlT4elWNuF32165S66ahghfB2e7enJvX0AglFO geeChLYSmYHVAQYRgWY3ppQpPV9y3L/xg8HKTbizYJiGfNoIYCU3K2Ms4S56yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708881617; a=rsa-sha256; cv=none; b=YR2Ikn0Vz/pNI9mLJbZY5krpiCTLbjyyHMyxpOvaS2cMSj3sa7DXZ+Jo+BlpJ361fUmcDD fP7HNdtyf4GbBct/+1hdG9wan2t7RI2L56viCUT6kI8VNOTaXSe6N+nViCH3xZ9a2NKNt5 wnvs1wyD/zUb6LoEcUccA5WcaZYux9T31zFW1h8lKOOLXmee5o9BKiOehUaiPXeyT9z15C +oDWi+m9+pKbrSnj91DDehfD2S4ol2DpK92mw3GdaYVTfaxArhalp4CPxDOe3JzmZKb8rW wQzm6fSwN9yiD2pEXh6WK6Jx0hocmPcJ+eoGsNbbjGlJL5bz/qM4oe5WfjSu7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708881617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUQfzAOF7HHtg8X1eHV7FrsSF0qdXbgjwucN7FCThjo=; b=JKy0SciFLyYEIVGY3kNNcuxUiEQOuSAxwR4Gw+5BgFiV5UGwY+0ROC1+4TbtvMgdEG0Hlc EYMHnlHz1ZnZRlr6pZfXvHTKYi3K/snj/kCr2iTfXIP8+JbUrkBdryxzUMhBKzBdWKLB0l lCBNfLLaltMlxoI+gBz7JrcuISFPxIxmTmgLM15zSVYXpUscr3TsMbLsvw7583AgfbVo8/ HoNAO6kDUIl8uNVeVxsvLb1vTdnQxpxEoXW2iu5qHAiswP8Um48XIZv+Ww9+tQ1COYKf+D SZMLlikb6mBLBYmJF/fjnYFfCMXin2CaXbyp7x58z6VjjL6Q1+YOzwnFcOqjLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TjVr118v7zsjr; Sun, 25 Feb 2024 17:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41PHKHQt058017; Sun, 25 Feb 2024 17:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PHKHC1058009; Sun, 25 Feb 2024 17:20:17 GMT (envelope-from git) Date: Sun, 25 Feb 2024 17:20:17 GMT Message-Id: <202402251720.41PHKHC1058009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 284408d4d2e3 - main - sysutils/facter: Moved man to share/man List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 284408d4d2e340ee27aedecef3941fd48f532628 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=284408d4d2e340ee27aedecef3941fd48f532628 commit 284408d4d2e340ee27aedecef3941fd48f532628 Author: Muhammad Moinur Rahman AuthorDate: 2024-02-25 16:50:44 +0000 Commit: Muhammad Moinur Rahman 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 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