From 86a247423c6d94d1be77922e9b36af3f04b2ef95 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Thu, 29 Feb 2024 20:04:22 +0100
Subject: [PATCH] ports-mgmt/portupgrade: use File.exist? instead of obsolete
 File.exists?

---
 .../portupgrade/files/patch-bin_portsclean    | 11 ++++
 .../files/patch-lib_pkgtools_pkgtools.rb      | 65 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 ports-mgmt/portupgrade/files/patch-bin_portsclean
 create mode 100644 ports-mgmt/portupgrade/files/patch-lib_pkgtools_pkgtools.rb

diff --git a/ports-mgmt/portupgrade/files/patch-bin_portsclean b/ports-mgmt/portupgrade/files/patch-bin_portsclean
new file mode 100644
index 000000000000..cbd9fd0a0790
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-bin_portsclean
@@ -0,0 +1,11 @@
+--- bin/portsclean.orig	2024-02-29 19:03:26 UTC
++++ bin/portsclean
+@@ -282,7 +282,7 @@ def ldconfig_m(*dirs)
+   msg = " --> Running ldconfig -m"
+ 
+   dirs.each do |d|
+-    dirs.delete(d) if ! (File.exists?(d) && File.stat(d).directory?)
++    dirs.delete(d) if ! (File.exist?(d) && File.stat(d).directory?)
+   end
+ 
+   case dirs.size
diff --git a/ports-mgmt/portupgrade/files/patch-lib_pkgtools_pkgtools.rb b/ports-mgmt/portupgrade/files/patch-lib_pkgtools_pkgtools.rb
new file mode 100644
index 000000000000..d1cf333def64
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-lib_pkgtools_pkgtools.rb
@@ -0,0 +1,65 @@
+--- lib/pkgtools/pkgtools.rb.orig	2024-02-29 19:03:26 UTC
++++ lib/pkgtools/pkgtools.rb
+@@ -315,7 +315,7 @@ end
+ def yesno_str(yes)
+   if yes then 'yes' else 'no' end
+ end
+-  
++
+ def prompt_yesno(message = "OK?", yes_by_default = false)
+   if $automatic
+     input = yesno_str(yes_by_default)
+@@ -524,7 +524,7 @@ def script_path
+   # If a fixed/custom script(1) is installed by the port, use that version.
+   # See #8
+   custom_script = "#{PREFIX}/libexec/pkgtools/script"
+-  if File.exists?(custom_script)
++  if File.exist?(custom_script)
+     $script_path = custom_script
+   else
+     $script_path = '/usr/bin/script'
+@@ -533,7 +533,7 @@ def logged_command(file, args)
+ end
+ 
+ def logged_command(file, args)
+-  if !file  
++  if !file
+     args
+   else
+     [script_path(), '-qa', file, *args]
+@@ -780,7 +780,7 @@ def modify_pkgdep(pkgname, dep, newdep, neworigin = ni
+       if newdep == :add
+ 	keyword = $1
+ 	data = $2
+-	if keyword == "pkgdep " && 
++	if keyword == "pkgdep " &&
+ 	  		data.sub(pkgver_re,'') == dep.sub(pkgver_re,'')
+ 	  depends_lines << "@pkgdep #{dep}\n"
+ 	  pkgdep_undeleted = true
+@@ -981,7 +981,7 @@ class PkgResult
+   def done?
+     @result == :done
+   end
+-  
++
+   def ignored?
+     @result == :ignored
+   end
+@@ -1068,7 +1068,7 @@ class PkgResult
+ 
+     io.puts line
+   end
+-  
++
+   def self.legend(long = false)
+     if long
+       [:done, :ignored, :skipped, :error]
+@@ -1102,7 +1102,7 @@ class PkgResultSet < SimpleDelegator
+ 
+   def summary
+     count = Hash.new(0)
+-    
++
+     each do |result|
+       if result.done?
+         count[:done] += 1
-- 
2.43.2