- Unbreak

- Fix build with gcc 4.2

PR:		113774
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

20 files changed, 530 insertions, 7 deletions

diff --git a/graphics/gplot/Makefile b/graphics/gplot/Makefile
index 2f640596293..f95d15d0849 100644
--- a/graphics/gplot/Makefile
+++ b/graphics/gplot/Makefile
@@ -28,10 +28,6 @@ MAKE_ENV+=	FC="${FC}" F77="${F77}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gplot ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/gtex ${PREFIX}/bin
diff --git a/graphics/gplot/files/patch-ab b/graphics/gplot/files/patch-ab
index 93233417a59..9c8831b9674 100644
--- a/graphics/gplot/files/patch-ab
+++ b/graphics/gplot/files/patch-ab
@@ -1,6 +1,14 @@
---- utils.c.orig	Fri Oct 25 19:08:50 2002
-+++ utils.c	Fri Oct 25 19:10:44 2002
-@@ -300,9 +300,8 @@
+--- utils.c.orig	Wed Oct 30 00:48:16 1991
++++ utils.c	Sat Jun 16 02:10:19 2007
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <ctype.h>
++#include <string.h>
+ #include "defs.h"
+ /* some include files vary in location */
+ #ifdef VAXC
+@@ -300,9 +301,8 @@
       struct info_struct *out_info;
       struct one_opt *opt;	/* put command line options here */
  #define may_override(name) if (opt[(int) name].set) switch (opt[(int) name].tag) {	    \
