- Fix sed errors when burning an iso

- Change default cdrom device to /dev/cd0

Reported by:	Peter Vereshagin <peter at vereshagin dot org>

3 files changed, 41 insertions, 0 deletions

diff --git a/sysutils/tkdvd/Makefile b/sysutils/tkdvd/Makefile
index 9b6cb0a68b23..9049de8de096 100644
--- a/sysutils/tkdvd/Makefile
+++ b/sysutils/tkdvd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tkdvd
 PORTVERSION=	4.0.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://regis.damongeot.free.fr/tkdvd/dl/ \
 		http://mirror.amdmi3.ru/
@@ -36,6 +37,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/install.tcl \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|wish|${WISH}|' ${WRKSRC}/TkDVD.sh
+	@${REINPLACE_CMD} -e 's|/dev/sr0|/dev/cd0|' ${WRKSRC}/TkDVD.sh \
+		${WRKSRC}/src/save_load_options.tcl
 
 do-build:
 	cd ${WRKSRC} && ${TCLSH} install.tcl
diff --git a/sysutils/tkdvd/files/patch-src-other_procedures.tcl b/sysutils/tkdvd/files/patch-src-other_procedures.tcl
new file mode 100644
index 000000000000..9dab7ac243d4
--- /dev/null
+++ b/sysutils/tkdvd/files/patch-src-other_procedures.tcl
@@ -0,0 +1,18 @@
+--- src/other_procedures.tcl.orig	2008-08-30 13:43:00.000000000 +0400
++++ src/other_procedures.tcl	2009-02-17 00:56:27.000000000 +0300
+@@ -448,7 +448,7 @@
+ 		button .create_iso_window.f_dest_file.b_mess -highlightbackground blue -text "$i18n_choose_target_file" -command { set dest_file [tk_getSaveFile -filetypes {{ {ISO Image} { .iso } } {{All Files}  * } } -defaultextension .iso] }
+ 		entry .create_iso_window.f_dest_file.e_fp  -relief flat -highlightbackground blue -highlightcolor blue -readonlybackground #f5f5f5 -state readonly -textvariable dest_file -width 57
+ 	
+-		button .create_iso_window.b_create -highlightbackground red -text "$i18n_create" -command { if { $dest_file == "" } { tk_messageBox -icon error -message $i18n_error_target_file_ns -type ok -title $i18n_error } else {launch "create_iso" "[exec echo $dest_file | sed s/\ /\\\\\ /g -]"; destroy .create_iso_window} }
++		button .create_iso_window.b_create -highlightbackground red -text "$i18n_create" -command { if { $dest_file == "" } { tk_messageBox -icon error -message $i18n_error_target_file_ns -type ok -title $i18n_error } else {launch "create_iso" "[exec echo $dest_file | sed s/\ /\\\\\ /g]"; destroy .create_iso_window} }
+ 		button .create_iso_window.b_close -highlightbackground red -text "$i18n_close" -command { destroy .create_iso_window}
+ 	
+ 		pack .create_iso_window.f_dest_file.b_mess -side left -padx {12 12}
+@@ -565,4 +565,4 @@
+ 		}
+ 	}
+ 	return "no"
+-}
+\ No newline at end of file
++}
diff --git a/sysutils/tkdvd/files/patch-src-proc_refresh_cmd_line.tcl b/sysutils/tkdvd/files/patch-src-proc_refresh_cmd_line.tcl
new file mode 100644
index 000000000000..5fc233023b15
--- /dev/null
+++ b/sysutils/tkdvd/files/patch-src-proc_refresh_cmd_line.tcl
@@ -0,0 +1,20 @@
+--- src/proc_refresh_cmd_line.tcl.orig	2008-03-28 15:15:04.000000000 +0300
++++ src/proc_refresh_cmd_line.tcl	2009-02-15 15:27:07.000000000 +0300
+@@ -127,13 +127,13 @@
+ 				set local_burn_speed ""
+ 			}
+ 			if { $dvd_size <= 716800 } {
+-				set command_line "$burn_command $option_overburn $local_burn_speed $option_eject_cd  $option_tao_dao_cd dev=$burning_device [exec echo $iso_file | sed s/\ /\\\\\ /g -]"
++				set command_line "$burn_command $option_overburn $local_burn_speed $option_eject_cd  $option_tao_dao_cd dev=$burning_device [exec echo $iso_file | sed s/\ /\\\\\ /g]"
+ 			} else {
+-				set command_line "$burn_command $option_dvd_compat $local_burn_speed $option_overburn $t_session $burning_device=[exec echo $iso_file | sed s/\ /\\\\\ /g -]"
++				set command_line "$burn_command $option_dvd_compat $local_burn_speed $option_overburn $t_session $burning_device=[exec echo $iso_file | sed s/\ /\\\\\ /g]"
+ 			}
+ 			if { [.f_burn.go_button cget -state] == "disabled" } { .f_burn.go_button configure -state normal }
+ 		}
+ 	} else { set command_line "growisofs/cdrecord is currently working" }
+ 	if {($t_session == "-M" && $space_left_f != "N/A") || ($t_session == "-use-the-force-luke=tty -Z" && $space_left_f == "N/A") } { refresh_total_file_size }
+ 	return 1
+-}
+\ No newline at end of file
++}