<pre style='margin:0'>
Jeremy L (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/af00890c927633f639ae3e4e1f8fb40468cca725">https://github.com/macports/macports-ports/commit/af00890c927633f639ae3e4e1f8fb40468cca725</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit af00890c927633f639ae3e4e1f8fb40468cca725
</span>Author: Jeremy Lavergne <snc@macports.org>
AuthorDate: Mon Feb 18 12:42:35 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-psycopg2:
</span><span style='display:block; white-space:pre;color:#404040;'> * disable universal variant, closes https://trac.macports.org/ticket/41546
</span><span style='display:block; white-space:pre;color:#404040;'> * update postgres variants
</span>---
python/py-psycopg2/Portfile | 56 +++++++++++++++++++--------------------------
1 file changed, 23 insertions(+), 33 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 af7c919..30c2926 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;'>@@ -36,21 +36,15 @@ if {${name} ne ${subport}} {
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset postgresql10]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s|@PG_CONFIG@|${prefix}/lib/postgresql10/bin/pg_config|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/setup.cfg
</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 {[variant_isset postgresql92]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset postgresql11]} {
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- s|@PG_CONFIG@|${prefix}/lib/postgresql92/bin/pg_config|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|@PG_CONFIG@|${prefix}/lib/postgresql11/bin/pg_config|g \
</span> ${worksrcpath}/setup.cfg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset postgresql93]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset postgresql10]} {
</span> reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- s|@PG_CONFIG@|${prefix}/lib/postgresql93/bin/pg_config|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|@PG_CONFIG@|${prefix}/lib/postgresql10/bin/pg_config|g \
</span> ${worksrcpath}/setup.cfg
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,51 +67,47 @@ if {${name} ne ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql10 conflicts postgresql92 postgresql93 postgresql94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql11 conflicts postgresql94 \
</span> postgresql95 postgresql96 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Build using postgresql v10.1" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql10
</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;'>- variant postgresql92 conflicts postgresql10 postgresql93 postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Build using postgresql v9.2" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql92
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Build using postgresql v11" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql11
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql93 conflicts postgresql10 postgresql92 postgresql94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Build using postgresql v9.3" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql10 conflicts postgresql94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql95 postgresql96 postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Build using postgresql v10" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql10
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql94 conflicts postgresql10 postgresql92 postgresql93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql95 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql94 conflicts postgresql10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql95 postgresql96 postgresql11 \
</span> description "Build using postgresql v9.4" {
depends_lib-append port:postgresql94
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant postgresql95 conflicts postgresql10 postgresql92 postgresql93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql94 postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql95 conflicts postgresql10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql94 postgresql96 postgresql11 \
</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 postgresql92 postgresql93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- postgresql94 postgresql95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant postgresql96 conflicts postgresql10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postgresql94 postgresql95 postgresql11 \
</span> description "Build using postgresql v9.6" {
depends_lib-append port:postgresql96
}
if {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset postgresql10] && ![variant_isset postgresql92] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset postgresql93] && ![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:#e0ffe0;'>+ ![variant_isset postgresql10] && ![variant_isset postgresql94] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql95] && ![variant_isset postgresql96] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset postgresql11]
</span> } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql11
</span> }
livecheck.type none
} else {
livecheck.type pypi
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span></pre><pre style='margin:0'>
</pre>