--- deliantra/Deliantra-Client/bin/cfplus	2007/09/01 07:22:21	1.226
+++ deliantra/Deliantra-Client/bin/cfplus	2007/09/02 09:48:42	1.227
@@ -1,9 +1,7 @@
 #!/opt/bin/perl
 
-my $startup_done = sub { };
-our $PANGO = "1.5.0";
-
 # do splash-screen thingy on win32
+my $startup_done = sub { };
 BEGIN {
    if (%PAR::LibCache && $^O eq "MSWin32") {
       while (my ($filename, $zip) = each %PAR::LibCache) {
@@ -32,38 +30,41 @@
    if (%PAR::LibCache) {
       @INC = grep ref, @INC; # weed out all paths except pars loader refs
 
-      my $tmp = $ENV{PAR_TEMP};
+      my $root = $ENV{PAR_TEMP};
 
       while (my ($filename, $zip) = each %PAR::LibCache) {
          for ($zip->memberNames) {
             next unless /^root\/(.*)/;
-            $zip->extractMember ($_, "$tmp/$1")
-               unless -e "$tmp/$1";
+            $zip->extractMember ($_, "$root/$1")
+               unless -e "$root/$1";
          }
       }
 
       if ($^O eq "MSWin32") {
-         # relocatable
+         # pango is relocatable on win32
       } else {
+         open my $fh, "<:perlio", "$root/pangoversion"
+            or die "pangoversion: $!";
+         my $PANGO = <$fh>;
          # unix, need to patch pango rc file
-         open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
-            or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
+         open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
+            or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
          local $/;
          my $rc = <$fh>;
-         $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
+         $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
 
-         mkdir "$tmp/pango-modules";
-         open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
-            or die "$tmp/pango-modules/pango.modules: $!";
+         mkdir "$root/pango-modules";
+         open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
+            or die "$root/pango-modules/pango.modules: $!";
          print $fh $rc;
 
-         $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
+         $ENV{PANGO_RC_FILE} = "$root/pango.rc";
          open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
             or die "$ENV{PANGO_RC_FILE}: $!";
-         print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
+         print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
       }
 
-      unshift @INC, $tmp;
+      unshift @INC, $root;
    }
 }