diff options
author | Thomas Kahle <tomka@gentoo.org> | 2011-01-19 08:19:10 +0000 |
---|---|---|
committer | Thomas Kahle <tomka@gentoo.org> | 2011-01-19 08:19:10 +0000 |
commit | 1b763b73de079f99ddc302444e3dff7be1015452 (patch) | |
tree | 94da0992b06c42da1cf8e7f6d9dcbfb19339bc77 /sci-mathematics | |
parent | Fix ChangeLog (diff) | |
download | gentoo-2-1b763b73de079f99ddc302444e3dff7be1015452.tar.gz gentoo-2-1b763b73de079f99ddc302444e3dff7be1015452.tar.bz2 gentoo-2-1b763b73de079f99ddc302444e3dff7be1015452.zip |
Fix prefix install, thanks to François Bissey
(Portage version: 2.1.9.33/cvs/Linux i686)
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/singular/ChangeLog | 6 | ||||
-rw-r--r-- | sci-mathematics/singular/files/singular-3.1.0-gentoo.patch | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog index 68d35561cdc0..9b3427fd3402 100644 --- a/sci-mathematics/singular/ChangeLog +++ b/sci-mathematics/singular/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/singular # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.39 2011/01/10 20:34:49 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.40 2011/01/19 08:19:10 tomka Exp $ + + 19 Jan 2011; Thomas Kahle <tomka@gentoo.org> + files/singular-3.1.0-gentoo.patch: + Fix prefix install, thanks to François Bissey 10 Jan 2011; Thomas Kahle <tomka@gentoo.org> singular-3.1.2-r2.ebuild: macos prefix support added, contributed by François Bissey diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch index ecfba313e149..ebb402289386 100644 --- a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch +++ b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch @@ -1,12 +1,11 @@ -diff -Naur Singular-3-1-0/kernel/feResource.cc Singular-3-1-0.new/kernel/feResource.cc ---- Singular-3-1-0/kernel/feResource.cc 2009-06-04 04:11:42.000000000 -0400 -+++ Singular-3-1-0.new/kernel/feResource.cc 2009-08-23 19:05:00.000000000 -0400 +--- kernel/feResource.cc.orig 2010-04-30 10:20:14.000000000 +0000 ++++ kernel/feResource.cc 2010-10-11 09:19:01.431179334 +0000 @@ -41,7 +41,7 @@ #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1 #endif #else // ! defined(MAKE_DISTRIBUTION) -#define SINGULAR_DEFAULT_DIR S_ROOT_DIR -+#define SINGULAR_DEFAULT_DIR "/usr" ++#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr" #endif // defined(MAKE_DISTRIBUTION) /***************************************************************** @@ -64,9 +63,8 @@ diff -Naur Singular-3-1-0/kernel/feResource.cc Singular-3-1-0.new/kernel/feResou #endif {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record }; -diff -Naur Singular-3-1-0/kernel/mod_raw.cc Singular-3-1-0.new/kernel/mod_raw.cc ---- Singular-3-1-0/kernel/mod_raw.cc 2009-06-04 06:18:12.000000000 -0400 -+++ Singular-3-1-0.new/kernel/mod_raw.cc 2009-08-23 19:04:22.000000000 -0400 +--- kernel/mod_raw.cc.orig 2009-11-02 10:12:22.000000000 +0000 ++++ kernel/mod_raw.cc 2010-10-11 09:19:01.432179264 +0000 @@ -109,11 +109,11 @@ void* dynl_open_binary_warn(const char* binary_name, const char* msg) { |