diff --git a/Formula/h/h2o.rb b/Formula/h/h2o.rb index 4b6476eb7d5a2..fd8dc527c7ca3 100644 --- a/Formula/h/h2o.rb +++ b/Formula/h/h2o.rb @@ -20,7 +20,7 @@ class H2o < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "openssl@3" uses_from_macos "zlib" @@ -81,11 +81,8 @@ def caveats test do port = free_port (testpath/"h2o.conf").write conf_example(port) - fork do - exec "#{bin}/h2o -c #{testpath}/h2o.conf" - end + spawn "#{bin}/h2o -c #{testpath}/h2o.conf" sleep 2 - assert_match "Welcome to H2O", shell_output("curl localhost:#{port}") end end diff --git a/Formula/h/hackrf.rb b/Formula/h/hackrf.rb index 60492cf33a877..4235ac38bfce9 100644 --- a/Formula/h/hackrf.rb +++ b/Formula/h/hackrf.rb @@ -23,22 +23,16 @@ class Hackrf < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "fftw" depends_on "libusb" def install - cd "host" do - args = std_cmake_args + args = OS.linux? ? ["-DUDEV_RULES_GROUP=plugdev", "-DUDEV_RULES_PATH=#{lib}/udev/rules.d"] : [] - if OS.linux? - args << "-DUDEV_RULES_GROUP=plugdev" - args << "-DUDEV_RULES_PATH=#{lib}/udev/rules.d" - end - - system "cmake", ".", *args - system "make", "install" - end + system "cmake", "-S", "host", "-B", "build", *args, *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" pkgshare.install "firmware-bin/" end diff --git a/Formula/h/hamlib.rb b/Formula/h/hamlib.rb index bd87f0e56dfa5..613d576f27d17 100644 --- a/Formula/h/hamlib.rb +++ b/Formula/h/hamlib.rb @@ -21,7 +21,7 @@ class Hamlib < Formula depends_on "autoconf" => :build depends_on "automake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libtool" depends_on "libusb" depends_on "libusb-compat" @@ -30,8 +30,6 @@ class Hamlib < Formula depends_on "readline" end - fails_with gcc: "5" - def install system "./bootstrap" if build.head? system "./configure", "--disable-silent-rules", *std_configure_args diff --git a/Formula/h/handbrake.rb b/Formula/h/handbrake.rb index 0c41d49265ae0..a70acd6d717f8 100644 --- a/Formula/h/handbrake.rb +++ b/Formula/h/handbrake.rb @@ -23,7 +23,7 @@ class Handbrake < Formula depends_on "meson" => :build depends_on "nasm" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "yasm" => :build uses_from_macos "m4" => :build diff --git a/Formula/h/harfbuzz.rb b/Formula/h/harfbuzz.rb index 2ec34fa8d5dca..9063bdce8997d 100644 --- a/Formula/h/harfbuzz.rb +++ b/Formula/h/harfbuzz.rb @@ -18,7 +18,7 @@ class Harfbuzz < Formula depends_on "gobject-introspection" => :build depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "python@3.13" => [:build, :test] depends_on "pygobject3" => :test depends_on "cairo" @@ -46,7 +46,7 @@ def install -Dtests=disabled ] - system "meson", "setup", "build", *std_meson_args, *args + system "meson", "setup", "build", *args, *std_meson_args system "meson", "compile", "-C", "build", "--verbose" system "meson", "install", "-C", "build" end diff --git a/Formula/h/haxe.rb b/Formula/h/haxe.rb index 28bf2f8e028cc..d0fa5b3e3a4d6 100644 --- a/Formula/h/haxe.rb +++ b/Formula/h/haxe.rb @@ -38,7 +38,7 @@ class Haxe < Formula depends_on "cmake" => :build depends_on "ocaml" => :build depends_on "opam" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "mbedtls" depends_on "neko" depends_on "pcre2" diff --git a/Formula/h/hcxtools.rb b/Formula/h/hcxtools.rb index 37294dd801822..30afc01326f78 100644 --- a/Formula/h/hcxtools.rb +++ b/Formula/h/hcxtools.rb @@ -15,7 +15,7 @@ class Hcxtools < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "cfa435ef982fe30b6e3ea26c1d736882a4799c0ee035bccb5cf20bdca00740dd" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "openssl@3" uses_from_macos "curl" diff --git a/Formula/h/hdf5-mpi.rb b/Formula/h/hdf5-mpi.rb index 96da06b193f03..44dfb76515a01 100644 --- a/Formula/h/hdf5-mpi.rb +++ b/Formula/h/hdf5-mpi.rb @@ -23,7 +23,7 @@ class Hdf5Mpi < Formula depends_on "gcc" # for gfortran depends_on "libaec" depends_on "open-mpi" - depends_on "pkg-config" + depends_on "pkgconf" uses_from_macos "zlib" diff --git a/Formula/h/hdf5.rb b/Formula/h/hdf5.rb index aa25df3f2ef01..30d56c10cbb8e 100644 --- a/Formula/h/hdf5.rb +++ b/Formula/h/hdf5.rb @@ -26,7 +26,7 @@ class Hdf5 < Formula depends_on "cmake" => :build depends_on "gcc" # for gfortran depends_on "libaec" - depends_on "pkg-config" + depends_on "pkgconf" uses_from_macos "zlib" diff --git a/Formula/h/hdt.rb b/Formula/h/hdt.rb index 5dce303b5a804..c0e32dc7ddce7 100644 --- a/Formula/h/hdt.rb +++ b/Formula/h/hdt.rb @@ -24,7 +24,7 @@ class Hdt < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "serd" uses_from_macos "zlib" @@ -55,7 +55,7 @@ def install EOS system bin/"rdf2hdt", test_file, "test.hdt" - assert_predicate testpath/"test.hdt", :exist? + assert_path_exists testpath/"test.hdt" system bin/"hdtInfo", "test.hdt" end end diff --git a/Formula/h/healpix.rb b/Formula/h/healpix.rb index 56b1a4087bcc3..1aeb15d95a2f8 100644 --- a/Formula/h/healpix.rb +++ b/Formula/h/healpix.rb @@ -18,7 +18,7 @@ class Healpix < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "cfitsio" def install diff --git a/Formula/h/heimdal.rb b/Formula/h/heimdal.rb index 46c2ce3fd26cb..2fe861cf371ff 100644 --- a/Formula/h/heimdal.rb +++ b/Formula/h/heimdal.rb @@ -38,7 +38,7 @@ class Heimdal < Formula uses_from_macos "libxcrypt" on_linux do - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build end resource "JSON" do diff --git a/Formula/h/hfstospell.rb b/Formula/h/hfstospell.rb index a04bec04c5ccd..117ee705330fe 100644 --- a/Formula/h/hfstospell.rb +++ b/Formula/h/hfstospell.rb @@ -23,7 +23,7 @@ class Hfstospell < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "icu4c@76" depends_on "libarchive" diff --git a/Formula/h/hidapi.rb b/Formula/h/hidapi.rb index deebc6f661b2c..c932cf7a1f430 100644 --- a/Formula/h/hidapi.rb +++ b/Formula/h/hidapi.rb @@ -20,7 +20,7 @@ class Hidapi < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build on_linux do depends_on "libusb" diff --git a/Formula/h/highlight.rb b/Formula/h/highlight.rb index 85c3d078164ab..764d1ff2051c2 100644 --- a/Formula/h/highlight.rb +++ b/Formula/h/highlight.rb @@ -21,11 +21,9 @@ class Highlight < Formula end depends_on "boost" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "lua" - fails_with gcc: "5" # needs C++17 - def install conf_dir = etc/"highlight/" # highlight needs a final / for conf_dir system "make", "PREFIX=#{prefix}", "conf_dir=#{conf_dir}" diff --git a/Formula/h/highs.rb b/Formula/h/highs.rb index 10f6c8368a993..424b86f9846c5 100644 --- a/Formula/h/highs.rb +++ b/Formula/h/highs.rb @@ -23,14 +23,14 @@ class Highs < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build uses_from_macos "zlib" def install system "cmake", "-S", ".", "-B", "build", - *std_cmake_args, - "-DCMAKE_INSTALL_RPATH=#{rpath}" + "-DCMAKE_INSTALL_RPATH=#{rpath}", + *std_cmake_args system "cmake", "--build", "build" system "cmake", "--install", "build" pkgshare.install "check", "examples"