12 files changed, 303 insertions, 0 deletions

diff --git a/devel/flick/files/patch-aa b/devel/flick/files/patch-aa
new file mode 100644
index 000000000000..2ee8e0817602
--- /dev/null
+++ b/devel/flick/files/patch-aa
@@ -0,0 +1,48 @@
+--- c/pfe/lib/p_calc_name.cc.orig	Fri Aug 29 19:10:33 2003
++++ c/pfe/lib/p_calc_name.cc	Fri Aug 29 19:29:19 2003
+@@ -98,14 +98,14 @@
+ #define DEFINE_CALC_NAME_FMT_OPTION(type, explain)	\
+ {							\
+ 	#type "_fmt",					\
+-	name_strings::##type##_fmt,			\
++	name_strings::type##_fmt,			\
+ 	"Specify the format of " explain		\
+ }
+ 
+ #define DEFINE_CALC_NAME_LIT_OPTION(type, explain)	\
+ {							\
+ 	#type "_lit",					\
+-	name_strings::##type##_lit,			\
++	name_strings::type##_lit,			\
+ 	"Specify the string for " explain		\
+ }
+ 
+@@ -333,7 +333,7 @@
+ #define DEFINE_CALC_NAME_FUNCTION(type)					\
+   char *pg_state::calc_##type##_name(const char *basic_name)		\
+   {									\
+-	return calc_name(names.formats[name_strings::##type##_fmt],	\
++	return calc_name(names.formats[name_strings::type##_fmt],	\
+ 			 basic_name);					\
+   }
+ 
+@@ -346,7 +346,7 @@
+ 									    \
+ 	calc_scoped_name(&scname,					    \
+ 			 parent_ref,					    \
+-			 names.formats[name_strings::##type##_scoped_fmt]); \
++			 names.formats[name_strings::type##_scoped_fmt]); \
+ 	cast_add_scope_name(&scname,					    \
+ 			    base_name,					    \
+ 			    null_template_arg_array);			    \
+@@ -715,8 +715,8 @@
+ 		++calc_name_data.count;					 \
+ 	} while (0)
+ 
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
+-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
++#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
+ 
+ /*
+  * An internal auxiliary.  `calc_name_module' locates the names of the AOI
diff --git a/devel/flick/files/patch-ab b/devel/flick/files/patch-ab
new file mode 100644
index 000000000000..2306f194b5e7
--- /dev/null
+++ b/devel/flick/files/patch-ab
@@ -0,0 +1,15 @@
+--- c/pfe/lib/pg_state.cc.orig	Fri Aug 29 19:32:31 2003
++++ c/pfe/lib/pg_state.cc	Fri Aug 29 19:32:54 2003
+@@ -53,9 +53,9 @@
+ 	 * Initialize the strings that are used to construct names.  Most
+ 	 * presentation generators will override at least some of these values.
+ 	 */
+-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
+-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
++#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
++#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
+ 	
+ 	/* The `null' format should never ever be used. */
+ 	NAME_FORMAT(null) =			"";
diff --git a/devel/flick/files/patch-ac b/devel/flick/files/patch-ac
new file mode 100644
index 000000000000..062831b9cc2b
--- /dev/null
+++ b/devel/flick/files/patch-ac
@@ -0,0 +1,15 @@
+--- c/pfe/libcorba/pg_corba.cc.orig	Fri Aug 29 19:45:24 2003
++++ c/pfe/libcorba/pg_corba.cc	Fri Aug 29 19:45:46 2003
+@@ -25,9 +25,9 @@
+ 
+ pg_corba::pg_corba()
+ {
+-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
+-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
++#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
++#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
+ 	
+ 	/*
+ 	 * CORBA does not specify the names of server skeletons nor the names
diff --git a/devel/flick/files/patch-ad b/devel/flick/files/patch-ad
new file mode 100644
index 000000000000..89fe1a59296f
--- /dev/null
+++ b/devel/flick/files/patch-ad
@@ -0,0 +1,15 @@
+--- c/pfe/libcorbaxx/pg_corbaxx.cc.orig	Fri Aug 29 19:50:41 2003
++++ c/pfe/libcorbaxx/pg_corbaxx.cc	Fri Aug 29 19:51:04 2003
+@@ -27,9 +27,9 @@
+ 
+ pg_corbaxx::pg_corbaxx()
+ {
+-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
+-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
++#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
++#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
+ 	
+ 	/*
+ 	 * CORBA does not specify the names of server skeletons nor the names
diff --git a/devel/flick/files/patch-ae b/devel/flick/files/patch-ae
new file mode 100644
index 000000000000..4988c1101fe2
--- /dev/null
+++ b/devel/flick/files/patch-ae
@@ -0,0 +1,15 @@
+--- c/pfe/fluke/pg_fluke.cc.orig	Fri Aug 29 20:18:40 2003
++++ c/pfe/fluke/pg_fluke.cc	Fri Aug 29 20:19:02 2003
+@@ -33,9 +33,9 @@
+ 
+ pg_fluke::pg_fluke()
+ {
+-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
+-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
++#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
++#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
+ 	
+ 	/* Should define them all... */
+ 	NAME_FORMAT(server_func) =		"%I%_server%_%s";
diff --git a/devel/flick/files/patch-af b/devel/flick/files/patch-af
new file mode 100644
index 000000000000..b1f8b0f2e1d3
--- /dev/null
+++ b/devel/flick/files/patch-af
@@ -0,0 +1,11 @@
+--- c/pfe/sun/p_calc_name.cc.orig	Sat Aug 30 00:32:44 2003
++++ c/pfe/sun/p_calc_name.cc	Sat Aug 30 00:32:59 2003
+@@ -84,7 +84,7 @@
+  * These functions are auxiliaries for the override methods above.
+  */
+ 
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
+ 
+ char *pg_sun::calc_operation_and_version_id(const char *basic_name)
+ {
diff --git a/devel/flick/files/patch-ag b/devel/flick/files/patch-ag
new file mode 100644
index 000000000000..2f09946a1494
--- /dev/null
+++ b/devel/flick/files/patch-ag
@@ -0,0 +1,15 @@
+--- c/pfe/sun/pg_sun.cc.orig	Sat Aug 30 00:39:35 2003
++++ c/pfe/sun/pg_sun.cc	Sat Aug 30 00:39:56 2003
+@@ -50,9 +50,9 @@
+ 
+ pg_sun::pg_sun()
+ {
+-#define NAME_FORMAT(type)      names.formats[name_strings::##type##_fmt]
+-#define NAME_LITERAL_STR(type) names.literals[name_strings::##type##_lit].str
+-#define NAME_LITERAL_LEN(type) names.literals[name_strings::##type##_lit].len
++#define NAME_FORMAT(type)      names.formats[name_strings::type##_fmt]
++#define NAME_LITERAL_STR(type) names.literals[name_strings::type##_lit].str
++#define NAME_LITERAL_LEN(type) names.literals[name_strings::type##_lit].len
+ 	
+ 	/*
+ 	 * Override some of the format strings for Sun RPC-style presentations.
diff --git a/devel/flick/files/patch-ah b/devel/flick/files/patch-ah
new file mode 100644
index 000000000000..b422e70aa3a9
--- /dev/null
+++ b/devel/flick/files/patch-ah
@@ -0,0 +1,117 @@
+--- fe/mig/parser.y.orig	Sat Aug 30 00:44:37 2003
++++ fe/mig/parser.y	Sat Aug 30 00:49:45 2003
+@@ -755,46 +755,55 @@
+ 			|	error {
+ 					ParseError("`;' expected");
+ 				}
++			;
+ 
+ EqualOrError	 	:	syEqual
+ 			|	error {
+ 					ParseError("`=' expected");
+ 				}
++			;
+ 
+ CommaOrError	 	:	syComma
+ 			|	error {
+ 					ParseError("`,' expected");
+ 				}
++			;
+ 
+ LParenOrError	 	:	syLParen
+ 			|	error {
+ 					ParseError("`(' expected");
+ 				}
++			;
+ 
+ RParenOrError	 	:	syRParen
+ 			|	error {
+ 					ParseError("`)' expected");
+ 				}
++			;
+ 
+ LBrackOrError	 	:	syLBrack
+ 			|	error {
+ 					ParseError("`[' expected");
+ 				}
++			;
+ 
+ RBrackOrError	 	:	syRBrack
+ 			|	error {
+ 					ParseError("`]' expected");
+ 				}
++			;
+ 
+ OfOrError	 	:	syOf
+ 			|	error {
+ 					ParseError("`of' expected");
+ 				}
++			;
+ 
+ ColonOrError	 	:	syColon
+ 			|	error {
+ 					ParseError("`:' expected");
+ 				}
++			;
+ 
+ IPCFlagOrError          :	syIPCFlag { $$ = $1; }
+ 			|	error {
+@@ -803,6 +812,7 @@
+ 						    "found"));
+ 					$$ = flNone;
+ 				}
++			;
+ 
+ IdentifierOrError       :	syIdentifier { $$ = $1; }
+ 			|	error {
+@@ -810,41 +820,49 @@
+ 					$$ = flick_asprintf("_error %d_%d_",
+ 							    lineno, tokenpos);
+ 				}
++			;
+ 
+ IdentifierOrEmptyError  :	syIdentifier { $$ = $1; }
+ 			|	error {
+ 					ParseError("identifier expected");
+ 					$$ = "";
+ 				}
++			;
+ 
+ IdentifierOrNULLError   :	syIdentifier { $$ = $1; }
+ 			|	error {
+ 					ParseError("identifier expected");
+ 					$$ = strNULL;
+ 				}
++			;
+ 
+ NumberOrError   	:	syNumber { $$ = $1; }
+ 			|	error {
+ 					ParseError("number expected");
+ 					$$ = 0;
+ 				}
++			;
+ 
+-StringOrNULLError       	:	syString { $$ = $1; }
++StringOrNULLError      	:	syString { $$ = $1; }
+ 			|	error {
+ 					ParseError("string expected");
+ 					$$ = strNULL;
+ 				}
++			;
++
+ QStringOrError       	:	syQString { $$ = $1; }
+ 			|	error {
+ 					ParseError("quoted string expected");
+ 					$$ = "\"<error>\"";
+ 				}
++			;
+ 
+ FileNameOrError       	:	syFileName { $$ = $1; }
+ 			|	error {
+ 					ParseError("filename expected");
+ 					$$ = "error.error";
+ 				}
++			;
+ 
+ LookString		:	/* empty */
+ 				{ LookString(); }
diff --git a/devel/flick/files/patch-ai b/devel/flick/files/patch-ai
new file mode 100644
index 000000000000..2088d995f439
--- /dev/null
+++ b/devel/flick/files/patch-ai
@@ -0,0 +1,19 @@
+--- fe/newcorba/parser.yy.orig	Sat Aug 30 00:52:20 2003
++++ fe/newcorba/parser.yy	Sat Aug 30 00:55:05 2003
+@@ -305,6 +305,8 @@
+ 		  ParseError("expecting identifier");
+ 		  $$ = 0;
+ 		}
++		;
++
+ scoped_name	: ID {
+ 		  $$ = FindLocalName($1);
+ 		}
+@@ -1058,6 +1060,7 @@
+ 			  ParseError("invalid type"); 
+ 			  $$ = MakeAoiType(kSLONG); 
+ 			}
++			;
+ 
+ param_type_spec	: base_type_spec {$$ = $1;}
+ 		| string_type {$$ = $1;}
diff --git a/devel/flick/files/patch-aj b/devel/flick/files/patch-aj
new file mode 100644
index 000000000000..cd8ca583ffe4
--- /dev/null
+++ b/devel/flick/files/patch-aj
@@ -0,0 +1,11 @@
+--- runtime/headers/flick/pres/corba.h.orig	Sat Aug 30 00:57:33 2003
++++ runtime/headers/flick/pres/corba.h	Sat Aug 30 00:58:17 2003
+@@ -186,7 +186,7 @@
+ 
+ #define corba_except(name)					\
+ typedef flick_system_exception name;				\
+-name *##name##__alloc();
++name *name##__alloc();
+ 
+ /*
+  * Here are the standard CORBA system exception.
diff --git a/devel/flick/files/patch-ak b/devel/flick/files/patch-ak
new file mode 100644
index 000000000000..8f74fd404814
--- /dev/null
+++ b/devel/flick/files/patch-ak
@@ -0,0 +1,11 @@
+--- runtime/libraries/link/iiop/corba_excepts.c.orig	Sat Aug 30 00:59:48 2003
++++ runtime/libraries/link/iiop/corba_excepts.c	Sat Aug 30 01:00:15 2003
+@@ -254,7 +254,7 @@
+  * Define the allocators for the standard CORBA exceptions.
+  */
+ #define sys_except__alloc(name) \
+-name *##name##__alloc() { return (name *) flick_system_exception_alloc(); }
++name *name##__alloc() { return (name *) flick_system_exception_alloc(); }
+ 
+ sys_except__alloc(CORBA_UNKNOWN)
+ sys_except__alloc(CORBA_BAD_PARAM)
diff --git a/devel/flick/files/patch-al b/devel/flick/files/patch-al
new file mode 100644
index 000000000000..8ba1958f14f1
--- /dev/null
+++ b/devel/flick/files/patch-al
@@ -0,0 +1,11 @@
+--- runtime/libraries/link/suntcp/corba_excepts.c.orig	Sat Aug 30 01:03:14 2003
++++ runtime/libraries/link/suntcp/corba_excepts.c	Sat Aug 30 01:03:59 2003
+@@ -254,7 +254,7 @@
+  * Define the allocators for the standard CORBA exceptions.
+  */
+ #define sys_except__alloc(name) \
+-name *##name##__alloc() { return (name *) flick_system_exception_alloc(); }
++name *name##__alloc() { return (name *) flick_system_exception_alloc(); }
+ 
+ sys_except__alloc(CORBA_UNKNOWN)
+ sys_except__alloc(CORBA_BAD_PARAM)