diff --git a/graphics/gplot/files/patch-carray.c b/graphics/gplot/files/patch-carray.c
new file mode 100644
index 00000000000..5296b688958
--- /dev/null
+++ b/graphics/gplot/files/patch-carray.c
@@ -0,0 +1,14 @@
+--- carray.c.orig	Fri Sep 13 02:57:13 1991
++++ carray.c	Sat Jun 16 02:27:51 2007
+@@ -3,6 +3,11 @@
+ /* all rights reserved */
+ #include "defs.h"
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++static do_line();
++
+ /* a few globals */
+ #define byte_size 8
+ unsigned char *allocate_mem();			/* in utils.c */
diff --git a/graphics/gplot/files/patch-ccgm.c b/graphics/gplot/files/patch-ccgm.c
new file mode 100644
index 00000000000..8d9c63f290a
--- /dev/null
+++ b/graphics/gplot/files/patch-ccgm.c
@@ -0,0 +1,138 @@
+--- ccgm.c.orig	Mon Oct 12 23:59:40 1992
++++ ccgm.c	Sat Jun 16 03:06:24 2007
+@@ -2,9 +2,118 @@
+ /* all rights reserved */
+ /* module to take care of clear text command processing */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "defs.h"	/* type definitions */
+ #include "ccdefs.h"	/* clear text definitions */
+ 
++static class0();
++static class1();
++static class2();
++static class3();
++static class4();
++static class5();
++static class6();
++static class7();
++static f_b_mf();
++static f_e_mf();
++static f_b_p();
++static f_b_p_body();
++static f_e_pic();
++static rd_mf_version();
++static rd_mf_descriptor();
++static s_vdc_type();
++static s_int_prec();
++static s_real_prec();
++static s_index_prec();
++static s_col_prec();
++static s_cind_prec();
++static s_cvextent();
++static s_mcind();
++static do_mcind();
++static rd_mf_list();
++static s_mf_defs();
++static do_font_list();
++static do_char_list();
++static do_cannounce();
++static s_scalmode();
++static s_c_s_mode();
++static s_lws_mode();
++static s_ms_mode();
++static s_ew_mode();
++static s_vdc_extent();
++static s_back_col();
++static s_vdc_i_p();
++static s_vdc_r_p();
++static s_aux_col();
++static s_transp();
++static s_clip_rec();
++static s_clip_ind();
++static do_polyline();
++static do_dis_polyline();
++static do_polymarker();
++static s_text();
++static s_rex_text();
++static s_app_text();
++static do_polygon();
++static do_polyset();
++static do_cell_array();
++static do_g_d_p();
++static do_rectangle();
++static do_circle();
++static do_c3();
++static do_c3_close();
++static do_c_centre();
++static do_c_c_close();
++static do_ellipse();
++static do_ell_arc();
++static do_e_a_close();
++static s_lbindex();
++static s_l_type();
++static s_l_width();
++static s_l_colour();
++static s_mbindex();
++static s_mk_type();
++static s_mk_size();
++static s_mk_colour();
++static s_tbindex();
++static s_t_index();
++static s_t_prec();
++static s_c_exp();
++static s_c_space();
++static s_t_colour();
++static s_c_height();
++static s_c_orient();
++static s_tpath();
++static s_t_align();
++static s_csindex();
++static s_acsindex();
++static s_fbindex();
++static s_interior_style();
++static s_fill_colour();
++static s_hindex();
++static s_pindex();
++static s_e_b_index();
++static s_edge_t();
++static s_edge_w();
++static s_edge_c();
++static s_edge_v();
++static s_fill_ref();
++static p_tab_entry();
++static s_pat_size();
++static c_tab_entry();
++static do_aspsflags();
++static do_escape();
++static do_message();
++static do_apdata();
++static my_scan_int();
++static get_decimal();
++static get_based();
++static my_scan_float();
++static get_token();
++static cc_same();
++static get_prec();
++
+ /* global pointers that use storage from the main program */
+ 
+ static struct 	mf_d_struct 	*glbl1;	/* the class 1 elements */
+@@ -62,7 +171,6 @@
+      
+      /* cgm specific functions */
+ #define e_size 2
+-     extern char *malloc();			/* for neatness */
+ #define intalloc (int *) malloc /* for convenience */
+        static char *cc_str();	/* does the necessary translation */
+      static float cc_real();	/* does the necessary translation */
+@@ -3367,7 +3475,7 @@
+      struct ad_struct *this_ad;	/* general address structure */
+ {
+ static struct ad_struct last_ad;	/* last address */
+-  char *my_ptr, c, *realloc(), last_quote = '\"';
++  char *my_ptr, c, last_quote = '\"';
+   int p_len, done, new_size;
+   enum {normal, quoting, spacing, commenting} my_state;
+   
diff --git a/graphics/gplot/files/patch-cgm.c b/graphics/gplot/files/patch-cgm.c
new file mode 100644
index 00000000000..0c6de4633a5
--- /dev/null
+++ b/graphics/gplot/files/patch-cgm.c
@@ -0,0 +1,114 @@
+--- cgm.c.orig	Thu Jul 18 02:21:55 1991
++++ cgm.c	Sat Jun 16 03:01:14 2007
+@@ -2,7 +2,111 @@
+ /* all rights reserved */
+ /* module to take care of command processing */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "defs.h"	/* type definitions */
++
++static class0();
++static class1();
++static class2();
++static class3();
++static class4();
++static class5();
++static class6();
++static class7();
++static f_b_mf();
++static f_e_mf();
++static f_b_p();
++static f_b_p_body();
++static f_e_pic();
++static rd_mf_version();
++static rd_mf_descriptor();
++static s_vdc_type();
++static s_int_prec();
++static s_real_prec();
++static s_index_prec();
++static s_col_prec();
++static s_cind_prec();
++static s_cvextent();
++static s_mcind();
++static do_mcind();
++static rd_mf_list();
++static s_mf_defs();
++static do_font_list();
++static do_char_list();
++static do_cannounce();
++static s_scalmode();
++static s_c_s_mode();
++static s_lws_mode();
++static s_ms_mode();
++static s_ew_mode();
++static s_vdc_extent();
++static s_back_col();
++static s_vdc_i_p();
++static s_vdc_r_p();
++static s_aux_col();
++static s_transp();
++static s_clip_rec();
++static s_clip_ind();
++static do_polyline();
++static do_dis_polyline();
++static do_polymarker();
++static s_text();
++static s_rex_text();
++static s_app_text();
++static do_polygon();
++static do_polyset();
++static do_cell_array();
++static do_g_d_p();
++static do_rectangle();
++static do_circle();
++static do_c3();
++static do_c3_close();
++static do_c3_centre();
++static do_c_centre();
++static do_c_c_close();
++static do_ellipse();
++static do_ell_arc();
++static do_e_a_close();
++static s_lbindex();
++static s_l_type();
++static s_l_width();
++static s_l_colour();
++static s_mbindex();
++static s_mk_type();
++static s_mk_size();
++static s_mk_colour();
++static s_tbindex();
++static s_t_index();
++static s_t_prec();
++static s_c_exp();
++static s_c_space();
++static s_t_colour();
++static s_c_height();
++static s_c_orient();
++static s_tpath();
++static s_t_align();
++static s_csindex();
++static s_acsindex();
++static s_fbindex();
++static s_interior_style();
++static s_fill_colour();
++static s_hindex();
++static s_pindex();
++static s_e_b_index();
++static s_edge_t();
++static s_edge_w();
++static s_edge_c();
++static s_edge_v();
++static s_fill_ref();
++static p_tab_entry();
++static s_pat_size();
++static c_tab_entry();
++static do_aspsflags();
++static do_escape();
++static read_index();
++static do_message();
++static do_apdata();
+ 
+ /* global pointers that use storage from the main program */
+ 
diff --git a/graphics/gplot/files/patch-cgmb.c b/graphics/gplot/files/patch-cgmb.c
new file mode 100644
index 00000000000..d142a5bf524
--- /dev/null
+++ b/graphics/gplot/files/patch-cgmb.c
@@ -0,0 +1,15 @@
+--- cgmb.c.orig	Fri Sep 13 02:57:17 1991
++++ cgmb.c	Sat Jun 16 01:08:42 2007
+@@ -2,7 +2,12 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "defs.h"
++
++static flush_cmd();
++static cb_fixed();
++
+ #define byte_size 8
+ #define byte_mask 255
+ /* module for CGM binary output */
diff --git a/graphics/gplot/files/patch-cgmc.c b/graphics/gplot/files/patch-cgmc.c
new file mode 100644
index 00000000000..c1eaccfd06d
--- /dev/null
+++ b/graphics/gplot/files/patch-cgmc.c
@@ -0,0 +1,10 @@
+--- cgmc.c.orig	Fri Sep 13 02:57:25 1991
++++ cgmc.c	Sat Jun 16 02:06:22 2007
+@@ -3,6 +3,7 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "defs.h"
+ #include "ccdefs.h"
+ #define byte_size 8
diff --git a/graphics/gplot/files/patch-devices.c b/graphics/gplot/files/patch-devices.c
new file mode 100644
index 00000000000..aea1f5bea50
--- /dev/null
+++ b/graphics/gplot/files/patch-devices.c
@@ -0,0 +1,9 @@
+--- devices.c.orig	Thu Jul 18 02:21:59 1991
++++ devices.c	Sat Jun 16 02:15:48 2007
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ #include "defs.h"
+   /* this module contains one function, dev_setup, which is called by the main
+      gplot modules at startup time. It is the only existing piece of code
diff --git a/graphics/gplot/files/patch-drawcgm__cgm_clip.c b/graphics/gplot/files/patch-drawcgm__cgm_clip.c
new file mode 100644
index 00000000000..0d663c32de6
--- /dev/null
+++ b/graphics/gplot/files/patch-drawcgm__cgm_clip.c
@@ -0,0 +1,20 @@
+--- drawcgm/cgm_clip.c.orig	Fri Mar 20 03:28:47 1992
++++ drawcgm/cgm_clip.c	Sat Jun 16 02:08:24 2007
+@@ -13,6 +13,8 @@
+ #endif
+ #if (!VMS)
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #endif
+ 
+ #include "cgm_clip.h"
+@@ -85,8 +87,6 @@
+ 	successful.
+ */	
+ {
+-	char *malloc();
+-
+ 	if (nx>ixbuf_sz)
+ 		{
+ 		if (debug) fprintf(stderr,
diff --git a/graphics/gplot/files/patch-drawcgm__cgm_textem.c b/graphics/gplot/files/patch-drawcgm__cgm_textem.c
new file mode 100644
index 00000000000..ec5bf166e6c
--- /dev/null
+++ b/graphics/gplot/files/patch-drawcgm__cgm_textem.c
@@ -0,0 +1,10 @@
+--- drawcgm/cgm_textem.c.orig	Thu Jul 18 02:22:32 1991
++++ drawcgm/cgm_textem.c	Sat Jun 16 02:09:15 2007
+@@ -37,6 +37,7 @@
+ #endif
+ #ifdef USE_UNIX
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #endif
+ #ifdef ardent
diff --git a/graphics/gplot/files/patch-drawcgm__cgmgen.c b/graphics/gplot/files/patch-drawcgm__cgmgen.c
new file mode 100644
index 00000000000..7fd2633698c
--- /dev/null
+++ b/graphics/gplot/files/patch-drawcgm__cgmgen.c
@@ -0,0 +1,47 @@
+--- drawcgm/cgmgen.c.orig	Tue Sep  1 23:24:48 1992
++++ drawcgm/cgmgen.c	Sat Jun 16 00:59:41 2007
+@@ -67,6 +67,7 @@
+ #endif
+ #ifdef USE_UNIX
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #endif
+ #ifdef ardent
+@@ -296,6 +297,10 @@
+ case 1: out= ( (*ptr >> (7-bit)) & 1 ); bit= bit + 1;			\
+ if (bit == 8) { bit = 0; ++ptr; }; }					\
+ 
++static int cgmfree();
++static unsigned int ibufsz();
++static unsigned int pbufsz();
++
+ igtmem(psz)
+ /*
+ 	This routine returns a pointer to available memory;  it is included
+@@ -303,7 +308,6 @@
+ */
+ int *psz;
+ {
+-	char *malloc();
+ 	if (debugmode) fprintf(stderr," IGTMEM:  allocating %d bytes.\n",*psz);
+ 	return((int) malloc( (unsigned int) *psz ));
+ }
+@@ -389,7 +393,7 @@
+ static void checkbufsize(newsize)
+ unsigned int newsize;
+ {
+-	char *malloc(),*realloc(),msgbuf[256];
++	char msgbuf[256];
+ 
+        	if ( newsize > datasize )
+ 		{
+@@ -1045,7 +1049,7 @@
+ */
+ {
+ 	float *clrptr, *tblend;
+-	char *realloc(),msgbuf[256];
++	char msgbuf[256];
+ 
+ 	if (debugmode) fprintf(stderr," wrmxci: max color index= %d\n",
+ 		*maxclrindx);
diff --git a/graphics/gplot/files/patch-emul.c b/graphics/gplot/files/patch-emul.c
new file mode 100644
index 00000000000..4fbe975dcf7
--- /dev/null
+++ b/graphics/gplot/files/patch-emul.c
@@ -0,0 +1,11 @@
+--- emul.c.orig	Thu Jul 18 02:22:01 1991
++++ emul.c	Sat Jun 16 01:04:15 2007
+@@ -5,6 +5,8 @@
+ #include <stdio.h>
+ #include "defs.h"
+ 
++static em_arc();
++
+ /* store these pointers to allow lookups into the CGM data structures */
+ static struct one_opt 		*popt;	/* the command line options, in only */
+ static struct mf_d_struct 	*pc1;	/* the class 1 elements, in only */
diff --git a/graphics/gplot/files/patch-gplot.c b/graphics/gplot/files/patch-gplot.c
new file mode 100644
index 00000000000..fb1bd6e9774
--- /dev/null
+++ b/graphics/gplot/files/patch-gplot.c
@@ -0,0 +1,11 @@
+--- gplot.c.orig	Thu Oct 31 06:33:47 1991
++++ gplot.c	Sat Jun 16 02:01:54 2007
+@@ -4,6 +4,8 @@
+    considered callable by other programs (inclusion of graphics with text) 
+ */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "defs.h"
+ #define max_str 128
+ #define  version_str "4.3b2"
diff --git a/graphics/gplot/files/patch-gtex.c b/graphics/gplot/files/patch-gtex.c
new file mode 100644
index 00000000000..ee59c662b10
--- /dev/null
+++ b/graphics/gplot/files/patch-gtex.c
@@ -0,0 +1,16 @@
+--- gtex.c.orig	Thu Jul 18 02:22:03 1991
++++ gtex.c	Sat Jun 16 01:11:02 2007
+@@ -4,10 +4,12 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <math.h>
++#include <stdlib.h>
++#include <string.h>
+ double atan();	/* not in some math.h */
+ #include "defs.h"
+ #define version_str "4.23"
+-char *allocate_mem(), *realloc();
++char *allocate_mem();
+ 
+ /* GPLOT style globals */
+ static struct info_struct dev_info;
diff --git a/graphics/gplot/files/patch-hload.c b/graphics/gplot/files/patch-hload.c
new file mode 100644
index 00000000000..f99cb053f3a
--- /dev/null
+++ b/graphics/gplot/files/patch-hload.c
@@ -0,0 +1,13 @@
+--- hload.c.orig	Thu Jul 18 02:22:04 1991
++++ hload.c	Sat Jun 16 01:03:27 2007
+@@ -5,6 +5,10 @@
+ #include "defs.h"
+ #define END_FLAG 0
+ 
++static do_vecs();
++static send_vecs();
++static dim_str();
++
+ /* show a character */
+ static show_char(font_no, char_no)
+ int font_no, char_no;
diff --git a/graphics/gplot/files/patch-io.c b/graphics/gplot/files/patch-io.c
new file mode 100644
index 00000000000..0b55c427774
--- /dev/null
+++ b/graphics/gplot/files/patch-io.c
@@ -0,0 +1,20 @@
+--- io.c.orig	Thu Jul 18 02:22:05 1991
++++ io.c	Sat Jun 16 02:17:10 2007
+@@ -2,6 +2,8 @@
+ /* all rights reserved */
+ /* handle the I/O in this module */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "defs.h"
+ static int list_io;	/* do some listing */
+ #define max_str 128
+@@ -80,7 +82,7 @@
+ static FILE *inptr = NULL, *outptr, *dvifile;	/* input and output pointers */
+ #endif
+ static int block_size, record_size;
+-unsigned char  *realloc(), *allocate_mem();
++unsigned char  *allocate_mem();
+ #define max_b_size 1024
+ static int out_b_size;      /* output buffer (how much can use) */
+      static int b_ind = 0;               /* index into array */
diff --git a/graphics/gplot/files/patch-pkras.c b/graphics/gplot/files/patch-pkras.c
new file mode 100644
index 00000000000..2352aaa823e
--- /dev/null
+++ b/graphics/gplot/files/patch-pkras.c
@@ -0,0 +1,23 @@
+--- pkras.c.orig	Thu Jul 18 02:22:07 1991
++++ pkras.c	Sat Jun 16 01:31:42 2007
+@@ -2,7 +2,12 @@
+ /* module to decode a PK format packed raster font description */
+ /* globals for pk processing */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "defs.h"
++
++static dim_str();
++
+ #define NO_FONTS 8	/* the number of font styles pre-defined */
+ #define max_mags 100
+ #define pts_in 72.27
+@@ -32,7 +37,6 @@
+ static int rot_bytes_allocated = r_b_allocated;
+ static char ras_array[r_b_allocated], rot_array[r_b_allocated];
+ static char *ras_ptr = ras_array, *rot_ptr = rot_array;
+-extern char *realloc();
+ 
+ #define max_char_stor 100000
+ static unsigned char char_stor[max_char_stor];	/* store character definitions */
diff --git a/graphics/gplot/files/patch-ps.c b/graphics/gplot/files/patch-ps.c
new file mode 100644
index 00000000000..040272e2ec7
--- /dev/null
+++ b/graphics/gplot/files/patch-ps.c
@@ -0,0 +1,18 @@
+--- ps.c.orig	Wed Jun 17 02:29:19 1992
++++ ps.c	Sat Jun 16 01:05:35 2007
+@@ -2,10 +2,15 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "defs.h"
+ #define byte_size 8
+ #define out_ln(instr) {out_string(instr); fb();}
+ #define APPENDED_MARKER -123	/* appended text coming */
++
++static send_string();
++static flush_string();
++static l_dofont();
+ 
+ /* module for PostScript specific functions, note that we expect the device
+    resolution is pxl_per_in, set by the calling program. All dimensions are expected
diff --git a/graphics/gplot/files/patch-qms.c b/graphics/gplot/files/patch-qms.c
new file mode 100644
index 00000000000..b20b764cc92
--- /dev/null
+++ b/graphics/gplot/files/patch-qms.c
@@ -0,0 +1,15 @@
+--- qms.c.orig	Thu Jul 18 02:22:08 1991
++++ qms.c	Sat Jun 16 02:01:07 2007
+@@ -2,7 +2,12 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "defs.h"
++
++static set_fill();
++static float grey_col();
++
+ #define byte_size 8
+ #define out_ln(instr) {out_string(instr); fb();}
+ 
diff --git a/graphics/gplot/files/patch-tek.c b/graphics/gplot/files/patch-tek.c
new file mode 100644
index 00000000000..59f3f119d86
--- /dev/null
+++ b/graphics/gplot/files/patch-tek.c
@@ -0,0 +1,15 @@
+--- tek.c.orig	Thu Jul 18 02:22:10 1991
++++ tek.c	Sat Jun 16 01:07:12 2007
+@@ -1,7 +1,12 @@
+ /* copyright 1987, 1988, 1989 Phil Andrews, Pittsburgh Supercomputing Center */
+ #include <stdio.h>
+ #include <ctype.h>
++#include <string.h>
+ #include "defs.h"
++
++static save_env();
++static load_dcmap();
++
+ /* macros for generic TEKTRONIX processing */
+ #define eot	'\004'	/* end of file */
+ #define ctrl_e	'\005'	/* enquire tty status */