<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f737fc5dc38c72b046cc73dda1d6c0fde341f86e">https://github.com/macports/macports-ports/commit/f737fc5dc38c72b046cc73dda1d6c0fde341f86e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f737fc5dc38c72b046cc73dda1d6c0fde341f86e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Feb 5 04:43:32 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> xapian-core: Update to 1.4.22
</span>---
devel/xapian-core/Portfile | 57 ++++++++++++-------------
devel/xapian-core/files/dynamic_lookup-11.patch | 6 +--
2 files changed, 31 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xapian-core/Portfile b/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2916e397b6..17775d6c97b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name xapian-core
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.22
</span> categories devel
maintainers {ryandesign @ryandesign} openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ if {${subport} eq ${name}} {
</span> # version.h does not get generated properly when there are multiple -arch flags
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 949c17d21b4c10d2049709e8d8d94d29d317fb04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 80f86034d2fb55900795481dfae681bfaa10efbe818abad3622cdc0c55e06f88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3018384
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7a69b43aadc9a4088c3875852001d556a50ae3b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05884af00b06702ce486057d62a3bfbe6606cf965ada0f5ea570b328a2fa1ea8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3019608
</span>
# TODO: Fix xapian-config to not require the .la file
# /opt/local/bin/xapian-config --ltlibs --cxxflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +60,9 @@ if {${subport} eq ${name}} {
</span>
subport xapian-omega {
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 76e86b497a3c57a6b188ad6c734da6ac17067a92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 88a113c5598fc95833e1212c70be463abb9d5601564d21b861636f737955aad5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 568440
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e130a2b03103bd178cf41e6ec303f3ddc3364c26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 674c979fb90f1f4990eb8a909edab88ca4a009417dfd5ab0cba19e02c7a95528 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 570476
</span>
description web application using the Xapian library
long_description Xapian Omega is an application built on the \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,10 +82,10 @@ subport xapian-omega {
</span> configure.args --with-iconv
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match {xapian-bindings-*} ${subport}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e416673ae0e97f6a1b5c8b1c7d54e8128eb8c486 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e7bf1e4982b91f841289d19214021d88371ca2a6c7304df59049d7da78b83ced \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1151620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ni [list ${name} xapian-omega]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 33d329866bba146ad8dbe0ad4fcb7cee06c35704 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6b5454833ac52a3e32c0bb3a7290a5a2b50488d8918f2a45269557e4de9a31e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1074840
</span>
homepage ${homepage}/docs/bindings/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,6 @@ if {[string match {xapian-bindings-*} ${subport}]} {
</span> --without-python \
--without-python3 \
--without-php \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-php7 \
</span> --without-ruby \
--without-tcl
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +132,7 @@ subport xapian-bindings-java {
</span> }
# Perl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {5.28 5.30 5.32 5.34} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {5.28 5.30 5.32 5.34 5.36} {
</span> subport xapian-bindings-perl${v} "
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,35 +151,35 @@ foreach v {5.28 5.30 5.32 5.34} {
</span> }
# PHP
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {5.5 5.6 7.0 7.1 7.2 7.3 7.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {8.0 8.1 8.2} {
</span> set v_no_dot [string map {. {}} ${v}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${v} 7] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dirsuffix {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set suffix {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dirsuffix 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport xapian-bindings-php${v_no_dot} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set php php${v_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${php}-xapian "
</span> revision 0
description Xapian bindings for PHP ${v}
long_description \{*\}\${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:php${v_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${php}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PHP_CONFIG${suffix}=${prefix}/bin/php-config${v_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-php${suffix} --with-php${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PHP_CONFIG=${prefix}/bin/php-config${v_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-php --with-php
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/doc/xapian-bindings/php ${destroot}${prefix}/share/doc/xapian-bindings/php${v_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/php${dirsuffix} ${destroot}${prefix}/share/php${v_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/share/doc/xapian-bindings/php ${destroot}${prefix}/share/doc/xapian-bindings/${php}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/var/db/${php}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp \[open ${destroot}${prefix}/var/db/${php}/xapian.ini w\]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts \${fp} {; Do not edit this file; it is automatically generated by MacPorts. Any changes}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts \${fp} {; you make will be lost if you upgrade, uninstall or deactivate ${subport}.}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts \${fp} \{; To configure ${php}, edit ${prefix}/etc/${php}/php.ini.\}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts \${fp} {extension=xapian.so}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close \${fp}
</span> }
"
}
# Python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {2.7 3.6 3.7 3.8 3.9 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {2.7 3.6 3.7 3.8 3.9 3.10 3.11} {
</span> set v_no_dot [string map {. {}} ${v}]
if {[vercmp ${v} 3] >= 0} {
set suffix 3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +206,7 @@ foreach v {2.7 3.6 3.7 3.8 3.9 3.10} {
</span> }
# Ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2} {
</span> set v_no_dot [string map {. {}} ${v}]
subport xapian-bindings-ruby${v_no_dot} "
revision 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xapian-core/files/dynamic_lookup-11.patch b/devel/xapian-core/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e1042792cd3..ae38a241534 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xapian-core/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xapian-core/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Recognize macOS 11 and later, remove inaccurate comment, and simplify.
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-02-15 10:14:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-01-08 10:59:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8480,16 +8480,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-02-01 19:01:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-02-05 04:33:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9213,16 +9213,11 @@
</span> _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</pre><pre style='margin:0'>
</pre>