<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/234eba5b62738e6ad5efec9b208847b3b3149ed9">https://github.com/macports/macports-ports/commit/234eba5b62738e6ad5efec9b208847b3b3149ed9</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 234eba5 libpqxx: update to 6.4.5
</span>234eba5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 234eba5b62738e6ad5efec9b208847b3b3149ed9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Nov 1 20:27:09 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> libpqxx: update to 6.4.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Requires at least PostgreSQL 9.1 and a C++11 compiler.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/33673
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/58620
</span>---
databases/libpqxx/Portfile | 70 +++++++++-------------
databases/libpqxx/files/patch-configure.diff | 38 ------------
.../libpqxx/files/patch-tools-maketemporary.diff | 11 ----
3 files changed, 28 insertions(+), 91 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/libpqxx/Portfile b/databases/libpqxx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index baf98e7..e5a8e16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/libpqxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/libpqxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name libpqxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jtv libpqxx 6.4.5
</span>
categories databases devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span> license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,58 +29,43 @@ you some extra reliability features that would be hard to get with most other \
</span> database interfaces.
homepage http://pqxx.org/development/libpqxx/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://pqxx.org/download/software/libpqxx/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7fae516d6aa59dac0d2403c6a979c5c3d9fb3fce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a0eb3fb9eb0ac107e2307e695fe2ed9750d9be5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d9ef1da01feeeb6cecc36edf3f93bb07d13612e7d87b6f95b6dbe2bd9a671740
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset postgresql90] && ![variant_isset postgresql91] && ![variant_isset postgresql92] && ![variant_isset postgresql93] && ![variant_isset postgresql94]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql94
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pg_ports [list postgresql91 postgresql92 postgresql93 postgresql94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql95 postgresql96 postgresql10 postgresql11 postgresql12]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 postgresql94 description {Use postgresql83} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 postgresql92 postgresql93 postgresql94 description {Use postgresql84} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 postgresql92 postgresql93 postgresql94 description {Use postgresql90} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 postgresql92 postgresql93 postgresql94 description {Use postgresql91} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql92 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql93 postgresql94 description {Use postgresql92} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql93 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 postgresql94 description {Use postgresql93} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql94 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 description {Use postgresql94} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset postgresql83]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset postgresql84]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset postgresql90]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset postgresql91]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset postgresql92]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset postgresql93]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql93
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset postgresql94]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set server postgresql94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set any_variant_set no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pg_port $pg_ports {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${pg_port} conflicts {*}[ldelete ${pg_ports} ${pg_port}] description "Use ${pg_port}" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${pg_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset ${pg_port}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set server ${pg_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any_variant_set yes
</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;'>+if {!$any_variant_set} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set server postgresql12
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:${server}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-tools-maketemporary.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env \
</span> PG_CONFIG=${prefix}/lib/${server}/bin/pg_config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# docs need at least xmlto, not sure what else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-documentation
</span>
# Enable tests after the build phase; see
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://guide.macports.org/#reference.phases.test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://pqxx.org/development/libpqxx/browser/trunk/README?rev=latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://guide.macports.org/#reference.phases.test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/jtv/libpqxx/blob/master/README.md
</span> # http://pqxx.org/development/libpqxx/wiki/TestDocs
set dbdir ${workpath}/db
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/libpqxx/files/patch-configure.diff b/databases/libpqxx/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 43e58e5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/libpqxx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2011-11-27 05:12:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2012-03-18 01:09:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15204,7 +15204,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if /bin/true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if /usr/bin/true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_REFERENCE_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_REFERENCE_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15290,7 +15290,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if /bin/true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if /usr/bin/true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_TUTORIAL_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_TUTORIAL_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15299,7 +15299,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if /bin/false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if /usr/bin/false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_REFERENCE_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_REFERENCE_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15307,7 +15307,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_REFERENCE_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if /bin/false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if /usr/bin/false; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_TUTORIAL_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_TUTORIAL_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/libpqxx/files/patch-tools-maketemporary.diff b/databases/libpqxx/files/patch-tools-maketemporary.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5feaf72..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/libpqxx/files/patch-tools-maketemporary.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/maketemporary.orig 2009-07-04 00:38:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/maketemporary 2012-03-18 01:13:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TMPDIR="${TMPDIR:-/tmp}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export TMPDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--T="`mktemp`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+T="`mktemp 2>/dev/null`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$T" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- T="`mktemp -t pqxx.XXXXXX`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span></pre><pre style='margin:0'>
</pre>