sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch

   1 diff -U 3 -dHrN M2source/Macaulay2/packages/FourTiTwo.m2 M2source.patch/Macaulay2/packages/FourTiTwo.m2
   2 --- M2source/Macaulay2/packages/FourTiTwo.m2    2011-09-22 14:36:51.000000000 +0100
   3 +++ M2source.patch/Macaulay2/packages/FourTiTwo.m2      2011-09-24 21:24:12.000000000 +0100
   4 @@ -47,7 +47,7 @@
   5
   6  path'4ti2 = (options FourTiTwo).Configuration#"path"
   7  -- NOTE: the absolute path should be put into the .init file for 4ti2 inside the .Macaulay2 directory.
   8 -if path'4ti2 == "" then path'4ti2 = prefixDirectory | currentLayout#"programs"
   9 +if path'4ti2 == "" then path'4ti2 = "/usr/bin/"
  10
  11  getFilename = () -> (
  12       filename := temporaryFileName();
  13 diff -U 3 -dHrN M2source/Macaulay2/packages/gfanInterface.m2 M2source.patch/Macaulay2/packages/gfanInterface.m2
  14 --- M2source/Macaulay2/packages/gfanInterface.m2        2011-05-14 12:00:59.000000000 +0100
  15 +++ M2source.patch/Macaulay2/packages/gfanInterface.m2  2011-09-24 21:24:12.000000000 +0100
  16 @@ -25,7 +25,7 @@
  17       }
  18
  19  gfan'path = gfanInterface#Options#Configuration#"path"
  20 -if gfan'path == "" then gfan'path = prefixDirectory | currentLayout#"programs"
  21 +if gfan'path == "" then gfan'path = "/usr/bin/"
  22  if instance(gfan'path, String) then gfan'path = {gfan'path}
  23  if not instance(gfan'path,List) then error "expected configuration option gfan'path to be a list of strings or a string"
  24  gfan'path = join(
  25 diff -U 3 -dHrN M2source/Macaulay2/packages/NautyGraphs.m2 M2source.patch/Macaulay2/packages/NautyGraphs.m2
  26 --- M2source/Macaulay2/packages/NautyGraphs.m2  2011-08-26 11:05:30.000000000 +0100
  27 +++ M2source.patch/Macaulay2/packages/NautyGraphs.m2    2011-09-24 21:25:53.000000000 +0100
  28 @@ -32,7 +32,7 @@
  29  -- Check the ~/.Macaulay2/init-NautyGraphs.m2 file for the absolute path.
  30  -- If it's not there, then use the M2-Programs directory.
  31  nauty'path = (options NautyGraphs).Configuration#"path";
  32 -if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
  33 +if nauty'path == "" then nauty'path = "/usr/bin/";
  34
  35  -------------------
  36  -- Exports
  37 diff -U 3 -dHrN M2source/Macaulay2/packages/Nauty.m2 M2source.patch/Macaulay2/packages/Nauty.m2
  38 --- M2source/Macaulay2/packages/Nauty.m2        2011-08-26 11:05:30.000000000 +0100
  39 +++ M2source.patch/Macaulay2/packages/Nauty.m2  2011-09-24 21:24:12.000000000 +0100
  40 @@ -48,7 +48,8 @@
  41  -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path.
  42  -- If it's not there, then use the M2-Programs directory.
  43  nauty'path = (options Nauty).Configuration#"path";
  44 -if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
  45 +if nauty'path == "" then nauty'path = "/usr/bin/";
  46 +
  47
  48  -------------------
  49  -- Exports
  50 diff -U 3 -dHrN M2source/Macaulay2/packages/Normaliz.m2 M2source.patch/Macaulay2/packages/Normaliz.m2
  51 --- M2source/Macaulay2/packages/Normaliz.m2     2011-05-25 16:47:50.000000000 +0100
  52 +++ M2source.patch/Macaulay2/packages/Normaliz.m2       2011-09-24 21:24:12.000000000 +0100
  53 @@ -166,7 +166,7 @@
  54          nmzExec="normaliz";
  55      );
  56  --    return nmzExec;
  57 -    return prefixDirectory | currentLayout#"programs" | nmzExec;
  58 +    return "/usr/bin/" | nmzExec;
  59  );
  60
  61
  62 diff -U 3 -dHrN M2source/Macaulay2/packages/StatePolytope.m2 M2source.patch/Macaulay2/packages/StatePolytope.m2
  63 --- M2source/Macaulay2/packages/StatePolytope.m2        2010-09-10 16:47:20.000000000 +0100
  64 +++ M2source.patch/Macaulay2/packages/StatePolytope.m2  2011-09-24 21:24:12.000000000 +0100
  65 @@ -31,7 +31,7 @@
  66
  67
  68  gfanCommand = (options StatePolytope)#Configuration#"gfan command"
  69 -if gfanCommand === "gfan" then gfanCommand = prefixDirectory | currentLayout#"programs" | gfanCommand
  70 +if gfanCommand === "gfan" then gfanCommand = "/usr/bin/" | gfanCommand
  71  gfanCommand = "!" | gfanCommand
  72
  73  --The next two functions print out the ring and the ideal in the format required by gfan