<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/469fc4f80e54207a395cb5348118c09bc6e0146c">https://github.com/macports/macports-ports/commit/469fc4f80e54207a395cb5348118c09bc6e0146c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 469fc4f80e54207a395cb5348118c09bc6e0146c
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 10 00:10:11 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> php: Use path:-style dependency for pkgconfig
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> to accommodate pkgconf.
</span>---
lang/php/Portfile | 36 ++++++++++++++++++------------------
php/php-cairo/Portfile | 2 +-
php/php-cairo_wrapper/Portfile | 2 +-
php/php-event/Portfile | 2 +-
php/php-gtk/Portfile | 2 +-
php/php-imagick/Portfile | 2 +-
php/php-midgard2/Portfile | 2 +-
php/php-mongodb/Portfile | 2 +-
php/php-solr/Portfile | 2 +-
php/php-zip/Portfile | 2 +-
php/php-zstd/Portfile | 2 +-
11 files changed, 28 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 99502aebe91..36b19f8ff84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,7 +244,7 @@ if {[is_sapi_subport]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build path:bin/pkg-config:pkgconfig
</span>
if {${subport} ne ${php}} {
depends_lib port:${php}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -838,7 +838,7 @@ subport ${php}-curl {
</span> }
configure.args-append --with-curl=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-curl
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -913,7 +913,7 @@ subport ${php}-enchant {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-enchant=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-enchant
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -974,7 +974,7 @@ subport ${php}-ffi {
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:libffi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1009,7 +1009,7 @@ subport ${php}-ftp {
</span>
if {[vercmp ${branch} 7.4] >= 0} {
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span> }
if {[vercmp ${branch} 7.0] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1075,7 +1075,7 @@ subport ${php}-gd {
</span> configure.args-append --with-webp-dir=${prefix}
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-freetype \
--with-jpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1219,7 +1219,7 @@ subport ${php}-imap {
</span> --with-kerberos=${prefix}
if {[vercmp ${branch} 7.4] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
# https://bugs.php.net/bug.php?id=79112
configure.env-append PHP_OPENSSL=yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1251,7 +1251,7 @@ subport ${php}-intl {
</span> long_description Internationalization extension implements ICU \
library functionality in PHP.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1349,7 +1349,7 @@ subport ${php}-ldap {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-ldap-sasl=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-ldap-sasl
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1381,7 +1381,7 @@ subport ${php}-mbstring {
</span> long_description ${description}
if {[vercmp ${branch} >= 7.4]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:oniguruma6
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1679,7 +1679,7 @@ subport ${php}-odbc {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-iODBC=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-iODBC
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1701,7 +1701,7 @@ subport ${php}-odbc {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-unixODBC=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-unixODBC
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1813,7 +1813,7 @@ subport ${php}-openssl {
</span> } elseif {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-openssl=[openssl::install_area]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-openssl
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2156,7 +2156,7 @@ subport ${php}-soap {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-libxml-dir=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2212,7 +2212,7 @@ subport ${php}-sodium {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-sodium=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-sodium
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2263,7 +2263,7 @@ subport ${php}-sqlite {
</span> configure.args-append --with-sqlite3=${prefix} \
--with-pdo-sqlite=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-sqlite3 \
--with-pdo-sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2365,7 +2365,7 @@ subport ${php}-xmlrpc {
</span> configure.args-append --with-libexpat-dir=${prefix} \
--with-libxml-dir=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-expat
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2406,7 +2406,7 @@ subport ${php}-xsl {
</span> if {[vercmp ${branch} 7.4] < 0} {
configure.args-append --with-xsl=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-xsl
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-cairo/Portfile b/php/php-cairo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 783f6fd6c06..fd7f120a405 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-cairo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-cairo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ distname Cairo-${version}
</span> if {${name} ne ${subport}} {
conflicts ${php}-cairo_wrapper
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append path:lib/libcairo.dylib:cairo
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-cairo_wrapper/Portfile b/php/php-cairo_wrapper/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d518b84ce8..87ca7f54c4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-cairo_wrapper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-cairo_wrapper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ checksums md5 c10d73a5280b8441efe5d56eac04873c \
</span> if {${name} ne ${subport}} {
conflicts ${php}-cairo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append path:lib/libcairo.dylib:cairo
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-event/Portfile b/php/php-event/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37d7b92ec75..a2542e89b8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-event/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-event/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,6 @@ if {${name} ne ${subport}} {
</span> configure.args-append \
--with-openssl-dir=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-gtk/Portfile b/php/php-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c69425bbd5c..1cf956a8591 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ if {${name} != ${subport}} {
</span> checksums rmd160 b12ccdb5ce3f9779885b769a7f43b47f3392d2ec \
sha256 f7455985446918fe8c55ae5b4432e775466605f1c17e686917449ac81a8ee923
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libglade2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-imagick/Portfile b/php/php-imagick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20edcbb843b..aa7a3b60b4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-imagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-imagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ if {[vercmp ${php.branch} >= 5.4]} {
</span>
if {${name} ne ${subport}} {
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:ImageMagick
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-midgard2/Portfile b/php/php-midgard2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01986a31cb8..31f59f26930 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-midgard2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-midgard2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums rmd160 30180ca78719f01946b63e112fce5768e8373752 \
</span> sha256 b88962c95a92c1b08bc147b0bacc69987e6b00ca2ea54575933ecbd53bc3491f
if {${name} != ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:midgard2-core
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-mongodb/Portfile b/php/php-mongodb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcb419c1e2f..83e472099e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-mongodb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-mongodb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ long_description This package provides a PHP interface for communicating \
</span> with MongoDB database servers.
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:libbson \
port:mongo-c-driver
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-solr/Portfile b/php/php-solr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7be173ded89..a3ebce6d36f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-solr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-solr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ if {${name} ne ${subport}} {
</span>
if {[vercmp ${php.branch} 7.4] >= 0} {
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span> }
configure.args-append --with-curl=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-zip/Portfile b/php/php-zip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0a5fead001..b5dd6f330bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-zip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-zip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ if {${name} ne ${subport}} {
</span> --with-libzip=${prefix} \
--with-zlib-dir=${prefix}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-zip
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-zstd/Portfile b/php/php-zstd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7c07a66fa9..e9360bfcb5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ if {${name} ne ${subport}} {
</span>
depends_lib-append port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:bin/pkg-config:pkgconfig
</span>
configure.args-append --with-libzstd
}
</pre><pre style='margin:0'>
</pre>