From 4cfdd48b161748e6aae7eb08323837928a10397a Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:31:05 -0500 Subject: [PATCH 01/13] xcb-proto: migrate to `pkgconf` --- Formula/x/xcb-proto.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/x/xcb-proto.rb b/Formula/x/xcb-proto.rb index 87390baf14908..b13250985ad16 100644 --- a/Formula/x/xcb-proto.rb +++ b/Formula/x/xcb-proto.rb @@ -9,7 +9,7 @@ class XcbProto < Formula sha256 cellar: :any_skip_relocation, all: "e85c8d57ca43017674ecd1dadce614289e8790768087a73ceef981e65310003e" end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "python@3.12" => [:build, :test] def python3 @@ -32,10 +32,10 @@ def install test do assert_match "#{share}/xcb", shell_output("pkg-config --variable=xcbincludedir xcb-proto").chomp - system python3, "-c", <<~EOS + system python3, "-c", <<~PYTHON import collections output = collections.defaultdict(int) from xcbgen import xtypes - EOS + PYTHON end end From cde1cac7fff41ecb60c6e2e6cce3f9ef4b27bec2 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:31:28 -0500 Subject: [PATCH 02/13] xorgrgb: migrate to `pkgconf` --- Formula/x/xorgrgb.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/x/xorgrgb.rb b/Formula/x/xorgrgb.rb index 11b782c266e74..c7229d94c6105 100644 --- a/Formula/x/xorgrgb.rb +++ b/Formula/x/xorgrgb.rb @@ -19,20 +19,18 @@ class Xorgrgb < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "e6c3eca82aa9624b8b521d9d0e5cec68b9391538717c36c4d438edc75bb0085f" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "util-macros" => :build depends_on "xorgproto" => :build def install args = %W[ - --prefix=#{prefix} --sysconfdir=#{etc} --localstatedir=#{var} - --disable-dependency-tracking --disable-silent-rules ] - system "./configure", *args + system "./configure", *args, *std_configure_args system "make", "install" end From 4a7b4952de0e5988f4583249a9eab1c8d30f160e Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:32:15 -0500 Subject: [PATCH 03/13] xcb-util-cursor: migrate to `pkgconf` --- Formula/x/xcb-util-cursor.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Formula/x/xcb-util-cursor.rb b/Formula/x/xcb-util-cursor.rb index e165fd5105c38..19c16c6856bcb 100644 --- a/Formula/x/xcb-util-cursor.rb +++ b/Formula/x/xcb-util-cursor.rb @@ -22,7 +22,7 @@ class XcbUtilCursor < Formula depends_on "util-macros" => :build end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "libxcb" depends_on "xcb-util" depends_on "xcb-util-image" @@ -32,11 +32,10 @@ class XcbUtilCursor < Formula def install system "./autogen.sh" if build.head? - system "./configure", "--prefix=#{prefix}", - "--sysconfdir=#{etc}", + system "./configure", "--disable-silent-rules", "--localstatedir=#{var}", - "--disable-dependency-tracking", - "--disable-silent-rules" + "--sysconfdir=#{etc}", + *std_configure_args system "make" system "make", "install" end From ef41fc1afdb59b40791edbdcd299bc7ece4f489a Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:32:30 -0500 Subject: [PATCH 04/13] xplr: migrate to `pkgconf` --- Formula/x/xplr.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/x/xplr.rb b/Formula/x/xplr.rb index e4dba0da3c3e6..d86fefb9f046e 100644 --- a/Formula/x/xplr.rb +++ b/Formula/x/xplr.rb @@ -17,7 +17,7 @@ class Xplr < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "a2e5fd49885a71195c2c9e6087e3b8d2f1b6b9c4a866be343db5fd1e067d5915" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "rust" => :build depends_on "luajit" From 03ccd679d032ffaaf2c097e308d3500435784183 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:32:59 -0500 Subject: [PATCH 05/13] xcb-util-image: migrate to `pkgconf` --- Formula/x/xcb-util-image.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Formula/x/xcb-util-image.rb b/Formula/x/xcb-util-image.rb index 08ee9420938f5..597f0b3154f94 100644 --- a/Formula/x/xcb-util-image.rb +++ b/Formula/x/xcb-util-image.rb @@ -27,17 +27,16 @@ class XcbUtilImage < Formula depends_on "libtool" => :build end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "libxcb" depends_on "xcb-util" def install system "./autogen.sh" if build.head? - system "./configure", "--prefix=#{prefix}", - "--sysconfdir=#{etc}", + system "./configure", "--disable-silent-rules", "--localstatedir=#{var}", - "--disable-dependency-tracking", - "--disable-silent-rules" + "--sysconfdir=#{etc}", + *std_configure_args system "make" system "make", "install" end From c7534064d8397e17f5a1707e881be2b689af8322 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:34:54 -0500 Subject: [PATCH 06/13] xsel: migrate to `pkgconf` --- Formula/x/xsel.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Formula/x/xsel.rb b/Formula/x/xsel.rb index fcb0345f33dec..c965619b5ce0d 100644 --- a/Formula/x/xsel.rb +++ b/Formula/x/xsel.rb @@ -23,12 +23,11 @@ class Xsel < Formula depends_on "automake" => :build depends_on "libtool" => :build depends_on "libxt" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libx11" def install system "./autogen.sh", *std_configure_args - system "./configure", *std_configure_args system "make", "install" end From 1411c858353ac75fa7b193f3cbeb366aae39be4d Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:35:22 -0500 Subject: [PATCH 07/13] xauth: migrate to `pkgconf` --- Formula/x/xauth.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/x/xauth.rb b/Formula/x/xauth.rb index 3eff4e352aa67..f08fa6ab83e8a 100644 --- a/Formula/x/xauth.rb +++ b/Formula/x/xauth.rb @@ -16,7 +16,7 @@ class Xauth < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "79c33da732dc8f9d89082193869d83fcd79d695ea8cc8f26f1f5e2c743da6633" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "util-macros" => :build depends_on "libx11" depends_on "libxau" @@ -30,10 +30,8 @@ class Xauth < Formula def install args = %W[ - --prefix=#{prefix} --sysconfdir=#{etc} --localstatedir=#{var} - --disable-dependency-tracking --disable-silent-rules --enable-unix-transport --enable-tcp-transport @@ -41,7 +39,7 @@ def install --enable-local-transport ] - system "./configure", *args + system "./configure", *args, *std_configure_args system "make" system "make", "install" end From 939c3ef7e153d3b6fd4410c8a4b1c6d24e810256 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:35:50 -0500 Subject: [PATCH 08/13] xcb-util-wm: migrate to `pkgconf` --- Formula/x/xcb-util-wm.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Formula/x/xcb-util-wm.rb b/Formula/x/xcb-util-wm.rb index db18203686760..1ee3163b138a8 100644 --- a/Formula/x/xcb-util-wm.rb +++ b/Formula/x/xcb-util-wm.rb @@ -27,18 +27,17 @@ class XcbUtilWm < Formula depends_on "libtool" => :build end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "libxcb" uses_from_macos "m4" => :build def install system "./autogen.sh" if build.head? - system "./configure", "--prefix=#{prefix}", - "--sysconfdir=#{etc}", + system "./configure", "--disable-silent-rules", "--localstatedir=#{var}", - "--disable-dependency-tracking", - "--disable-silent-rules" + "--sysconfdir=#{etc}", + *std_configure_args system "make" system "make", "install" end From 35a42c9d04752b36cf7918229c0ceb6b3089198c Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:36:07 -0500 Subject: [PATCH 09/13] xdpyinfo: migrate to `pkgconf` --- Formula/x/xdpyinfo.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/x/xdpyinfo.rb b/Formula/x/xdpyinfo.rb index e5fa6d22b8b77..9a72ae044ac92 100644 --- a/Formula/x/xdpyinfo.rb +++ b/Formula/x/xdpyinfo.rb @@ -18,7 +18,7 @@ class Xdpyinfo < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "5f37e0dbf3c6c0741151f53befb6a5bc82b2fab008b3d28ce4cedf63e6a8bbbf" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libx11" depends_on "libxcb" @@ -32,7 +32,7 @@ def install --localstatedir=#{var} --disable-silent-rules ] - system "./configure", *args, *std_configure_args.reject { |s| s["--disable-debug"] } + system "./configure", *args, *std_configure_args system "make", "install" end From 626d8accba4f4e3ef3f4d1853547d29e7690ca98 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:36:54 -0500 Subject: [PATCH 10/13] xinit: migrate to `pkgconf` --- Formula/x/xinit.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/x/xinit.rb b/Formula/x/xinit.rb index 10d4c6c05d23b..7b1ee9b163699 100644 --- a/Formula/x/xinit.rb +++ b/Formula/x/xinit.rb @@ -18,7 +18,7 @@ class Xinit < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "540015cba432ff1f7e719b37f9c2c3af6d8f40784840eeb8e8774cf8575b82a0" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "tradcpp" => :build depends_on "xorg-server" => :test @@ -80,7 +80,7 @@ def install_xquartz_resource def install install_xquartz_resource if OS.mac? - configure_args = std_configure_args + %W[ + configure_args = %W[ --bindir=#{HOMEBREW_PREFIX}/bin --sysconfdir=#{etc} --with-bundle-id-prefix=#{plist_name.chomp ".startx"} @@ -88,7 +88,7 @@ def install --with-launchdaemons-dir=#{prefix} ] - system "./configure", *configure_args + system "./configure", *configure_args, *std_configure_args system "make", "RAWCPP=tradcpp" system "make", "XINITDIR=#{prefix}/etc/X11/xinit", "sysconfdir=#{prefix}/etc", From 48ca5b2dcfefbe244ada99d1f9a15883102ab6dd Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:37:22 -0500 Subject: [PATCH 11/13] xcb-util-keysyms: migrate to `pkgconf` --- Formula/x/xcb-util-keysyms.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Formula/x/xcb-util-keysyms.rb b/Formula/x/xcb-util-keysyms.rb index d3d370264bec6..3a16d21efed4c 100644 --- a/Formula/x/xcb-util-keysyms.rb +++ b/Formula/x/xcb-util-keysyms.rb @@ -27,16 +27,15 @@ class XcbUtilKeysyms < Formula depends_on "libtool" => :build end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "libxcb" def install system "./autogen.sh" if build.head? - system "./configure", "--prefix=#{prefix}", - "--sysconfdir=#{etc}", + system "./configure", "--disable-silent-rules", "--localstatedir=#{var}", - "--disable-dependency-tracking", - "--disable-silent-rules" + "--sysconfdir=#{etc}", + *std_configure_args system "make" system "make", "install" end From fa71189a22fc1f6f68eb6a5406b7b691bc6f6223 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:37:41 -0500 Subject: [PATCH 12/13] xplanet: migrate to `pkgconf` --- Formula/x/xplanet.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/x/xplanet.rb b/Formula/x/xplanet.rb index b518491056ba3..dee6fe1fa22cd 100644 --- a/Formula/x/xplanet.rb +++ b/Formula/x/xplanet.rb @@ -19,7 +19,7 @@ class Xplanet < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "ff1ddc436b45234444d121e117b299ec702da829391200dfae26547114834d02" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "freetype" depends_on "giflib" depends_on "jpeg-turbo" @@ -75,7 +75,7 @@ def install ] args << "--with-aqua" if OS.mac? - system "./configure", *std_configure_args, *args + system "./configure", *args, *std_configure_args system "make", "install" end From 3d994f40db9f788aca9684317341008874eba4bf Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 00:39:05 -0500 Subject: [PATCH 13/13] xnvme: migrate to `pkgconf` --- Formula/x/xnvme.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Formula/x/xnvme.rb b/Formula/x/xnvme.rb index e2d94408f07d8..78cef3a37ac9c 100644 --- a/Formula/x/xnvme.rb +++ b/Formula/x/xnvme.rb @@ -21,17 +21,18 @@ class Xnvme < Formula depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] def install # We do not have SPDK nor libvfn on macOS, thus disabling these # The examples and tests are also a bit superfluous, so disable those as well - system "meson", "setup", "build", - *std_meson_args, - "-Dwith-spdk=disabled", - "-Dwith-libvfn=disabled", - "-Dtests=false", - "-Dexamples=false" + args = %w[ + -Dwith-spdk=disabled + -Dwith-libvfn=disabled + -Dtests=false + -Dexamples=false + ] + system "meson", "setup", "build", *args, *std_meson_args system "meson", "compile", "-C", "build" system "meson", "install", "-C", "build" end