| 1 |
markusle 08/04/21 14:39:29 |
| 2 |
|
| 3 |
Added: singular-3.0.4.2-gentoo.diff |
| 4 |
Removed: singular-2.0.5-r3-gentoo.diff |
| 5 |
Log: |
| 6 |
Version bump and removed old versions. |
| 7 |
(Portage version: 2.1.5_rc3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: singular-3.0.4.2-gentoo.diff |
| 16 |
=================================================================== |
| 17 |
diff -Naur Singular-3-0-4/kernel/feResource.cc Singular-3-0-4.new/kernel/feResource.cc |
| 18 |
--- Singular-3-0-4/kernel/feResource.cc 2008-03-19 13:44:08.000000000 -0400 |
| 19 |
+++ Singular-3-0-4.new/kernel/feResource.cc 2008-04-21 09:10:53.000000000 -0400 |
| 20 |
@@ -41,7 +41,7 @@ |
| 21 |
#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1 |
| 22 |
#endif |
| 23 |
#else // ! defined(MAKE_DISTRIBUTION) |
| 24 |
-#define SINGULAR_DEFAULT_DIR S_ROOT_DIR |
| 25 |
+#define SINGULAR_DEFAULT_DIR "/usr" |
| 26 |
#endif // defined(MAKE_DISTRIBUTION) |
| 27 |
|
| 28 |
/***************************************************************** |
| 29 |
@@ -73,33 +73,31 @@ |
| 30 |
{ |
| 31 |
{"SearchPath", 's', feResPath, NULL, |
| 32 |
"$SINGULARPATH;" |
| 33 |
- "%b/LIB;" |
| 34 |
- "%b/MOD;" |
| 35 |
+ "%r/share/singular/MOD;" |
| 36 |
"%r/LIB;" |
| 37 |
- "%r/../LIB;" |
| 38 |
+ "%r/share/singular/LIB;" |
| 39 |
"%d/LIB;" |
| 40 |
- "%d/../LIB" |
| 41 |
""}, |
| 42 |
- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",""}, |
| 43 |
- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME ""}, |
| 44 |
- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", ""}, |
| 45 |
+ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/bin/Singular",""}, |
| 46 |
+ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin" ""}, |
| 47 |
+ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%d", ""}, |
| 48 |
{"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, ""}, |
| 49 |
- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", ""}, |
| 50 |
- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", ""}, |
| 51 |
- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/html", ""}, |
| 52 |
+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/singular/singular.hlp", ""}, |
| 53 |
+ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/share/singular/singular.idx", ""}, |
| 54 |
+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/share/doc/PFSUBST/html", ""}, |
| 55 |
#ifdef ix86_Win |
| 56 |
{"HtmlHelpFile", 'C', feResFile, "SINGULAR_CHM_FILE", "%r/doc/Manual.chm", ""}, |
| 57 |
#endif |
| 58 |
{"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "http://www.singular.uni-kl.de/Manual/"S_VERSION1, ""}, |
| 59 |
- {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", ""}, |
| 60 |
+ {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples", ""}, |
| 61 |
{"Path", 'p', feResPath, NULL, "%b;$PATH", ""}, |
| 62 |
|
| 63 |
#ifdef ESINGULAR |
| 64 |
{"emacs", 'E', feResBinary, "ESINGULAR_EMACS", "%b/emacs", ""}, |
| 65 |
{"xemacs", 'A', feResBinary, "ESINGULAR_EMACS", "%b/xemacs", ""}, |
| 66 |
{"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR", "%b/Singular", ""}, |
| 67 |
- {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", ""}, |
| 68 |
- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", ""}, |
| 69 |
+ {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/singular/emacs/.emacs-singular", ""}, |
| 70 |
+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/singular/emacs", ""}, |
| 71 |
#elif defined(TSINGULAR) |
| 72 |
{"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR", "%b/Singular", ""}, |
| 73 |
#ifdef ix86_Win |
| 74 |
@@ -108,7 +106,7 @@ |
| 75 |
{"xterm", 'X', feResBinary,"XTERM", "%b/xterm", ""}, |
| 76 |
#endif |
| 77 |
#else |
| 78 |
- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", ""}, |
| 79 |
+ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/singular/emacs", ""}, |
| 80 |
#endif |
| 81 |
{NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record |
| 82 |
}; |
| 83 |
diff -Naur Singular-3-0-4/kernel/mod_raw.cc Singular-3-0-4.new/kernel/mod_raw.cc |
| 84 |
--- Singular-3-0-4/kernel/mod_raw.cc 2008-03-19 13:44:10.000000000 -0400 |
| 85 |
+++ Singular-3-0-4.new/kernel/mod_raw.cc 2008-04-21 09:10:53.000000000 -0400 |
| 86 |
@@ -111,11 +111,11 @@ |
| 87 |
void* dynl_open_binary_warn(char* binary_name, const char* msg) |
| 88 |
{ |
| 89 |
void* handle = NULL; |
| 90 |
- const char* bin_dir = feGetResource('b'); |
| 91 |
+ const char* bin_dir = feGetResource('r'); |
| 92 |
if (bin_dir != NULL) |
| 93 |
{ |
| 94 |
char path_name[MAXPATHLEN]; |
| 95 |
- sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, |
| 96 |
+ sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name, |
| 97 |
DL_TAIL); |
| 98 |
handle = dynl_open(path_name); |
| 99 |
if (handle == NULL && ! warn_handle) |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
-- |
| 104 |
gentoo-commits@l.g.o mailing list |
Archives