1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
Although not thought for the port, this patch was submitted to the varkon
lists so hopefully we will not need it for the next release. --pfg
*** Makefile.FreeBSD.orig Wed Apr 16 18:02:04 2003
--- Makefile.FreeBSD Wed Apr 16 18:23:37 2003
***************
*** 9,15 ****
#
##########################################################
! # The varkon object libraies
LIBS = $(VARKON_ROOT)/sources/IG/lib/IGlib.a \
$(VARKON_ROOT)/sources/PM/lib/PMlib.a \
--- 9,15 ----
#
##########################################################
! # The varkon object libraries
LIBS = $(VARKON_ROOT)/sources/IG/lib/IGlib.a \
$(VARKON_ROOT)/sources/PM/lib/PMlib.a \
***************
*** 21,31 ****
# Xlibs
! XLIBS = -lX11
# OpenGL libs (currently not supported on Sun's)
! GLIBS = -IGL -IGLU
# The actual executable, xvarkon.
--- 21,31 ----
# Xlibs
! XLIBS = -L/usr/X11R6/lib -lX11 -lXext
# OpenGL libs (currently not supported on Sun's)
! GLIBS = -lGL -lGLU
# The actual executable, xvarkon.
***************
*** 34,40 ****
# Targets
$(XVARKON): $(LIBS)
! cc $(LIBS) $(XLIBS) -lm -o $(XVARKON)
##########################################################
--- 34,40 ----
# Targets
$(XVARKON): $(LIBS)
! cc $(LIBS) $(XLIBS) $(GLIBS) -lm -o $(XVARKON)
##########################################################
*** IG/src/ig2.c.orig Sat Apr 12 16:55:19 2003
--- IG/src/ig2.c Sat Apr 12 16:55:45 2003
***************
*** 54,60 ****
#ifdef UNIX
#undef VSTART
! #include "termio.h"
#endif
extern MNUALT smbind[]; /* Symboler */
--- 54,60 ----
#ifdef UNIX
#undef VSTART
! #include "termios.h"
#endif
extern MNUALT smbind[]; /* Symboler */
*** PL/src/epson.c.orig Tue Apr 15 10:31:15 2003
--- PL/src/epson.c Tue Apr 15 10:33:10 2003
***************
*** 44,50 ****
#include "../include/params.h"
#include <string.h>
#include <time.h>
! #include <malloc.h>
/*
*******************************************************!*/
--- 44,50 ----
#include "../include/params.h"
#include <string.h>
#include <time.h>
! #include <stdlib.h>
/*
*******************************************************!*/
*** PL/src/gerber.c.orig Tue Apr 15 12:17:21 2003
--- PL/src/gerber.c Tue Apr 15 12:17:40 2003
***************
*** 44,50 ****
#include "../include/params.h"
#include <string.h>
#include <time.h>
! #include <malloc.h>
#define ppixsz 0.0254 /* Plotter pixel x-size i mm */
#define ppiysz 0.0254 /* Plotter pixel y-size i mm */
--- 44,50 ----
#include "../include/params.h"
#include <string.h>
#include <time.h>
! #include <stdlib.h>
#define ppixsz 0.0254 /* Plotter pixel x-size i mm */
#define ppiysz 0.0254 /* Plotter pixel y-size i mm */
*** PL/src/ibmpro.c.orig Tue Apr 15 12:16:13 2003
--- PL/src/ibmpro.c Tue Apr 15 12:16:48 2003
***************
*** 44,50 ****
#include "../include/params.h"
#include <string.h>
#include <time.h>
! #include <malloc.h>
bool arccon; /* Måla cirklars rand */
short lastx; /* Sista pos X */
--- 44,50 ----
#include "../include/params.h"
#include <string.h>
#include <time.h>
! #include <stdlib.h>
bool arccon; /* Måla cirklars rand */
short lastx; /* Sista pos X */
*** PM/src/Makefile.FreeBSD.orig Tue Apr 15 10:23:40 2003
--- PM/src/Makefile.FreeBSD Tue Apr 15 10:24:38 2003
***************
*** 19,25 ****
-O \
-DWRK_STAT \
-DV3_X11 -I/usr/X11R6/include \
! -DUNIX
debug : CFLAGS += -g -DDEBUG
--- 19,25 ----
-O \
-DWRK_STAT \
-DV3_X11 -I/usr/X11R6/include \
! -DUNIX -DVARKON
debug : CFLAGS += -g -DDEBUG
*** AN/src/Makefile.FreeBSD.orig Tue Apr 15 10:26:37 2003
--- AN/src/Makefile.FreeBSD Tue Apr 15 10:27:28 2003
***************
*** 28,34 ****
-D_POSIX_SOURCE \
-DUNIX \
-DANALYZER \
! -DWRK_STAT -I/usr/X11R6/include
LDFLAGS = -L/usr/X11R6/lib
--- 28,35 ----
-D_POSIX_SOURCE \
-DUNIX \
-DANALYZER \
! -DWRK_STAT -I/usr/X11R6/include \
! -DVARKON
LDFLAGS = -L/usr/X11R6/lib
|
