aboutsummaryrefslogtreecommitdiff
path: root/audio/rubyripper/files/patch-rr_lib.rb
diff options
context:
space:
mode:
Diffstat (limited to 'audio/rubyripper/files/patch-rr_lib.rb')
-rw-r--r--audio/rubyripper/files/patch-rr_lib.rb54
1 files changed, 54 insertions, 0 deletions
diff --git a/audio/rubyripper/files/patch-rr_lib.rb b/audio/rubyripper/files/patch-rr_lib.rb
new file mode 100644
index 000000000000..b982f9446957
--- /dev/null
+++ b/audio/rubyripper/files/patch-rr_lib.rb
@@ -0,0 +1,54 @@
+--- rr_lib.rb.orig
++++ rr_lib.rb
+@@ -70,6 +70,7 @@
+ Thread.new do
+ if installed('eject') ; `eject #{cdrom}`
+ elsif installed('diskutil'); `diskutil eject #{cdrom}` #Mac users don't got eject, but diskutil
++ elsif installed('cdcontrol'); `cdcontrol -f #{cdrom} eject` #FreeBSD has cdcontrol(1) in the base system
+ else puts _("No eject utility found!")
+ end
+ end
+@@ -573,15 +574,15 @@
+ end
+ end
+
+- unless File.blockdev?(@cdrom) #is it a real device?
++ unless File.chardev?(@cdrom) #is it a real device?
+ @error = _("Cdrom drive %s does not exist on your system!\n"\
+ "Please configure your cdrom drive first.") % [@cdrom]
+ @query = false
+ return false
+ end
+
+- unless (File.readable?(@cdrom) && File.writable?(@cdrom))
+- @error = _("You don't have read and write permission\n"\
++ unless File.readable?(@cdrom)
++ @error = _("You don't have read permissions\n"\
+ "for device %s on your system! These permissions are\n"\
+ "necessary for cdparanoia to scan your drive.\n\n%s\n"\
+ "You might want to add yourself to the necessary group in /etc/group")\
+@@ -605,13 +606,13 @@
+ return true
+ end
+
+- unless ((File.chardev?(device) || File.blockdev?(device)) && File.readable?(device) && File.writable?(device))
++ unless ((File.chardev?(device) || File.blockdev?(device)) && File.readable?(device))
+ permission = nil
+ if File.chardev?(device) && installed('ls')
+ permission = `ls -l #{device}`
+ end
+
+- @error = _("You don't have read and write permission\n"\
++ @error = _("You don't have read permissions\n"\
+ "for device %s on your system! These permissions are\n"\
+ "necessary for cdparanoia to scan your drive.\n\n%s\n"\
+ "You might want to add yourself to the necessary group in /etc/group")\
+@@ -2524,7 +2525,7 @@
+ # 6) is req_matches_all <= req_matches_errors
+
+ def checkConfig
+- unless File.symlink?(@settings['cdrom']) || File.blockdev?(@settings['cdrom'])
++ unless File.symlink?(@settings['cdrom']) || File.chardev?(@settings['cdrom'])
+ @error = ["error", _("The device %s doesn't exist on your system!") % [@settings['cdrom']]]
+ return false
+ end