diff options
| -rw-r--r-- | lang/maude/Makefile | 9 | ||||
| -rw-r--r-- | lang/maude/distinfo | 6 | ||||
| -rw-r--r-- | lang/maude/files/patch-maude-data-dir.diff | 35 | ||||
| -rw-r--r-- | lang/maude/files/patch-src-Main-Makefile.am | 17 | ||||
| -rw-r--r-- | lang/maude/files/patch-src_Mixfix_main.cc | 26 | ||||
| -rw-r--r-- | lang/maude/pkg-plist | 2 |
6 files changed, 61 insertions, 34 deletions
diff --git a/lang/maude/Makefile b/lang/maude/Makefile index efce5ce86413..94c12d50f35b 100644 --- a/lang/maude/Makefile +++ b/lang/maude/Makefile @@ -6,8 +6,7 @@ # PORTNAME= maude -PORTVERSION= 2.2 -PORTREVISION= 1 +PORTVERSION= 2.3 CATEGORIES= lang MASTER_SITES= http://maude.cs.uiuc.edu/versions/${PORTVERSION}/ DISTNAME= Maude-${PORTVERSION} @@ -20,20 +19,20 @@ LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \ gmp:${PORTSDIR}/math/libgmp4 USE_BISON= build +USE_AUTOTOOLS= aclocal:19 automake:19 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --datadir=${DATADIR} post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ - ${WRKSRC}/src/Mixfix/main.cc + ${WRKSRC}/src/Mixfix/global.hh + .include <bsd.port.pre.mk> .if ${OSVERSION} < 600000 BROKEN= does not compile on 4.X or 5.X -.elif ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 .endif .include <bsd.port.post.mk> diff --git a/lang/maude/distinfo b/lang/maude/distinfo index 38ef0a556087..20bac4e8efc7 100644 --- a/lang/maude/distinfo +++ b/lang/maude/distinfo @@ -1,3 +1,3 @@ -MD5 (Maude-2.2.tar.gz) = c3b3cadec1ab792a64f0d441e56de15a -SHA256 (Maude-2.2.tar.gz) = 7b85941cb8441eeca23ed3ea291ea6ac9571ce09a9a28a2193e8414b1ca13118 -SIZE (Maude-2.2.tar.gz) = 8243200 +MD5 (Maude-2.3.tar.gz) = 7625750cf0ebba34506daf1802fbe49a +SHA256 (Maude-2.3.tar.gz) = 67e88d8440fafc67e1121139de496c70844279291e37ba9bee369d113a92fddb +SIZE (Maude-2.3.tar.gz) = 1441239 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 = "."; diff --git a/lang/maude/files/patch-src-Main-Makefile.am b/lang/maude/files/patch-src-Main-Makefile.am new file mode 100644 index 000000000000..9bc8ccfd1616 --- /dev/null +++ b/lang/maude/files/patch-src-Main-Makefile.am @@ -0,0 +1,17 @@ +--- src/Main/Makefile.am.orig 2008-08-11 01:13:04.000000000 +0200 ++++ src/Main/Makefile.am 2008-08-11 01:14:38.000000000 +0200 +@@ -1,5 +1,14 @@ + bin_PROGRAMS = maude + ++data_DATA = \ ++ prelude.maude \ ++ model-checker.maude \ ++ socket.maude \ ++ linear.maude \ ++ machine-int.maude \ ++ term-order.maude ++ ++ + if BUILD_COMPILER + FULL_COMPILER_LIB = ../FullCompiler/libfullCompiler.a + endif diff --git a/lang/maude/files/patch-src_Mixfix_main.cc b/lang/maude/files/patch-src_Mixfix_main.cc deleted file mode 100644 index 96138bd9b679..000000000000 --- a/lang/maude/files/patch-src_Mixfix_main.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- src/Mixfix/main.cc.orig Wed Apr 5 22:46:48 2006 -+++ src/Mixfix/main.cc Wed Apr 5 22:49:23 2006 -@@ -284,6 +284,11 @@ - directory = "."; - return true; - } -+ if (directoryManager.checkAccess("%%DATADIR%%", fileName, R_OK)) -+ { -+ directory = "%%DATADIR%%"; -+ return true; -+ } - IssueWarning(LineNumber(FileTable::AUTOMATIC) << - ": unable to locate file: " << QUOTE(fileName)); - return false; -@@ -307,6 +312,11 @@ - directoryManager.checkAccess(executableDirectory, fileName, R_OK, ext)) - { - directory = executableDirectory; -+ return true; -+ } -+ if (directoryManager.checkAccess("%%DATADIR%%", fileName, R_OK)) -+ { -+ directory = "%%DATADIR%%"; - return true; - } - } diff --git a/lang/maude/pkg-plist b/lang/maude/pkg-plist index efcc928aa1de..02184c669162 100644 --- a/lang/maude/pkg-plist +++ b/lang/maude/pkg-plist @@ -1,6 +1,8 @@ bin/maude %%DATADIR%%/linear.maude +%%DATADIR%%/machine-int.maude %%DATADIR%%/model-checker.maude %%DATADIR%%/prelude.maude %%DATADIR%%/socket.maude +%%DATADIR%%/term-order.maude @dirrm %%DATADIR%% |