Attachment #143807 for bug #191049

Lines 3-8 Link Here

(-)Makefile (-6 / +8 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-20 Link Here
10	MAINTAINER= joemann@beefree.free.de	11	MAINTAINER= joemann@beefree.free.de
11	COMMENT= A high-performance reflective language	12	COMMENT= A high-performance reflective language
12		13
13	LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \	14	LICENSE= GPLv2
14	tecla:${PORTSDIR}/devel/libtecla \
15	gmp:${PORTSDIR}/math/gmp \
16	sigsegv:${PORTSDIR}/devel/libsigsegv
17		15
		16	LIB_DEPENDS= libbdd.so:${PORTSDIR}/science/buddy \
		17	libtecla.so:${PORTSDIR}/devel/libtecla \
		18	libgmp.so:${PORTSDIR}/math/gmp \
		19	libsigsegv.so:${PORTSDIR}/devel/libsigsegv
		20
18	USES= bison	21	USES= bison
19	USE_AUTOTOOLS= aclocal autoheader automake	22	USE_AUTOTOOLS= aclocal autoheader automake
20	AUTOMAKE_ARGS= --add-missing	23	AUTOMAKE_ARGS= --add-missing
Lines 29-35 Link Here
29	OPTIONS_DEFAULT= FULL_MAUDE	32	OPTIONS_DEFAULT= FULL_MAUDE
30	FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER}	33	FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER}
31		34
32	NO_STAGE= yes
33	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
34		36
35	.if ${PORT_OPTIONS:MFULL_MAUDE}	37	.if ${PORT_OPTIONS:MFULL_MAUDE}
Lines 56-62 Link Here
56		58
57	.if ${PORT_OPTIONS:MFULL_MAUDE}	59	.if ${PORT_OPTIONS:MFULL_MAUDE}
58	post-install:	60	post-install:
59	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${DATADIR}	61	${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR}
60	.endif	62	.endif
61		63
62	.include <bsd.port.mk>	64	.include <bsd.port.mk>




--- src/Mixfix/Makefile.am.orig	2009-02-17 18:06:27.000000000 +0000
+++ src/Mixfix/Makefile.am	2014-06-15 04:40:36.000000000 +0100
@@ -72,8 +72,8 @@
 EXTRA_libmixfix_a_SOURCES = \
 	compiler.cc
 
-BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc
-CLEANFILES = surface.yy surface.cc surface.h lexer.cc
+BUILT_SOURCES = surface.yy surface.cc surface.hh lexer.cc
+CLEANFILES = surface.yy surface.cc surface.hh lexer.cc
 
 surface.yy: \
 	$(srcdir)/top.yy \
@@ -87,15 +87,14 @@
 	$(srcdir)/bottom.yy \
 	> surface.yy
 
-surface.cc surface.h: surface.yy
-	$(BISON) -dv surface.yy -o surface.c
-	mv surface.c surface.cc
+surface.cc surface.hh: surface.yy
+	$(BISON) -dv surface.yy -o surface.cc
 
 #	According to the manual, automake is supposed to grok
 #	.ll files and do the right thing... but it doesn't
 #	seem to work so...
 lexer.cc: \
-	$(srcdir)/lexer.ll surface.h
+	$(srcdir)/lexer.ll surface.hh
 	$(FLEX) -t -p -p $(srcdir)/lexer.ll > lexer.cc
 
 EXTRA_DIST = \

Line 0 Link Here

(-)files/patch-src__Mixfix__lexer.ll (+11 lines)
	1	--- src/Mixfix/lexer.ll.orig 2014-06-15 04:33:20.000000000 +0100
	2	+++ src/Mixfix/lexer.ll 2014-06-15 04:33:39.000000000 +0100
	3	@@ -49,7 +49,7 @@
	4	#include "interpreter.hh"
	5
	6	// bison generated token file
	7	-#include "surface.h"
	8	+#include "surface.hh"
	9
	10	#define YY_DECL int yylex(YYSTYPE* lvalp)
	11

Return to bug 191049

Line 0 Link Here

(-)files/patch-src__Mixfix__Makefile.am (+32 lines)
	1	--- src/Mixfix/Makefile.am.orig 2009-02-17 18:06:27.000000000 +0000
	2	+++ src/Mixfix/Makefile.am 2014-06-15 04:40:36.000000000 +0100
	3	@@ -72,8 +72,8 @@
	4	EXTRA_libmixfix_a_SOURCES = \
	5	compiler.cc
	6
	7	-BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc
	8	-CLEANFILES = surface.yy surface.cc surface.h lexer.cc
	9	+BUILT_SOURCES = surface.yy surface.cc surface.hh lexer.cc
	10	+CLEANFILES = surface.yy surface.cc surface.hh lexer.cc
	11
	12	surface.yy: \
	13	$(srcdir)/top.yy \
	14	@@ -87,15 +87,14 @@
	15	$(srcdir)/bottom.yy \
	16	> surface.yy
	17
	18	-surface.cc surface.h: surface.yy
	19	- $(BISON) -dv surface.yy -o surface.c
	20	- mv surface.c surface.cc
	21	+surface.cc surface.hh: surface.yy
	22	+ $(BISON) -dv surface.yy -o surface.cc
	23
	24	# According to the manual, automake is supposed to grok
	25	# .ll files and do the right thing... but it doesn't
	26	# seem to work so...
	27	lexer.cc: \
	28	- $(srcdir)/lexer.ll surface.h
	29	+ $(srcdir)/lexer.ll surface.hh
	30	$(FLEX) -t -p -p $(srcdir)/lexer.ll > lexer.cc
	31
	32	EXTRA_DIST = \