4 files changed, 165 insertions, 1 deletions

diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index f3b0fa33dcfe..0b57a779980e 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	pkgconfig
 USE_BISON=	build
 USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
 
diff --git a/graphics/sswf/files/patch-src_libas_compile.c++ b/graphics/sswf/files/patch-src_libas_compile.c++
new file mode 100644
index 000000000000..358866ef79f4
--- /dev/null
+++ b/graphics/sswf/files/patch-src_libas_compile.c++
@@ -0,0 +1,41 @@
+--- src/libas/compile.c++.orig	2011-06-20 23:06:36.000000000 +0200
++++ src/libas/compile.c++	2011-06-20 23:13:11.000000000 +0200
+@@ -706,18 +706,7 @@
+ 	//	frames and then we search that array with each
+ 	//	parent of the label
+ 
+-#ifdef _MSVC
+-	// alloca() not available with cl
+-	class AutoDelete {
+-	public: AutoDelete(NodePtr *ptr) { f_ptr = ptr; }
+-		~AutoDelete() { delete f_ptr; }
+-	private: NodePtr *f_ptr;
+-	};
+ 	NodePtr *parents = new NodePtr[count];
+-	AutoDelete ad_parent(parents);
+-#else
+-	NodePtr parents[count];
+-#endif
+ 	parent = goto_node;
+ 	for(idx = 0; idx < count; ++idx) {
+ 		parent = parent.GetParent();
+@@ -731,16 +720,19 @@
+ 		parent = parent.GetParent();
+ 		if(!parent.HasNode()) {
+ 			f_error_stream->ErrMsg(AS_ERR_INTERNAL_ERROR, goto_node, "IntCompiler::Goto(): Out of parent before we find the common node?!");
++			delete parents;
+ 			AS_ASSERT(0);
+ 			return;
+ 		}
+ 		for(idx = 0; idx < count; ++idx) {
+ 			if(parents[idx].SameAs(parent)) {
+ 				goto_node.SetLink(NodePtr::LINK_GOTO_EXIT, parent);
++				delete parents;
+ 				return;
+ 			}
+ 		}
+ 	}
++	delete parents;
+ }
+ 
+ 
\ No newline at end of file
diff --git a/graphics/sswf/files/patch-src_libasc_asc__strings.c++ b/graphics/sswf/files/patch-src_libasc_asc__strings.c++
new file mode 100644
index 000000000000..b5db3b237c30
--- /dev/null
+++ b/graphics/sswf/files/patch-src_libasc_asc__strings.c++
@@ -0,0 +1,13 @@
+--- src/libasc/asc_strings.c++.orig	2011-06-21 00:02:53.000000000 +0200
++++ src/libasc/asc_strings.c++	2011-06-21 00:03:42.000000000 +0200
+@@ -4009,8 +4009,8 @@
+ ;
+ }
+ 
+-extern const int files_count = 46;
+-extern const char *files[] = {
++const int files_count = 46;
++const char *files[] = {
+ 	"include/sswf/scripts/extensions/trace.asc", file1,
+ 	"include/sswf/scripts/extensions/complex.asc", file2,
+ 	"include/sswf/scripts/global/extensions.asc", file3,
diff --git a/graphics/sswf/files/patch-src_sswf_sswf__node.c b/graphics/sswf/files/patch-src_sswf_sswf__node.c
new file mode 100644
index 000000000000..c7129ce90300
--- /dev/null
+++ b/graphics/sswf/files/patch-src_sswf_sswf__node.c
@@ -0,0 +1,110 @@
+--- src/sswf/sswf_node.c.orig	2009-03-08 05:04:03.000000000 +0100
++++ src/sswf/sswf_node.c	2011-06-20 23:57:15.000000000 +0200
+@@ -2987,65 +2987,65 @@
+ 
+ 
+ #ifndef _MSVC
+-#define	DEF_PARAM(prm, value)		{ param: DEF_PARAM_##prm, { value } }
++#define	DEF_PARAM(prm, value)		{ .param = DEF_PARAM_##prm, { value } }
+ 
+ #define	DEF_START(name)			const struct definition_t node_def_##name[] = {	\
+-						DEF_PARAM(NAME, string: #name),
++						DEF_PARAM(NAME, .string = #name),
+ 
+-#define	DEF_END()			DEF_PARAM(END, ignored: 0) };
+-#define	DEF_LABEL(label)		DEF_PARAM(LABEL, string: label ),
+-#define	DEF_NOLABEL()			DEF_PARAM(LABEL, string: NULL ),
+-#define	DEF_REPEAT()			DEF_PARAM(REPEAT, ignored: 0),
+-#define	DEF_EMPTY()			DEF_PARAM(EMPTY, ignored: 0),
++#define	DEF_END()			DEF_PARAM(END, .ignored = 0) };
++#define	DEF_LABEL(label)		DEF_PARAM(LABEL, .string = label ),
++#define	DEF_NOLABEL()			DEF_PARAM(LABEL, .string = NULL ),
++#define	DEF_REPEAT()			DEF_PARAM(REPEAT, .ignored = 0),
++#define	DEF_EMPTY()			DEF_PARAM(EMPTY, .ignored = 0),
+ 
+ #define	DEF_OBJECT_REF()								\
+-	DEF_PARAM(TYPE, type: NODE_TYPE_OBJECT),					\
+-	DEF_PARAM(SUBTYPE, type: NODE_SUBTYPE_REFERENCE),
++	DEF_PARAM(TYPE, .type = NODE_TYPE_OBJECT),					\
++	DEF_PARAM(SUBTYPE, .type = NODE_SUBTYPE_REFERENCE),
+ 
+ #define	DEF_OBJECT(sub_type)								\
+-	DEF_PARAM(TYPE, type: NODE_TYPE_DATA),						\
+-	DEF_PARAM(SUBTYPE, type: NODE_SUBTYPE_##sub_type),
++	DEF_PARAM(TYPE, .type = NODE_TYPE_DATA),						\
++	DEF_PARAM(SUBTYPE, .type = NODE_SUBTYPE_##sub_type),
+ 
+ #define	DEF_OBJECT_OPT(sub_type)							\
+ 	DEF_OBJECT(sub_type)								\
+-	DEF_PARAM(OPTIONAL, ignored: 0),
++	DEF_PARAM(OPTIONAL, .ignored = 0),
+ 
+ #define	DEF_VALUE0(unit_nm, structure, end_t, field, defval)				\
+-	DEF_PARAM(TYPE, type: NODE_TYPE_FLOAT),						\
+-	DEF_PARAM(OFFSET, offset: offsetof(struct data_##structure##end_t, field)),	\
+-	DEF_PARAM(UNIT, unit: NODE_UNIT_##unit_nm),					\
+-	DEF_PARAM(DEFAULT, def_value: defval),
++	DEF_PARAM(TYPE, .type = NODE_TYPE_FLOAT),						\
++	DEF_PARAM(OFFSET, .offset = offsetof(struct data_##structure##end_t, field)),	\
++	DEF_PARAM(UNIT, .unit = NODE_UNIT_##unit_nm),					\
++	DEF_PARAM(DEFAULT, .def_value = defval),
+ 
+ #define	DEF_VALUE(unit, structure, field, def_value)					\
+ 	DEF_VALUE0(unit, structure, _t, field, def_value)
+ 
+ #define	DEF_VALUE_OPT(unit, structure, field, def_value)				\
+ 	DEF_VALUE0(unit, structure, _t, field, def_value)				\
+-	DEF_PARAM(OPTIONAL, ignored: 0),
++	DEF_PARAM(OPTIONAL, .ignored = 0),
+ 
+ #define	DEF_STRING()									\
+-	DEF_PARAM(TYPE, type: NODE_TYPE_STRING),
++	DEF_PARAM(TYPE, .type = NODE_TYPE_STRING),
+ 
+ #define	DEF_STRING_OPT()								\
+-	DEF_PARAM(TYPE, type: NODE_TYPE_STRING),					\
+-	DEF_PARAM(OPTIONAL, ignored: 0),
++	DEF_PARAM(TYPE, .type = NODE_TYPE_STRING),					\
++	DEF_PARAM(OPTIONAL, .ignored = 0),
+ 
+ #define	DEF_SET0(structure, end_t, field, value)					\
+-	DEF_PARAM(SET, set: value),							\
+-	DEF_PARAM(OFFSET, offset: offsetof(struct data_##structure##end_t, field)),
++	DEF_PARAM(SET, .set = value),							\
++	DEF_PARAM(OFFSET, .offset = offsetof(struct data_##structure##end_t, field)),
+ 
+ #define	DEF_SET(structure, field, value)						\
+ 	DEF_SET0(structure, _t, field, value)
+ 
+ #define	DEF_SIZE0(structure, end_t)							\
+-	DEF_PARAM(SIZE, size: sizeof(struct data_##structure##end_t)),
++	DEF_PARAM(SIZE, .size =  sizeof(struct data_##structure##end_t)),
+ 
+ #define	DEF_SIZE(structure)								\
+ 	DEF_SIZE0(structure, _t)
+ 
+ /*
+ #define	DEF_SEPARATOR()									\
+-	DEF_PARAM(SEPARATOR, ignored: 0),
++	DEF_PARAM(SEPARATOR, .ignored = 0),
+ */
+ #else
+ 
+@@ -3111,7 +3111,7 @@
+ 
+ #define	DEF_START(name)				DEF_PARAM(string, node_def_##name, NAME, #name)
+ 
+-//const struct definition_t node_def_##name[] = { DEF_PARAM(NAME, string: #name),
++//const struct definition_t node_def_##name[] = { DEF_PARAM(NAME, .string = #name),
+ 
+ #define	DEF_END()			DEF_PARAM_IGNORE(END)
+ #define	DEF_LABEL(label)		DEF_PARAM_AN(string, LABEL, label)
+@@ -3166,7 +3166,7 @@
+ 
+ /*
+ #define	DEF_SEPARATOR()									\
+-	DEF_PARAM(SEPARATOR, ignored: 0),
++	DEF_PARAM(SEPARATOR, .ignored = 0),
+ */
+ #endif
+