<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3e480a6301dd5fc9ef70d5d37e66571d181a69b7">https://github.com/macports/macports-ports/commit/3e480a6301dd5fc9ef70d5d37e66571d181a69b7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3e480a6301d postgresql90: fix the build
</span>3e480a6301d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e480a6301dd5fc9ef70d5d37e66571d181a69b7
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue May 31 01:26:22 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> postgresql90: fix the build
</span>---
databases/postgresql90/Portfile | 9 ++--
.../postgresql90/files/patch-configure-flex.diff | 23 +++++++++
databases/postgresql90/files/patch-return.diff | 55 ++++++++++++++++++++++
3 files changed, 84 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql90/Portfile b/databases/postgresql90/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24e6f9ea98a..23690e79cb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql90/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql90/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,9 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup muniversal 1.0
PortGroup deprecated 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span>
# Final release was on 2015-10-08
deprecated.upstream_support no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +15,7 @@ deprecated.upstream_support no
</span> #remember to update the -doc and -server as well
name postgresql90
version 9.0.23
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span>
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +38,8 @@ checksums rmd160 a8751d04dfad1323e4f2d2d2d05c8868cc3008ae \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not build man or html files (use postgresqlXY-doc instead)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-no_doc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not build man or html files (use postgresqlXY-doc instead); flex patch needed for flex >= 2.6.0, otherwise configure errs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no_doc.diff patch-configure-flex.diff patch-return.diff
</span>
depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib port:libxml2 port:libxslt port:ossp-uuid
depends_build port:bison
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql90/files/patch-configure-flex.diff b/databases/postgresql90/files/patch-configure-flex.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..54e5c136e0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql90/files/patch-configure-flex.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2015-10-06 03:19:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-05-31 00:50:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6931,17 +6931,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo '%%' > conftest.l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && $2 = 5 && $3 >= 31) exit 0; else exit 1;}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && $2 >= 6 && $3 >= 0) exit 0; else exit 1;}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgac_cv_path_flex=$pgac_candidate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:$LINENO: WARNING:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** Flex version 2.6.0 or later is required, but this is $pgac_flex_version." >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me: WARNING:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*** Flex version 2.6.0 or later is required, but this is $pgac_flex_version." >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql90/files/patch-return.diff b/databases/postgresql90/files/patch-return.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d3c161f4f22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql90/files/patch-return.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/postgres/postgres/commit/1c0cf52b39ca3a9a79661129cff918dc000a55eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2015-10-06 03:19:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-10-12 15:09:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23849,7 +23849,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest$ac_exeext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23986,7 +23986,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest$ac_exeext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24144,7 +24144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_snprintf_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (! does_int64_snprintf_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest$ac_exeext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/c-library.m4.orig 2015-10-06 03:19:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/c-library.m4 2022-10-12 15:10:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,7 +251,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_snprintf_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (! does_int64_snprintf_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pgac_cv_snprintf_long_long_int_format=$pgac_format; break],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/c-compiler.m4.orig 2015-10-06 03:19:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/c-compiler.m4 2022-10-12 15:10:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Ac_cachevar=yes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Ac_cachevar=no],
</span></pre><pre style='margin:0'>
</pre>