freewrl-system-js.patch

   1 --- FreeWRL-1.13/Makefile.PL.orig       2005-04-25 15:47:19.000000000 +0200
   2 +++ FreeWRL-1.13/Makefile.PL    2005-04-28 22:16:18.330867064 +0200
   3 @@ -76,8 +76,6 @@
   4
   5  my $sitearchjsdir = "\$(INSTALLPRIVLIB)/auto/VRML/JS";
   6
   7 -my $jsdir = "js1.5/src";
   8 -my $jsobjdir;
   9  my $BUILD_OPT;
  10
  11  my $warnings_high = qq{-Wunreachable-code -Wshadow -Wcast-align};
  12 @@ -88,25 +86,11 @@
  13  my @inc;
  14  my @libs;
  15  my @ldflags;
  16 -my @jsinc;
  17 -my @jslibs;
  18
  19
  20 -if ($VRML_CONFIG{PLATFORM} =~ /irix/i) {
  21 -       $jsobjdir = "$jsdir/IRIX6.5";
  22 -} elsif ($OS eq "Darwin") {
  23 -       $jsobjdir = "$jsdir/Darwin_All";
  24 -} elsif ($VRML_CONFIG{PLATFORM} =~ /sunos/i) {
  25 -       $jsobjdir = "$jsdir/SunOS5.8";
  26 -} else { ## linux used by default
  27 -       $jsobjdir = "$jsdir/Linux_All";
  28 -}
  29 -
  30  if ($VRML_CONFIG{DEBUG} eq "on") {
  31 -       $jsobjdir .= "_DBG.OBJ";
  32         $BUILD_OPT = 0;
  33  } else {
  34 -       $jsobjdir .= "_OPT.OBJ";
  35         $BUILD_OPT = 1;
  36  }
  37
  38 @@ -151,9 +135,8 @@
  39  }
  40
  41  push @inc, $VRML_CONFIG{FREEWRL_INC},
  42 -       "-I../JS/$jsobjdir", "-IJS/$jsobjdir", "-IJS/$jsdir", "-I../JS/$jsdir -ICFuncs";
  43 -push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-L../JS/$jsobjdir", "-LJS/$jsobjdir", "-Lblib/arch/auto/VRML/VRMLFunc/", "-ljs";
  44 -push @ldflags, $VRML_CONFIG{LDFLAGS}, "-LJS/$jsobjdir", "-Lblib/arch/auto/VRML/VRMLFunc/";
  45 +       "-I/usr/include/js", "-ICFuncs";
  46 +push @libs, $VRML_CONFIG{FREEWRL_LIBS}, "-ljs";
  47
  48  # push build directory, for running standalone
  49
  50 @@ -244,16 +227,6 @@
  51
  52  print STDERR "Checking for the Mozilla JavaScript Reference library and application.\n";
  53
  54 -if (-e "JS/$jsobjdir/libjs.a" && -e "JS/$jsobjdir/libjs.so" && -e "JS/$jsobjdir/js") {
  55 -    print STDERR "The Javascript library and application were found.\n";
  56 -} else {
  57 -    print STDERR "The Javascript library and application were not found - make them.\n";
  58 -
  59 -    chdir("JS/$jsdir");
  60 -    system("make -f Makefile.ref BUILD_OPT=$BUILD_OPT");
  61 -    chdir($pwd);
  62 -}
  63 -
  64  print "Done, now doing writeMakefile\n";
  65
  66  use ExtUtils::MakeMaker;
  67 @@ -402,9 +375,8 @@
  68                 # Copy fonts over, etc.
  69                 push(@postamble, join(
  70                                   "\n",
  71 -                               qq{\# copy fonts, libjs.so over\n},
  72 +                               qq{\# copy fonts over\n},
  73                                 qq{\tcp -r fonts \$(DESTINSTALLPRIVLIB)/VRML\n},
  74 -                               qq{\tcp JS/$jsobjdir/libjs.so \$(DESTDIR)$LIB_DIR\n},
  75                                 qq{\# copy copy the initialization file over\n},
  76                                 qq{\tcp CFrontEnd/fw2init.pl \$(DESTINSTALLPRIVLIB)/VRML\n},
  77                                 ));
  78 @@ -412,8 +384,6 @@
  79                         push(@postamble, join(
  80                                 "\n",
  81                                 qq{# make the libFreeWRLFunc shared library active\n},
  82 -                               qq{\tcp blib/arch/auto/VRML/VRMLFunc/VRMLFunc.so \$(DESTDIR)$LIB_DIR/libFreeWRLFunc.so\n},
  83 -                               qq{\t/sbin/ldconfig\n}
  84                         ));
  85                 }
  86                 if ($OS eq "Darwin") {
  87 @@ -462,11 +432,6 @@
  88                 ###################################################
  89                 # lets do the clean:: targets at this step.
  90                 ###################################################
  91 -               push(@postamble, join(
  92 -                         "\n",
  93 -                         qq{clean ::},
  94 -                         qq{\tcd JS/$jsdir && \$(MAKE) -f Makefile.ref BUILD_OPT=$BUILD_OPT clean\n},
  95 -                        ));
  96                 if ($OS ne "Darwin") {
  97                         push(@postamble, join(
  98                           "\n",
  99 @@ -479,11 +444,6 @@
 100                 ###################################################
 101                 # lets do the distclean:: targets at this step.
 102                 ###################################################
 103 -               push(@postamble, join(
 104 -                         "\n",
 105 -                         qq{distclean :: realclean},
 106 -                         qq{\tcd JS/$jsdir && \$(MAKE) -f Makefile.ref BUILD_OPT=$BUILD_OPT clobber},
 107 -                        ));
 108                 if ($OS ne "Darwin") {
 109                         push(@postamble, join(
 110                           "\n",
 111 @@ -504,8 +464,6 @@
 112                 if ($OS eq "Linux") {
 113                         push(@postamble, join(
 114                                 "\n",
 115 -                               #qq{\tcp blib/arch/auto/VRML/VRMLFunc/VRMLFunc.so $LIB_DIR/libFreeWRLFunc.so\n},
 116 -                               #qq{\t/sbin/ldconfig\n}
 117                                 qq{\t\tcp -f blib/arch/auto/VRML/VRMLFunc/VRMLFunc.so blib/arch/auto/VRML/VRMLFunc/libFreeWRLFunc.so\n},
 118                         ));
 119                 }