Attachment #146744 for bug #191049

Lines 3-8 Link Here

(-)/usr/ports/lang/maude/Makefile (-3 / +19 lines)
3		3
4	PORTNAME= maude	4	PORTNAME= maude
5	PORTVERSION= 2.6	5	PORTVERSION= 2.6
		6	PORTREVISION= 1
6	CATEGORIES= lang	7	CATEGORIES= lang
7	MASTER_SITES= http://maude.cs.uiuc.edu/versions/${PORTVERSION}/	8	MASTER_SITES= http://maude.cs.uiuc.edu/versions/${PORTVERSION}/
8	DISTNAME= Maude-${PORTVERSION}	9	DISTNAME= Maude-${PORTVERSION}
Lines 10-15 Link Here
10	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
11	COMMENT= High-performance reflective language	12	COMMENT= High-performance reflective language
12		13
		14	LICENSE= GPLv2
		15	LICENSE_FILE= ${WRKSRC}/COPYING
		16
		17	BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
13	LIB_DEPENDS= libbdd.so:${PORTSDIR}/science/buddy \	18	LIB_DEPENDS= libbdd.so:${PORTSDIR}/science/buddy \
14	libtecla.so:${PORTSDIR}/devel/libtecla \	19	libtecla.so:${PORTSDIR}/devel/libtecla \
15	libgmp.so:${PORTSDIR}/math/gmp \	20	libgmp.so:${PORTSDIR}/math/gmp \
Lines 22-37 Link Here
22	CPPFLAGS+= -I${LOCALBASE}/include	27	CPPFLAGS+= -I${LOCALBASE}/include
23	LDFLAGS+= -L${LOCALBASE}/lib	28	LDFLAGS+= -L${LOCALBASE}/lib
24	CONFIGURE_ARGS= --datadir=${DATADIR}	29	CONFIGURE_ARGS= --datadir=${DATADIR}
		30	MAKE_JOBS_UNSAFE= yes
25		31
26	FULL_MAUDE_VER= 26b	32	FULL_MAUDE_VER= 26b
27		33
28	OPTIONS_DEFINE= FULL_MAUDE	34	OPTIONS_DEFINE= DOCS FULL_MAUDE
29	OPTIONS_DEFAULT= FULL_MAUDE	35	OPTIONS_DEFAULT= FULL_MAUDE
30	FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER}	36	FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER}
31		37
32	NO_STAGE= yes	38	PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
		39
33	.include <bsd.port.options.mk>	40	.include <bsd.port.options.mk>
34		41
		42	.if ${OSVERSION} > 1000000
		43	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-build
		44	.endif
		45
35	.if ${PORT_OPTIONS:MFULL_MAUDE}	46	.if ${PORT_OPTIONS:MFULL_MAUDE}
36	MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm	47	MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm
37	FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude	48	FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude
Lines 56-62 Link Here
56		67
57	.if ${PORT_OPTIONS:MFULL_MAUDE}	68	.if ${PORT_OPTIONS:MFULL_MAUDE}
58	post-install:	69	post-install:
59	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR}	70	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR}
		71	.endif
		72
		73	.if ${PORT_OPTIONS:MDOCS}
		74	${MKDIR} ${STAGEDIR}${DOCSDIR}
		75	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
60	.endif	76	.endif
61		77
62	.include <bsd.port.mk>	78	.include <bsd.port.mk>




--- ./src/Mixfix/lexerAux.cc.orig	2014-09-03 02:54:57.000000000 +0200
+++ ./src/Mixfix/lexerAux.cc	2014-09-03 02:55:40.000000000 +0200
@@ -35,7 +35,7 @@
 bool fakeNewlineStack[MAX_IN_DEPTH];
 
 void
