View | Details | Raw Unified | Return to bug 113774
Collapse All | Expand All

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

Return to bug 113774