diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2008-08-15 00:34:02 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2008-08-15 00:34:02 +0000 |
| commit | e26e1fd281ecca951e642436c2f2d2cfe7489a6f (patch) | |
| tree | 11edd670f3e6b7dcb4d29cad5f5e022eeb8ef85d /lang/maude/files/patch-maude-data-dir.diff | |
| parent | [maintainer update] mail/heirloom-mailx: update to 12.4 (diff) | |
Update port: lang/maude 2.2 -> 2.3
Maude 2.3 is compiles under 4.2 again, so port does not
need to be marked as broken anymore.
Quite a few hacks to get it installing properly:
* Coder forgot to include the *.maude files into the
Makefile.am while porting files into the MixFix directory
to Main directory. Included again, which explains the current
need of aclocal and automake to regenerate the Makefiles
* Project requires MAUDE_LIB env to be set to the location
of %%DATADIR%% which is quite cumbersome, introduced
MAUDE_DATA_DIR into the code to get rid of the non handy
environment variable.
PR: ports/126438
Submitted by: Rick van der Zwet <rick@wzoeterwoude.net>
Notes
Notes:
svn path=/head/; revision=218576
Diffstat (limited to 'lang/maude/files/patch-maude-data-dir.diff')
| -rw-r--r-- | lang/maude/files/patch-maude-data-dir.diff | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/lang/maude/files/patch-maude-data-dir.diff b/lang/maude/files/patch-maude-data-dir.diff new file mode 100644 index 000000000000..bd85a4191571 --- /dev/null +++ b/lang/maude/files/patch-maude-data-dir.diff @@ -0,0 +1,35 @@ +--- src/Mixfix/global.hh.orig 2008-08-11 02:03:45.000000000 +0200 ++++ src/Mixfix/global.hh 2008-08-11 02:04:25.000000000 +0200 +@@ -36,6 +36,7 @@ + + #define PRELUDE_NAME "prelude.maude" + #define MAUDE_LIB "MAUDE_LIB" ++#define MAUDE_DATA_DIR "%%DATADIR%%" + + bool + findPrelude(string& directory, string& fileName); +--- src/Mixfix/global.cc.orig 2008-08-11 01:48:58.000000000 +0200 ++++ src/Mixfix/global.cc 2008-08-11 01:53:15.000000000 +0200 +@@ -81,6 +81,8 @@ + directory = "."; + if (directoryManager.checkAccess(directory, fileName, R_OK, ext)) + return true; ++ if (directoryManager.checkAccess(MAUDE_DATA_DIR, fileName, R_OK, ext)) ++ return true; + if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK, ext)) + return true; + if (!(executableDirectory.empty()) && +--- src/Main/main.cc.orig 2008-08-11 01:48:40.000000000 +0200 ++++ src/Main/main.cc 2008-08-11 01:55:01.000000000 +0200 +@@ -267,6 +267,11 @@ + directory = executableDirectory; + return true; + } ++ if (directoryManager.checkAccess(MAUDE_DATA_DIR, fileName, R_OK)) ++ { ++ directory = MAUDE_DATA_DIR; ++ return true; ++ } + if (directoryManager.checkAccess(".", fileName, R_OK)) + { + directory = "."; |