-getInput(char* buf, int& result, int max_size)
+getInput(char* buf, size_t& result, size_t max_size)
 {
   result = YY_NULL;
   if (UserLevelRewritingContext::interrupted())
--- ./src/Mixfix/lexerAux.hh.orig	2014-09-03 02:56:33.000000000 +0200
+++ ./src/Mixfix/lexerAux.hh	2014-09-03 02:57:05.000000000 +0200
@@ -27,7 +27,7 @@
 //extern int inStackPtr;
 //extern YY_BUFFER_STATE inStack[];
 
-void getInput(char* buf, int& result, int max_size);
+void getInput(char* buf, size_t& result, size_t max_size);
 void lexerIdMode();
 void lexerTokenTreeMode(int terminatingTokens);
 void lexerCmdMode();

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc (+11 lines)
	1	--- ./src/BuiltIn/stringOpSymbol.cc.orig 2014-09-03 02:36:06.000000000 +0200
	2	+++ ./src/BuiltIn/stringOpSymbol.cc 2014-09-03 02:32:45.000000000 +0200
	3	@@ -472,7 +472,7 @@
	4	const mpz_class& n0 = succSymbol->getNat(a0);
	5	if (n0 <= 255)
	6	{
	7	- char c = n0.get_si();
	8	+ char c[2] = { n0.get_si(), 0 };
	9	return rewriteToString(subject, context, crope(c));
	10	}
	11	}

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Mixfix__bottom.yy (+11 lines)
	1	--- ./src/Mixfix/bottom.yy.orig 2014-09-03 02:49:14.000000000 +0200
	2	+++ ./src/Mixfix/bottom.yy 2014-09-03 02:50:56.000000000 +0200
	3	@@ -23,7 +23,7 @@
	4	%%
	5
	6	static void
	7	-yyerror(char *s)
	8	+yyerror(UserLevelRewritingContext::ParseResult parseResult, char s)
	9	{
	10	if (!(UserLevelRewritingContext::interrupted()))
	11	IssueWarning(LineNumber(lineNumber) << ": " << s);




--- ./src/Mixfix/commands.yy.orig	2014-09-03 02:51:54.000000000 +0200
+++ ./src/Mixfix/commands.yy	2014-09-03 02:53:05.000000000 +0200
@@ -23,12 +23,12 @@
 /*
  *	Commands.
  */
-command		:	KW_SELECT		{ lexBubble(END_COMMAND, 1) }
+command		:	KW_SELECT		{ lexBubble(END_COMMAND, 1); }
 			endBubble
 			{
 			  interpreter.setCurrentModule(lexerBubble);
 			}
-		|	KW_DUMP			{ lexBubble(END_COMMAND, 1) }
+		|	KW_DUMP			{ lexBubble(END_COMMAND, 1); }
 			endBubble
 			{
 			  if (interpreter.setCurrentModule(lexerBubble))




--- ./src/Mixfix/interact.cc.orig	2014-09-03 02:53:35.000000000 +0200
+++ ./src/Mixfix/interact.cc	2014-09-03 02:54:14.000000000 +0200
@@ -25,13 +25,14 @@
 //
 #include <signal.h>
 
+#include "surface.h"
+
 bool UserLevelRewritingContext::interactiveFlag = true;
 bool UserLevelRewritingContext::ctrlC_Flag = false;
 bool UserLevelRewritingContext::stepFlag = false;
 bool UserLevelRewritingContext::abortFlag = false;
 int UserLevelRewritingContext::debugLevel = 0;
 
-int yyparse(void*);
 void cleanUpParser();
 void cleanUpLexer();
 

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Mixfix__modules.yy (+11 lines)
	1	--- ./src/Mixfix/modules.yy.orig 2014-09-03 02:57:44.000000000 +0200
	2	+++ ./src/Mixfix/modules.yy 2014-09-03 02:58:03.000000000 +0200
	3	@@ -247,7 +247,7 @@
	4	// press on.
	5	//
	6	opDescription = lexerBubble;
	7	- lexBubble(END_STATEMENT, 1)
	8	+ lexBubble(END_STATEMENT, 1);
	9	}
	10	endBubble
	11	{

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Mixfix__token.cc (+11 lines)
	1	--- ./src/Mixfix/token.cc.orig 2014-09-03 02:58:50.000000000 +0200
	2	+++ ./src/Mixfix/token.cc 2014-09-03 02:59:18.000000000 +0200
	3	@@ -632,7 +632,7 @@
	4	}
	5	}
	6	}
	7	- result.append(c);
	8	+ result.push_back(c);
	9	seenBackslash = false;
	10	}
	11	CantHappen("bad end to string");




--- ./src/Mixfix/top.yy.orig	2014-09-03 03:00:02.000000000 +0200
+++ ./src/Mixfix/top.yy	2014-09-03 03:02:15.000000000 +0200
@@ -59,7 +59,6 @@
 #define store(token)		tokenSequence.append(token)
 #define fragClear()		fragments.contractTo(0);
 #define fragStore(token)	fragments.append(token)
