<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8af2da1c5dde82e4bc60d12c022f9d83ba533106">https://github.com/macports/macports-ports/commit/8af2da1c5dde82e4bc60d12c022f9d83ba533106</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8af2da1c5dde82e4bc60d12c022f9d83ba533106
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Apr 5 16:02:48 2023 -0700

<span style='display:block; white-space:pre;color:#404040;'>    Revert "p5-dbd-pg: add support for building with postgresql15"
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This reverts commit e7bc73bf69e8c26061b5701819f226147d1d53df which
</span><span style='display:block; white-space:pre;color:#404040;'>    attempted to generate variants on the fly rather than just defining
</span><span style='display:block; white-space:pre;color:#404040;'>    them explicitly. The result caused a parsing error that interpreted
</span><span style='display:block; white-space:pre;color:#404040;'>    the generated variants conflicts clause as declaring conflicts with
</span><span style='display:block; white-space:pre;color:#404040;'>    other postgresql ports rather than this port's other postgresql variants.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    In reality, the various postgresql ports do not conflict with each other
</span><span style='display:block; white-space:pre;color:#404040;'>    and can be installed in parallel as they are installed in separate
</span><span style='display:block; white-space:pre;color:#404040;'>    versioned directories. Only this port's variants conflict with each other
</span><span style='display:block; white-space:pre;color:#404040;'>    since the port can only be built with one version of postgresql at a time.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Going back to explicit variant definitions that are readable and work as desired.
</span>---
 perl/p5-dbd-pg/Portfile | 57 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 19 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-dbd-pg/Portfile b/perl/p5-dbd-pg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fd43d18fc3..5db11ddcf4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-dbd-pg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-dbd-pg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           perl5 1.0
</span> 
 perl5.branches      5.28 5.30 5.32 5.34
 perl5.setup         DBD-Pg 3.16.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> license             {Artistic-1 GPL}
 categories-append   databases
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,32 +28,51 @@ if {${perl5.major} ne ""} {
</span>                     port:p${perl5.major}-dbi \
                     port:p${perl5.major}-version
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {10 11 12 13 14 15}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql10 conflicts postgresql11 postgresql12 postgresql13 postgresql14 description {Build with postgresql10 port} {
</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;'>-set postgresql_ports {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    lappend postgresql_ports postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env           PATH=${prefix}/lib/postgresql10/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            POSTGRES_INCLUDE=${prefix}/include/postgresql10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "POSTGRES_LIB=${prefix}/lib/postgresql10 -lssl"
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set p postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set i [lsearch -exact ${postgresql_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set conflicts [lreplace ${postgresql_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant ${p} description "Build with postgresql${s} port" conflicts {*}${conflicts} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env           PATH=${prefix}/lib/${p}/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                POSTGRES_INCLUDE=${prefix}/include/${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                \"POSTGRES_LIB=${prefix}/lib/${p} -lssl\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql11 conflicts postgresql10 postgresql12 postgresql13 postgresql14 description {Build with postgresql11 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:postgresql11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env           PATH=${prefix}/lib/postgresql11/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            POSTGRES_INCLUDE=${prefix}/include/postgresql11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "POSTGRES_LIB=${prefix}/lib/postgresql11 -lssl"
</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 postgresql12 conflicts postgresql10 postgresql11 postgresql13 postgresql14 description {Build with postgresql12 port} {
</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;'>+    configure.env           PATH=${prefix}/lib/postgresql12/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            POSTGRES_INCLUDE=${prefix}/include/postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "POSTGRES_LIB=${prefix}/lib/postgresql12 -lssl"
</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 postgresql13 conflicts postgresql10 postgresql11 postgresql12 postgresql14 description {Build with postgresql13 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:postgresql13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env           PATH=${prefix}/lib/postgresql13/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            POSTGRES_INCLUDE=${prefix}/include/postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "POSTGRES_LIB=${prefix}/lib/postgresql13 -lssl"
</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 postgresql14 conflicts postgresql10 postgresql11 postgresql12 postgresql13 description {Build with postgresql14 port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:postgresql14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env           PATH=${prefix}/lib/postgresql14/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            POSTGRES_INCLUDE=${prefix}/include/postgresql14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            "POSTGRES_LIB=${prefix}/lib/postgresql14 -lssl"
</span> }
 
 if {![variant_isset postgresql10] && \
     ![variant_isset postgresql11] && \
     ![variant_isset postgresql12] && \
     ![variant_isset postgresql13] && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    ![variant_isset postgresql14] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ![variant_isset postgresql15]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants    +postgresql15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ![variant_isset postgresql14]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants    +postgresql14
</span>     }
 }
</pre><pre style='margin:0'>

</pre>