diff options
author | Michael Scheidell <scheidell@FreeBSD.org> | 2011-12-03 20:41:56 +0000 |
---|---|---|
committer | Michael Scheidell <scheidell@FreeBSD.org> | 2011-12-03 20:41:56 +0000 |
commit | 67fac3c3e76b822576d4da2df4ee06cebe39d556 (patch) | |
tree | b89548f60d309159191248267bc2bb802d5aab4d /lang/maude/files/patch-maude-data-dir.diff | |
parent | -hasunsetenv test fails because main() has wrong return type (diff) |
- Update to 2.6.
- Make all files in ${DATADIR} loadable by filename without an explicit path,
and without setting MAUDE_LIB. Currently only
${DATADIR}/prelude.maude is loaded (during startup).
- Add option FULL_MAUDE (default: on) for user convenience. This
installs full-maude26b.maude into ${DATADIR}.
- previous maintainer turns port over to committer
PR: ports/162955
Submitted by: joemann@beefree.free.de
Reviewed by: info@rickvanderzwet.nl
Approved by: maintainer, gabor(mentor)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=286822
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, 0 insertions, 35 deletions
diff --git a/lang/maude/files/patch-maude-data-dir.diff b/lang/maude/files/patch-maude-data-dir.diff deleted file mode 100644 index bd85a4191571..000000000000 --- a/lang/maude/files/patch-maude-data-dir.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 = "."; |