-#define YYPARSE_PARAM	parseResult
 #define PARSE_RESULT	(*((UserLevelRewritingContext::ParseResult*) parseResult))
 
 #define CM		interpreter.getCurrentModule()
@@ -91,12 +90,13 @@
 Int64 number;
 Int64 number2;
 
-static void yyerror(char *s);
+static void yyerror(UserLevelRewritingContext::ParseResult *parseResult, char *s);
 
 void cleanUpModuleExpression();
 void cleanUpParser();
 void missingSpace(const Token& token);
 %}
+%parse-param { UserLevelRewritingContext::ParseResult *parseResult }
 %pure_parser
 
 %union

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh (+11 lines)
	1	--- ./src/ObjectSystem/configSymbol.hh.orig 2014-09-03 02:37:37.000000000 +0200
	2	+++ ./src/ObjectSystem/configSymbol.hh 2014-09-03 02:38:05.000000000 +0200
	3	@@ -50,7 +50,7 @@
	4	private:
	5	struct symbolLt
	6	{
	7	- bool operator()(const Symbol* d1, const Symbol* d2)
	8	+ bool operator()(const Symbol* d1, const Symbol* d2) const
	9	{
	10	return d1->compare(d2) < 0;
	11	}

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__ObjectSystem__objectMap.cc (+11 lines)
	1	--- ./src/ObjectSystem/objectMap.cc.orig 2014-09-03 02:39:09.000000000 +0200
	2	+++ ./src/ObjectSystem/objectMap.cc 2014-09-03 02:39:20.000000000 +0200
	3	@@ -50,7 +50,7 @@
	4
	5	struct ConfigSymbol::dagNodeLt
	6	{
	7	- bool operator()(const DagNode* d1, const DagNode* d2)
	8	+ bool operator()(const DagNode* d1, const DagNode* d2) const
	9	{
	10	return d1->compare(d2) < 0;
	11	}

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh (+11 lines)
	1	--- ./src/ObjectSystem/objectSystemRewritingContext.hh.orig 2014-09-03 02:40:31.000000000 +0200
	2	+++ ./src/ObjectSystem/objectSystemRewritingContext.hh 2014-09-03 02:40:48.000000000 +0200
	3	@@ -62,7 +62,7 @@
	4	private:
	5	struct dagNodeLt
	6	{
	7	- bool operator()(const DagNode* d1, const DagNode* d2)
	8	+ bool operator()(const DagNode* d1, const DagNode* d2) const
	9	{
	10	return d1->compare(d2) < 0;
	11	}




--- ./src/Utility/ropeStuff.hh.orig	2014-09-03 02:27:15.000000000 +0200
+++ ./src/Utility/ropeStuff.hh	2014-09-03 02:28:58.000000000 +0200
@@ -25,6 +25,11 @@
 //
 #ifndef _ropeStuff_hh_
 #define _ropeStuff_hh_
+#include <cstddef>
+#ifdef _LIBCPP_VERSION
+#include <string>
+typedef std::string crope;
+#else
 #ifdef __GNUC__
   #if __GNUC__ < 3
     #include <rope.h>
@@ -50,3 +55,5 @@
 #include <rope>
 #endif
 #endif
+
+#endif

Return to bug 191049

Line 0 Link Here

(-)/usr/ports/lang/maude/files/extra-patch-build (+22 lines)
	1	--- ./src/Mixfix/lexerAux.cc.orig 2014-09-03 02:54:57.000000000 +0200
	2	+++ ./src/Mixfix/lexerAux.cc 2014-09-03 02:55:40.000000000 +0200
	3	@@ -35,7 +35,7 @@
	4	bool fakeNewlineStack[MAX_IN_DEPTH];
	5
	6	void
	7	-getInput(char* buf, int& result, int max_size)
	8	+getInput(char* buf, size_t& result, size_t max_size)
	9	{
	10	result = YY_NULL;
	11	if (UserLevelRewritingContext::interrupted())
	12	--- ./src/Mixfix/lexerAux.hh.orig 2014-09-03 02:56:33.000000000 +0200
	13	+++ ./src/Mixfix/lexerAux.hh 2014-09-03 02:57:05.000000000 +0200
	14	@@ -27,7 +27,7 @@
	15	//extern int inStackPtr;
	16	//extern YY_BUFFER_STATE inStack[];
	17
	18	-void getInput(char* buf, int& result, int max_size);
	19	+void getInput(char* buf, size_t& result, size_t max_size);
	20	void lexerIdMode();
	21	void lexerTokenTreeMode(int terminatingTokens);
	22	void lexerCmdMode();

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Mixfix__commands.yy (+17 lines)
	1	--- ./src/Mixfix/commands.yy.orig 2014-09-03 02:51:54.000000000 +0200
	2	+++ ./src/Mixfix/commands.yy 2014-09-03 02:53:05.000000000 +0200
	3	@@ -23,12 +23,12 @@
	4	/*
	5	* Commands.
	6	*/
	7	-command : KW_SELECT { lexBubble(END_COMMAND, 1) }
	8	+command : KW_SELECT { lexBubble(END_COMMAND, 1); }
	9	endBubble
	10	{
	11	interpreter.setCurrentModule(lexerBubble);
	12	}
	13	- \| KW_DUMP { lexBubble(END_COMMAND, 1) }
	14	+ \| KW_DUMP { lexBubble(END_COMMAND, 1); }
	15	endBubble
	16	{
	17	if (interpreter.setCurrentModule(lexerBubble))

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Mixfix__interact.cc (+18 lines)
	1	--- ./src/Mixfix/interact.cc.orig 2014-09-03 02:53:35.000000000 +0200
	2	+++ ./src/Mixfix/interact.cc 2014-09-03 02:54:14.000000000 +0200
	3	@@ -25,13 +25,14 @@
	4	//
	5	#include <signal.h>
	6
	7	+#include "surface.h"
	8	+
	9	bool UserLevelRewritingContext::interactiveFlag = true;
	10	bool UserLevelRewritingContext::ctrlC_Flag = false;
	11	bool UserLevelRewritingContext::stepFlag = false;
	12	bool UserLevelRewritingContext::abortFlag = false;
	13	int UserLevelRewritingContext::debugLevel = 0;
	14
	15	-int yyparse(void*);
	16	void cleanUpParser();
	17	void cleanUpLexer();
	18

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Mixfix__top.yy (+25 lines)
	1	--- ./src/Mixfix/top.yy.orig 2014-09-03 03:00:02.000000000 +0200
	2	+++ ./src/Mixfix/top.yy 2014-09-03 03:02:15.000000000 +0200
	3	@@ -59,7 +59,6 @@
	4	#define store(token) tokenSequence.append(token)
	5	#define fragClear() fragments.contractTo(0);
	6	#define fragStore(token) fragments.append(token)
	7	-#define YYPARSE_PARAM parseResult
	8	#define PARSE_RESULT (((UserLevelRewritingContext::ParseResult) parseResult))
	9
	10	#define CM interpreter.getCurrentModule()
	11	@@ -91,12 +90,13 @@
	12	Int64 number;
	13	Int64 number2;
	14
	15	-static void yyerror(char *s);
	16	+static void yyerror(UserLevelRewritingContext::ParseResult parseResult, char s);
	17
	18	void cleanUpModuleExpression();
	19	void cleanUpParser();
	20	void missingSpace(const Token& token);
	21	%}
	22	+%parse-param { UserLevelRewritingContext::ParseResult *parseResult }
	23	%pure_parser
	24
	25	%union

Line 0 Link Here

(-)/usr/ports/lang/maude/files/patch-src__Utility__ropeStuff.hh (+20 lines)
	1	--- ./src/Utility/ropeStuff.hh.orig 2014-09-03 02:27:15.000000000 +0200
	2	+++ ./src/Utility/ropeStuff.hh 2014-09-03 02:28:58.000000000 +0200
	3	@@ -25,6 +25,11 @@
	4	//
	5	#ifndef _ropeStuff_hh_
	6	#define _ropeStuff_hh_
	7	+#include <cstddef>
	8	+#ifdef _LIBCPP_VERSION
	9	+#include <string>
	10	+typedef std::string crope;
	11	+#else
	12	#ifdef __GNUC__
	13	#if __GNUC__ < 3
	14	#include <rope.h>
	15	@@ -50,3 +55,5 @@
	16	#include <rope>
	17	#endif
	18	#endif
	19	+
	20	+#endif