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
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
diff -urN pnm2ppa.orig/docs/en/INSTALL pnm2ppa/docs/en/INSTALL
--- pnm2ppa.orig/docs/en/INSTALL Wed Jul 4 10:13:12 2001
+++ pnm2ppa/docs/en/INSTALL Wed Apr 17 01:31:54 2002
@@ -39,8 +39,8 @@
make install
-to install the binaries (by default, in /usr/local/bin/) ,
-the manpage (in /usr/local/man/man1), and the sample
+to install the binaries (by default, in /usr/bin/) ,
+the manpage (in /usr/share/man/man1), and the sample
configuration file (/etc/pnm2ppa.conf). You may change these locations
by editing the Makefile.
@@ -70,7 +70,7 @@
not really needed.)
-If this script is placed in /usr/local/bin/ppaprint ,
+If this script is placed in /usr/bin/ppaprint ,
ppaprint file.ps
diff -urN pnm2ppa.orig/docs/en/INSTALL.SUSE pnm2ppa/docs/en/INSTALL.SUSE
--- pnm2ppa.orig/docs/en/INSTALL.SUSE Fri Oct 27 12:29:12 2000
+++ pnm2ppa/docs/en/INSTALL.SUSE Wed Apr 17 01:31:54 2002
@@ -5,8 +5,8 @@
Follow the standard installation instructions in INSTALL and CALIBRATION.
-The driver pnm2ppa is installed to /usr/local/bin. The manual page
-pnm2ppa.1 is installed in /usr/local/man/man1.
+The driver pnm2ppa is installed to /usr/bin. The manual page
+pnm2ppa.1 is installed in /usr/share/man/man1.
2. To integrate pnm2ppa into the BSD print spooler of the Linux system we
create printer spoolers in /etc/printcap, to print
diff -urN pnm2ppa.orig/lpd/README.lpd pnm2ppa/lpd/README.lpd
--- pnm2ppa.orig/lpd/README.lpd Sat Oct 28 07:58:07 2000
+++ pnm2ppa/lpd/README.lpd Wed Apr 17 01:31:54 2002
@@ -22,7 +22,7 @@
./lpdsetup a4
./lpdsetup a3
-This installs the filters in /usr/local/bin and creates the corresponding
+This installs the filters in /usr/bin and creates the corresponding
spool directories /var/spool/lpd/color, etc, You must be root to do this.
You may wish to edit the options specified in the filter files
diff -urN pnm2ppa.orig/lpd/ascii.if pnm2ppa/lpd/ascii.if
--- pnm2ppa.orig/lpd/ascii.if Sat Oct 28 07:58:07 2000
+++ pnm2ppa/lpd/ascii.if Wed Apr 17 01:31:54 2002
@@ -1,7 +1,7 @@
#! /bin/sh
# for printing black and white text (ascii) files.
-FILTER="/usr/local/bin/bw.if"
-#FILTER="/usr/local/bin/bweco.if"
+FILTER="/usr/bin/bw.if"
+#FILTER="/usr/bin/bweco.if"
#------enscript command line--------------------------
enscript -2rj -p- | $FILTER
diff -urN pnm2ppa.orig/lpd/bw.if pnm2ppa/lpd/bw.if
--- pnm2ppa.orig/lpd/bw.if Sat Oct 28 07:58:07 2000
+++ pnm2ppa/lpd/bw.if Wed Apr 17 01:31:54 2002
@@ -6,7 +6,7 @@
#PAPER=a4
#PAPER=a3
#PPAOPTS="-B 2"
-PNM2PPA="/usr/local/bin/pnm2ppa"
+PNM2PPA="/usr/bin/pnm2ppa"
#------------------dont change below this line----------------------
gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
$PNM2PPA --bw $PPAOPTS -i - -o -
diff -urN pnm2ppa.orig/lpd/bweco.if pnm2ppa/lpd/bweco.if
--- pnm2ppa.orig/lpd/bweco.if Sat Oct 28 07:58:07 2000
+++ pnm2ppa/lpd/bweco.if Wed Apr 17 01:31:54 2002
@@ -6,7 +6,7 @@
#PAPER=a4
#PAPER=a3
#PPAOPTS="-B 2"
-PNM2PPA="/usr/local/bin/pnm2ppa"
+PNM2PPA="/usr/bin/pnm2ppa"
#------------------dont change below this line----------------------
gs -sDEVICE=pbmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
$PNM2PPA --bw --eco $PPAOPTS -i - -o -
diff -urN pnm2ppa.orig/lpd/color.if pnm2ppa/lpd/color.if
--- pnm2ppa.orig/lpd/color.if Sat Oct 28 07:58:07 2000
+++ pnm2ppa/lpd/color.if Wed Apr 17 01:31:54 2002
@@ -6,7 +6,7 @@
#PAPER=a4
#PAPER=a3
#PPAOPTS="-p"
-PNM2PPA="/usr/local/bin/pnm2ppa"
+PNM2PPA="/usr/bin/pnm2ppa"
#------------------dont change below this line----------------------
gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
$PNM2PPA $PPAOPTS -i - -o -
diff -urN pnm2ppa.orig/lpd/coloreco.if pnm2ppa/lpd/coloreco.if
--- pnm2ppa.orig/lpd/coloreco.if Sat Oct 28 07:58:07 2000
+++ pnm2ppa/lpd/coloreco.if Wed Apr 17 01:31:54 2002
@@ -6,7 +6,7 @@
#PAPER=a4
#PAPER=a3
#PPAOPTS="--fd"
-PNM2PPA="/usr/local/bin/pnm2ppa"
+PNM2PPA="/usr/bin/pnm2ppa"
#------------------dont change below this line----------------------
gs -sDEVICE=ppmraw -sPAPERSIZE=$PAPER -q -dNOPAUSE -r600 -sOutputFile=- - | \
$PNM2PPA --eco $PPAOPTS -i - -o -
diff -urN pnm2ppa.orig/lpd/lpdsetup pnm2ppa/lpd/lpdsetup
--- pnm2ppa.orig/lpd/lpdsetup Fri Oct 27 12:29:12 2000
+++ pnm2ppa/lpd/lpdsetup Wed Apr 17 01:31:54 2002
@@ -1,5 +1,5 @@
#!/bin/sh
-INSTALLDIR="/usr/local/bin"
+INSTALLDIR="/usr/bin"
SPOOLDIR="/var/spool/lpd"
PAPER=letter
for paper in letter legal a3 a4 ; do
diff -urN pnm2ppa.orig/lpd/printcap pnm2ppa/lpd/printcap
--- pnm2ppa.orig/lpd/printcap Fri Oct 27 11:12:23 2000
+++ pnm2ppa/lpd/printcap Wed Apr 17 01:31:54 2002
@@ -6,7 +6,7 @@
:sd=/var/spool/lpd/coloreco:\
:lf=/var/spool/lpd/coloreco/log:\
:af=/var/spool/lpd/coloreco/acct:\
- :if=/usr/local/bin/coloreco.if:\
+ :if=/usr/bin/coloreco.if:\
:la:mx#0:\
:sh:sf:
@@ -16,7 +16,7 @@
:sd=/var/spool/lpd/color:\
:lf=/var/spool/lpd/color/log:\
:af=/var/spool/lpd/color/acct:\
- :if=/usr/local/bin/color.if:\
+ :if=/usr/bin/color.if:\
:la:mx#0:\
:sh:sf:
@@ -26,7 +26,7 @@
:sd=/var/spool/lpd/bw:\
:lf=/var/spool/lpd/bw/log:\
:af=/var/spool/lpd/bw/acct:\
- :if=/usr/local/bin/bw.if:\
+ :if=/usr/bin/bw.if:\
:la:mx#0:\
:sh:sf:
@@ -36,7 +36,7 @@
:sd=/var/spool/lpd/bweco:\
:lf=/var/spool/lpd/bweco/log:\
:af=/var/spool/lpd/bweco/acct:\
- :if=/usr/local/bin/bweco.if:\
+ :if=/usr/bin/bweco.if:\
:la:mx#0:\
:sh:sf:
@@ -46,7 +46,7 @@
:sd=/var/spool/lpd/ascii:\
:lf=/var/spool/lpd/ascii/log:\
:af=/var/spool/lpd/ascii/acct:\
- :if=/usr/local/bin/ascii.if:\
+ :if=/usr/bin/ascii.if:\
:la:mx#0:\
:sh:sf:
diff -urN pnm2ppa.orig/pnm2ppa.c pnm2ppa/pnm2ppa.c
--- pnm2ppa.orig/pnm2ppa.c Sat Nov 11 11:53:03 2000
+++ pnm2ppa/pnm2ppa.c Wed Apr 17 01:32:35 2002
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <stdlib.h>
+#define _GNU_SOURCE
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -156,7 +157,7 @@
a user-specifed file *File_path may later be opened;
should any extra validation of this be performed now ?
*/
- path = File_path;
+ path = strndup( File_path, MAXPATHLEN );
return path;
}
}
diff -urN pnm2ppa.orig/pnm2ppa.conf pnm2ppa/pnm2ppa.conf
--- pnm2ppa.orig/pnm2ppa.conf Sat Oct 28 08:02:57 2000
+++ pnm2ppa/pnm2ppa.conf Wed Apr 17 01:31:54 2002
@@ -12,7 +12,6 @@
# will be used. The printer version can also be set with the command line
# option e.g., "-v 720".
-version ERROR # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!!
#version 720 # 710, 712, 722 also acceptable
#version 820
#version 1000
diff -urN pnm2ppa.orig/ppaSet-beta1/install pnm2ppa/ppaSet-beta1/install
--- pnm2ppa.orig/ppaSet-beta1/install Wed Jul 4 10:13:12 2001
+++ pnm2ppa/ppaSet-beta1/install Wed Apr 17 01:31:54 2002
@@ -3,7 +3,7 @@
if [ "$4" = "" ]
then
echo "usage: install <basedir> <bindir> <calibrate_ppa> <pnm2ppa>"
- echo "example: install /usr/local/ppaSet/ /usr/local/bin /usr/local/bin/calibrate_ppa /usr/local/bin/pnm2ppa"
+ echo "example: install /usr/ppaSet/ /usr/bin /usr/bin/calibrate_ppa /usr/bin/pnm2ppa"
exit 1
fi
@@ -92,15 +92,15 @@
then
if [ "$WHAT" = "2" ]
then
- cp -v /etc/printcap /etc/printcap.old
- cat $BASEDIR/printcap.add >> /etc/printcap
+ cp -v ${D}/etc/printcap ${D}/etc/printcap.old
+ cat $BASEDIR/printcap.add >> ${D}/etc/printcap
else
- cp -v /etc/printcap /etc/printcap.old
- cp -v $BASEDIR/printcap.only /etc/printcap
+ cp -v ${D}/etc/printcap ${D}/etc/printcap.old
+ cp -v $BASEDIR/printcap.only ${D}/etc/printcap
fi
- install --verbose -d /var/spool/lpd/ppa
- touch /var/spool/lpd/ppa/log
- touch /var/spool/lpd/ppa/acct
+ install --verbose -d ${D}/var/spool/lpd/ppa
+ touch ${D}/var/spool/lpd/ppa/log
+ touch ${D}/var/spool/lpd/ppa/acct
fi
#echo " "
diff -urN pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h pnm2ppa/ppaSet-beta1/ppaSetBase.h
--- pnm2ppa.orig/ppaSet-beta1/ppaSetBase.h Wed Jul 4 10:13:12 2001
+++ pnm2ppa/ppaSet-beta1/ppaSetBase.h Wed Apr 17 01:31:54 2002
@@ -3,22 +3,22 @@
// The default paths, if not given
#ifndef BASEDIR
-#define BASEDIR "/usr/local/ppaSet"
+#define BASEDIR "/usr/ppaSet"
#endif
#ifndef TEST
-#define TEST "/usr/local/ppaSet/test"
+#define TEST "/usr/ppaSet/test"
#endif
#ifndef CALIBRATION
-#define CALIBRATION "/usr/local/ppaSet/calibration"
+#define CALIBRATION "/usr/ppaSet/calibration"
#endif
#ifndef GAMMAREF
-#define GAMMAREF "/usr/local/ppaSet/gammaRef"
+#define GAMMAREF "/usr/ppaSet/gammaRef"
#endif
#ifndef NOGAMMA
-#define NOGAMMA "/usr/local/ppaSet/noGamma"
+#define NOGAMMA "/usr/ppaSet/noGamma"
#endif
#ifndef CLEAN
-#define CLEAN "/usr/local/ppaSet/cleanHeads"
+#define CLEAN "/usr/ppaSet/cleanHeads"
#endif
#ifndef LPR
#define LPR "/usr/bin/lpr"
diff -urN pnm2ppa.orig/ppaSet-beta1/printcap.add pnm2ppa/ppaSet-beta1/printcap.add
--- pnm2ppa.orig/ppaSet-beta1/printcap.add Wed Jul 4 10:13:12 2001
+++ pnm2ppa/ppaSet-beta1/printcap.add Wed Apr 17 01:31:54 2002
@@ -5,5 +5,5 @@
:sd=/var/spool/lpd/ppa:\
:lf=/var/spool/lpd/ppa/log:\
:af=/var/spool/lpd/ppa/acct:\
- :if=/usr/local/bin/ppa.if:\
+ :if=/usr/bin/ppa.if:\
:la:mx#0:
diff -urN pnm2ppa.orig/ppaSet-beta1/printcap.only pnm2ppa/ppaSet-beta1/printcap.only
--- pnm2ppa.orig/ppaSet-beta1/printcap.only Wed Jul 4 10:13:12 2001
+++ pnm2ppa/ppaSet-beta1/printcap.only Wed Apr 17 01:31:54 2002
@@ -5,5 +5,5 @@
:sd=/var/spool/lpd/ppa:\
:lf=/var/spool/lpd/ppa/log:\
:af=/var/spool/lpd/ppa/acct:\
- :if=/usr/local/bin/ppa.if:\
+ :if=/usr/bin/ppa.if:\
:la:mx#0:
|
GitWeb