PageRenderTime 22ms CodeModel.GetById 0ms RepoModel.GetById 0ms app.codeStats 0ms

/sci-libs/libsingular/files/singular-3.1.0-gentoo.patch

https://bitbucket.org/remustata/lmnd-prefix
Patch | 81 lines | 79 code | 2 blank | 0 comment | 0 complexity | 3e0b407be6c4ad91435fb8a10b189f14 MD5 | raw file
    

  1. --- kernel/feResource.cc.orig	2010-04-30 10:20:14.000000000 +0000
    2. 

  2. +++ kernel/feResource.cc	2010-10-11 09:19:01.431179334 +0000
    3. 

  3. @@ -41,7 +41,7 @@
    4. 

  4.  #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
    5. 

  5.  #endif
    6. 

  6.  #else // ! defined(MAKE_DISTRIBUTION)
    7. 

  7. -#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
    8. 

  8. +#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr"
    9. 

  9.  #endif // defined(MAKE_DISTRIBUTION)
    10. 

  10.  
    11. 

  11.  /*****************************************************************
    12. 

  12. @@ -73,33 +73,31 @@
    13. 

  13.  {
    14. 

  14.    {"SearchPath",    's', feResPath,  NULL,
    15. 

  15.     "$SINGULARPATH;"
    16. 

  16. -   "%b/LIB;"
    17. 

  17. -   "%b/MOD;"
    18. 

  18. +   "%r/share/singular/MOD;"
    19. 

  19.     "%r/LIB;"
    20. 

  20. -   "%r/../LIB;"
    21. 

  21. +   "%r/share/singular/LIB;"
    22. 

  22.     "%d/LIB;"
    23. 

  23. -   "%d/../LIB"
    24. 

  24.     ""},
    25. 

  25. -  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
    26. 

  26. -  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
    27. 

  27. -  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
    28. 

  28. +  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular",(char *)""},
    29. 

  29. +  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",           (char *)""},
    30. 

  30. +  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                (char *)""},
    31. 

  31.    {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
    32. 

  32. -  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", (char *)""},
    33. 

  33. -  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  (char *)""},
    34. 

  34. -  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              (char *)""},
    35. 

  35. +  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/share/info/singular.info.bz2", (char *)""},
    36. 

  36. +  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/share/singular/singular.idx",  (char *)""},
    37. 

  37. +  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/share/doc/PFSUBST/html",              (char *)""},
    38. 

  38.  #ifdef ix86_Win
    39. 

  39.    {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
    40. 

  40.  #endif
    41. 

  41.    {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    (char *)""},
    42. 

  42. -  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
    43. 

  43. +  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples",          (char *)""},
    44. 

  44.    {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
    45. 

  45.  
    46. 

  46.  #ifdef ESINGULAR
    47. 

  47.    {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
    48. 

  48.    {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
    49. 

  49.    {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
    50. 

  50. -  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
    51. 

  51. -  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
    52. 

  52. +  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular",   (char *)""},
    53. 

  53. +  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/share/emacs/site-lisp/singular",             (char *)""},
    54. 

  54.  #elif defined(TSINGULAR)
    55. 

  55.    {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
    56. 

  56.  #ifdef ix86_Win
    57. 

  57. @@ -108,7 +106,7 @@
    58. 

  58.    {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
    59. 

  59.  #endif
    60. 

  60.  #else
    61. 

  61. -  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
    62. 

  62. +  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/emacs/site-lisp/singular",             (char *)""},
    63. 

  63.  #endif
    64. 

  64.    {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
    65. 

  65.  };
    66. 

  66. --- kernel/mod_raw.cc.orig	2009-11-02 10:12:22.000000000 +0000
    67. 

  67. +++ kernel/mod_raw.cc	2010-10-11 09:19:01.432179264 +0000
    68. 

  68. @@ -109,11 +109,11 @@
    69. 

  69.  void* dynl_open_binary_warn(const char* binary_name, const char* msg)
    70. 

  70.  {
    71. 

  71.    void* handle = NULL;
    72. 

  72. -  const char* bin_dir = feGetResource('b');
    73. 

  73. +  const char* bin_dir = feGetResource('r');
    74. 

  74.    if (bin_dir != NULL)
    75. 

  75.    {
    76. 

  76.      char path_name[MAXPATHLEN];
    77. 

  77. -    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name,
    78. 

  78. +    sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name,
    79. 

  79.              DL_TAIL);
    80. 

  80.      handle = dynl_open(path_name);
    81. 

  81.      if (handle == NULL && ! warn_handle)
    82. 

    83.