--- qwrap.tcl.bak	2003-02-08 12:38:15.000000000 +0100
+++ qwrap.tcl	2004-04-29 10:44:45.592603700 +0200
@@ -64,11 +64,7 @@
 close $out
 # $sd.vfs/lib/app-...
-set out [open [file join $lib app-$sd $sd.tcl] w]
-puts $out $prog
-close $out
-
-if {![regexp "package.*provide.*app-$sd" $prog]} {
+if {![regexp "package\[ \r\n\t\]+provide\[ \r\n\t]+app-$sd" $prog]} {
     set prog "package provide app-$sd 1.0\n$prog"
 }
 set out [open [file join $lib app-$sd $sd.tcl] w]
@@ -77,7 +73,7 @@
 # create pkgIndex.tcl
-if {![regexp {package.*provide[^0-9]*([0-9\.]+)} $prog xx version]} {
+if {![regexp "package\[ \r\n\t\]+provide\[ \r\n\t]+app-$sd\[ \r\n\t\]+(\[0-9\\.\]+)" $prog xx version]} {
     set version 1.0
 }