diff --git a/srcpkgs/facter/patches/shared_cpp_hcon.patch b/srcpkgs/facter/patches/shared_cpp_hcon.patch deleted file mode 100644 index 37c475697a9..00000000000 --- a/srcpkgs/facter/patches/shared_cpp_hcon.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/archlinux/svntogit-community/blob/0eb74a76c976a7fd638fbf6cd1c3b47be3dccd8b/trunk/shared_cpp_hcon.patch - -diff --git a/cmake/FindCPPHOCON.cmake b/cmake/FindCPPHOCON.cmake -index 00ba8bd..0df0a51 100644 ---- a/cmake/FindCPPHOCON.cmake -+++ b/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 "libcpp-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") diff --git a/srcpkgs/facter/patches/std-array.patch b/srcpkgs/facter/patches/std-array.patch deleted file mode 100644 index 396f32699d4..00000000000 --- a/srcpkgs/facter/patches/std-array.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: facter-3.14.16/lib/src/facts/glib/load_average_resolver.cc -=================================================================== ---- facter-3.14.16.orig/lib/src/facts/glib/load_average_resolver.cc -+++ facter-3.14.16/lib/src/facts/glib/load_average_resolver.cc -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - - #ifdef __sun - #include diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index b2294d6a8cf..29f71d27aed 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,37 +1,11 @@ # Template file for 'facter' pkgname=facter -version=3.14.16 -revision=8 -build_style=cmake -configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include - -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib" -hostmakedepends="ruby-devel" -makedepends="boost-devel cpp-hocon-devel leatherman-devel libblkid-devel libcurl-devel - ruby-devel yaml-cpp-devel" -depends="net-tools ruby" +version=4.10.0 +revision=1 +build_style=gem +depends="ruby-hocon ruby-thor-1.2" short_desc="Collect and display system facts" maintainer="Orphaned " license="Apache-2.0" homepage="https://puppet.com/docs/puppet/latest/facter.html" -distfiles="https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=196c69b1ae325dbf11f68025eb12b9c53c054bee9112bd4f3e2ece8c5fe76571 - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - mips*) vsed -i lib/CMakeLists.txt -e'/add_subdirectory(tests)/d' ;; - esac -} - -post_build() { - # fixup vendor_ruby usr/lib{32,64} install path to always use usr/lib - vsed -i build/lib/cmake_install.cmake -e "s;lib\(32\|64\);lib;g" -} - -facter-devel_package() { - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - } -} +checksum=b78a213b9160cded7ab93e7c47c003c618ebd49c6eca549d09a068e27a30a59d