<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/366526721027f158ed9cc0c33569d685a0962461">https://github.com/macports/macports-ports/commit/366526721027f158ed9cc0c33569d685a0962461</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 36652672102 timescaledb: fix conflict with subport
</span>36652672102 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 366526721027f158ed9cc0c33569d685a0962461
</span>Author: Monson Shao <holymonson@gmail.com>
AuthorDate: Tue Oct 29 14:17:40 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    timescaledb: fix conflict with subport
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * fix conflict with subport
</span><span style='display:block; white-space:pre;color:#404040;'>    * fix license
</span><span style='display:block; white-space:pre;color:#404040;'>    * add deactivate hack for smooth upgrade from legacy
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/71189
</span>---
 databases/timescaledb/Portfile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/timescaledb/Portfile b/databases/timescaledb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea9394dbf43..7981f8756b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/timescaledb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/timescaledb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,18 +82,30 @@ configure.args          -DAPACHE_ONLY=1 \
</span> 
 build.dir               ${worksrcpath}/build
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# @holymonson 2024-10-30: for smooth upgrade from legacy, kill this hack sometime later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {lindex [registry_active timescaledb] 0} installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.16.1] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite timescaledb "" [list ports_nodepcheck 1]
</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;'>+
</span> github.livecheck.regex  {([0-9.]+)}
 
 variant timescale_license description {Enable Timescale License code, license will be Timescale License} {
     configure.args-delete   -DAPACHE_ONLY=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    license                 {Timescale License}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    license                 Timescale-License
</span> }
 
 if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup       stub 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span> 
     supported_archs noarch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # set this stub port depends on its latest subport for legacy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib     port:pg[lindex ${postgresql_branches} end]-${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set latest_branch [lindex ${postgresql_branches} end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    replaced_by     pg${latest_branch}-${name}
</span> }
</pre><pre style='margin:0'>

</pre>