- Fix build on FreeBSD 4.X

Reported by:	krismail

4 files changed, 106 insertions, 0 deletions

diff --git a/math/tablix/files/patch-modules-freeperiod.c b/math/tablix/files/patch-modules-freeperiod.c
new file mode 100644
index 000000000000..11ac568ee2d3
--- /dev/null
+++ b/math/tablix/files/patch-modules-freeperiod.c
@@ -0,0 +1,57 @@
+--- modules/freeperiod.c.orig	Fri Sep  2 21:30:38 2005
++++ modules/freeperiod.c	Tue Nov 22 21:55:58 2005
+@@ -188,25 +188,28 @@
+ 
+ int module_precalc(moduleoption *opt) 
+ {
++	int i;
++	int timeid, teachid;
++	tupleinfo *tup;
++	domain *dom;
++	struct tlist *tnext;
++
+ 	if ( exclnum == 0 && texcl == NULL )
+ 	{
+ 		info(_("module '%s' loaded, but not used"), "freeperiod.so");
+ 		return 0;
+ 	}
+ 	
+-	int i;
+-	int timeid, teachid;
+ 	timeid = restype_find( "time" )->typeid; 
+ 	teachid = restype_find( "teacher" )->typeid;
+-	tupleinfo *tup = dat_tuplemap;
+-	domain *dom;
++	tup = dat_tuplemap;
+ 	for ( i = 0; i < dat_tuplenum; i++ )
+ 	{
++		struct tlist *tt;
+ 		dom = tup[i].dom[timeid];
+ 		if(excl!=NULL) {
+ 			domain_del( dom, excl, exclnum );
+ 		}
+-		struct tlist *tt;
+ 		if ( ( tt = find_texcl( dat_tuplemap[i].resid[teachid] ) ) )
+ 			domain_del( dom, tt->frees, tt->freenum );
+ 	}
+@@ -215,7 +218,6 @@
+ 		free(excl);
+ 	}
+ 	
+-	struct tlist *tnext;
+ 	while(texcl!=NULL) {
+ 		tnext=texcl->next;
+ 		free( texcl->frees );
+@@ -228,10 +230,10 @@
+ 
+ int module_init(moduleoption *opt) 
+ {
+-	precalc_new(module_precalc);
+-
+ 	int d,p;
+ 	moduleoption *result;
++
++	precalc_new(module_precalc);
+ 
+ 	texcl = NULL;
+ 	excl = NULL;
diff --git a/math/tablix/files/patch-modules-preferredroom.c b/math/tablix/files/patch-modules-preferredroom.c
new file mode 100644
index 000000000000..2df974acbeab
--- /dev/null
+++ b/math/tablix/files/patch-modules-preferredroom.c
@@ -0,0 +1,20 @@
+--- modules/preferredroom.c.orig	Fri Sep  2 21:30:38 2005
++++ modules/preferredroom.c	Tue Nov 22 22:19:51 2005
+@@ -182,6 +182,8 @@
+ int module_init(moduleoption *opt) 
+ {
+ 	int c;
++	fitnessfunc *fitness;
++
+ 	ptroom=malloc(sizeof(*ptroom)*restype_find("teacher")->resnum);
+ 	for(c=0;c<restype_find("teacher")->resnum;c++) ptroom[c]=-1;
+ 
+@@ -197,8 +199,6 @@
+ 		return(-1);
+ 	}
+ 	
+-	fitnessfunc *fitness;
+-
+ 	precalc_new(module_precalc);
+ 
+ 	handler_res_new("teacher", "preferred-room", gettroom);
diff --git a/math/tablix/files/patch-modules-sametime.c b/math/tablix/files/patch-modules-sametime.c
new file mode 100644
index 000000000000..b85ab84cd600
--- /dev/null
+++ b/math/tablix/files/patch-modules-sametime.c
@@ -0,0 +1,14 @@
+--- modules/sametime.c.orig	Sun Sep  4 21:20:52 2005
++++ modules/sametime.c	Tue Nov 22 21:40:47 2005
+@@ -64,9 +64,9 @@
+ 	resource *res2;
+ 	resourcetype *restype;
+ 
+-	restype=res1->restype;
+-
+ 	int n;
++
++	restype=res1->restype;
+ 
+ 	res2=res_find(restype, cont);
+ 
diff --git a/math/tablix/files/patch-ttf-export_ttf.c b/math/tablix/files/patch-ttf-export_ttf.c
new file mode 100644
index 000000000000..9801b3c4b44a
--- /dev/null
+++ b/math/tablix/files/patch-ttf-export_ttf.c
@@ -0,0 +1,15 @@
+--- ttf/export_ttf.c.orig	Fri Sep  2 21:30:43 2005
++++ ttf/export_ttf.c	Tue Nov 22 21:27:53 2005
+@@ -274,10 +274,10 @@
+ 
+ 	char *oldmodule;
+ 
++	scheme *sc;
++
+ 	oldmodule=curmodule;
+ 	curmodule="scheme";
+-
+-	scheme *sc;
+ 
+ 	info("TinyScheme, Copyright (c) 2000, Dimitrios Souflis. All rights reserved.");
+