Ticket #44894: patch-base-src-port1.0-portlivecheck.tcl.diff

base/src/port1.0/portlivecheck.tcl

@@ -47 +47 @@
 }
 
 # define options
-options livecheck.url livecheck.type livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version livecheck.ignore_sslcert
+options livecheck.url livecheck.type livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version livecheck.version_display livecheck.moddate livecheck.ignore_sslcert
 
 # defaults
 default livecheck.url {$homepage}
@@ -57 +57 @@
 default livecheck.name default
 default livecheck.distname default
 default livecheck.version {$version}
+default livecheck.version_display {${livecheck.version}}
+default livecheck.moddate {[file mtime ${portpath}/Portfile]}
 default livecheck.ignore_sslcert yes
 
 proc portlivecheck::livecheck_main {args} {
     global livecheck.url livecheck.type livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version \
-           livecheck.ignore_sslcert \
-           homepage portpath workpath \
+           livecheck.moddate livecheck.version_display livecheck.ignore_sslcert \
+           homepage workpath \
            master_sites name subport distfiles
 
     set updated 0
@@ -71 +73 @@
     set has_homepage [info exists homepage]
 
     set tempfile [mktemp "/tmp/mports.livecheck.XXXXXXXX"]
-    set port_moddate [file mtime ${portpath}/Portfile]
 
-    ui_debug "Portfile modification date is [clock format $port_moddate]"
+    ui_debug "Portfile modification date is [clock format ${livecheck.moddate}]"
     ui_debug "Port (livecheck) version is ${livecheck.version}"
 
     set curl_options {}
@@ -211 +212 @@
             }
         }
         "moddate" {
-            set port_moddate [file mtime ${portpath}/Portfile]
-            if {[catch {set updated [curl isnewer ${livecheck.url} $port_moddate]} error]} {
+            if {[catch {set updated [curl isnewer ${livecheck.url} ${livecheck.moddate}]} error]} {
                 ui_error "cannot check if $subport was updated ($error)"
                 set updated -1
             } else {
@@ -221 +221 @@
                 }
             }
         }
+        "moddate2" {
+            if {[catch {set moddate [curl getmoddate ${livecheck.url} ${livecheck.moddate}]} error]} {
+                ui_error "cannot check if $subport was updated ($error)"
+                set updated -1
+            } else {
+                if {$moddate < ${livecheck.moddate}} {
+                    ui_debug "${livecheck.url} is older than Portfile"
+                    set updated 0
+                } else {
+                    set updated 1
+                    set updated_version [clock format ${moddate}]
+                    livecheck.version_display [clock format ${livecheck.moddate}]
+                }
+            }
+        }
         "none" {
         }
         default {
@@ -232 +247 @@
 
     if {${livecheck.type} != "none"} {
         if {$updated > 0} {
-            ui_msg "$subport seems to have been updated (port version: ${livecheck.version}, new version: $updated_version)"
+            ui_msg "$subport seems to have been updated (port version: [join ${livecheck.version_display} { }], new version: $updated_version)"
         } elseif {$updated == 0} {
             ui_info "$subport seems to be up to date"
         }