<pre style='margin:0'>
Aljaž Srebrnič (g5pw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5dc5a720056e37f9cd7ad56f612b4114f2981898">https://github.com/macports/macports-ports/commit/5dc5a720056e37f9cd7ad56f612b4114f2981898</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5dc5a720056e37f9cd7ad56f612b4114f2981898
</span>Author: Ivan Larionov <xeron.oskom@gmail.com>
AuthorDate: Sat Oct 26 12:51:08 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-psycopg2: postgresql 12 support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also sorted 9.x variant definitions by version in descending order to be consistent with 10.x variants.
</span>---
python/py-psycopg2/Portfile | 58 ++++++++++++++++++++++++++++-----------------
1 file changed, 36 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-psycopg2/Portfile b/python/py-psycopg2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c865c2d..5ce1ab1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-psycopg2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-psycopg2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,11 @@ if {${name} ne ${subport}} {
</span> patchfiles patch-setup.cfg.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset postgresql12]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|@PG_CONFIG@|${prefix}/lib/postgresql12/bin/pg_config|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/setup.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if {[variant_isset postgresql11]} {
reinplace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +53,9 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/setup.cfg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset postgresql94]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset postgresql96]} {
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- s|@PG_CONFIG@|${prefix}/lib/postgresql94/bin/pg_config|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|@PG_CONFIG@|${prefix}/lib/postgresql96/bin/pg_config|g \
</span> ${worksrcpath}/setup.cfg
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,49 +65,58 @@ if {${name} ne ${subport}} {
</span> ${worksrcpath}/setup.cfg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset postgresql96]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset postgresql94]} {
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- s|@PG_CONFIG@|${prefix}/lib/postgresql96/bin/pg_config|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|@PG_CONFIG@|${prefix}/lib/postgresql94/bin/pg_config|g \
</span> ${worksrcpath}/setup.cfg
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql11 conflicts postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql12 conflicts postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql10 postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Build using postgresql v12" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql12
</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;'>+ variant postgresql11 conflicts postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql10 postgresql12 \
</span> description "Build using postgresql v11" {
depends_lib-append port:postgresql11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql10 conflicts postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql10 conflicts postgresql94 postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql11 postgresql12 \
</span> description "Build using postgresql v10" {
depends_lib-append port:postgresql10
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql94 conflicts postgresql10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 postgresql11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Build using postgresql v9.4" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql96 conflicts postgresql94 postgresql95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql10 postgresql11 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Build using postgresql v9.6" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql96
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql95 conflicts postgresql10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql94 postgresql96 postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql95 conflicts postgresql94 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql10 postgresql11 postgresql12 \
</span> description "Build using postgresql v9.5" {
depends_lib-append port:postgresql95
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql96 conflicts postgresql10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql94 postgresql95 postgresql11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Build using postgresql v9.6" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql94 conflicts postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql10 postgresql11 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Build using postgresql v9.4" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql94
</span> }
if {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset postgresql10] && ![variant_isset postgresql94] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset postgresql95] && ![variant_isset postgresql96] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset postgresql11]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql94] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql95] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql96] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql10] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql11] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql12]
</span> } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql12
</span> }
livecheck.type none
</pre><pre style='margin:0'>
</pre>