<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ba8d0485426114e105b3b845eb30877631d1ffe0">https://github.com/macports/macports-ports/commit/ba8d0485426114e105b3b845eb30877631d1ffe0</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 ba8d0485426 py-psycopg2: fix py27 subport error; eliminate pgsql copy-pasta
</span>ba8d0485426 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ba8d0485426114e105b3b845eb30877631d1ffe0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 19 19:05:30 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-psycopg2: fix py27 subport error; eliminate pgsql copy-pasta
</span>---
 python/py-psycopg2/Portfile | 140 +++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 74 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 b957013c2bb..5956f11975b 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;'>@@ -27,6 +27,41 @@ checksums           rmd160  afb1df164e8c1826f253373f73ef72db5644451f \
</span>                     sha256  a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a \
                     size    384343
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc pgsql_variant_set {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {
</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:#e0ffe0;'>+        [variant_isset postgresql13] ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        [variant_isset postgresql14] ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        [variant_isset postgresql15]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return no
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc pgsql_version {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset postgresql10]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pgsql_ver 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset postgresql11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pgsql_ver 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset postgresql12]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pgsql_ver 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset postgresql13]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pgsql_ver 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset postgresql14]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pgsql_ver 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset postgresql15]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set pgsql_ver 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        error "No postgresql variant enabled"
</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;'>+    return ${pgsql_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
     if {${python.version} == 27} {
         # NOTE: Don't reuse old revision, for resurrected Python 2.7 subport
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,12 +75,19 @@ if {${name} ne ${subport}} {
</span>         patchfiles-append \
                     patch-setup.cfg-py27.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants +postgresql14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![pgsql_variant_set]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            default_variants +postgresql14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span> 
         livecheck.type none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![pgsql_variant_set]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            default_variants +postgresql15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  path:lib/libssl.dylib:openssl port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set pgsql_ver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        [pgsql_version]
</span> 
     if {${python.version} > 27} {
         python.pep517 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,90 +96,40 @@ if {${name} ne ${subport}} {
</span>                     patch-setup.cfg.diff
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[variant_isset postgresql14]} {
</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/postgresql14/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:#e0ffe0;'>+    depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:postgresql${pgsql_ver}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[variant_isset postgresql13]} {
</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/postgresql13/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 postgresql12]} {
</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/postgresql12/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 postgresql11]} {
</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/postgresql11/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 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 postgresql15]} {
</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/postgresql15/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:#e0ffe0;'>+    post-patch {
</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/postgresql${pgsql_ver}/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:#ffe0e0;'>-    variant postgresql14 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            postgresql10 postgresql11 postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            description "Build using postgresql v14" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_lib-append  port:postgresql14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant postgresql10 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description "Build using postgresql v10" {}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant postgresql13 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            postgresql10 postgresql11 postgresql12 postgresql14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            description "Build using postgresql v13" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_lib-append  port:postgresql13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant postgresql11 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            postgresql10 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description "Build using postgresql v11" {}
</span> 
     variant postgresql12 conflicts postgresql15 \
             postgresql10 postgresql11 postgresql13 postgresql14 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            description "Build using postgresql v12" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_lib-append  port:postgresql12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description "Build using postgresql v12" {}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant postgresql11 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            postgresql10 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            description "Build using postgresql v11" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_lib-append  port:postgresql11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant postgresql13 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            postgresql10 postgresql11 postgresql12 postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description "Build using postgresql v13" {}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant postgresql10 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            postgresql11 postgresql12 postgresql13 postgresql14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            description "Build using postgresql v10" {
</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:#e0ffe0;'>+    variant postgresql14 conflicts postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            postgresql10 postgresql11 postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description "Build using postgresql v14" {}
</span> 
     variant postgresql15 conflicts \
             postgresql10 postgresql11 postgresql12 postgresql13 postgresql14 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            description "Build using postgresql v15" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_lib-append  port:postgresql15
</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 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![variant_isset postgresql15] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![variant_isset postgresql10] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![variant_isset postgresql11] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![variant_isset postgresql12] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![variant_isset postgresql13] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![variant_isset postgresql14]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants +postgresql15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            description "Build using postgresql v15" {}
</span> }
 
 universal_variant       no
</pre><pre style='margin:0'>

</pre>