| blob | 2f898c2206c1a46b74140dbaaed7c0449dadf647 |
1 /usr/ccs/ path is deprecated and should be used only for compatibility
3 diff -Nurb sccs-5.08/patch/patch_sym.mk sccs-5.08.patched/patch/patch_sym.mk
4 --- sccs-5.08/patch/patch_sym.mk 2011-09-06 00:07:37.000000000 +0000
5 +++ sccs-5.08.patched/patch/patch_sym.mk 2017-06-03 00:38:14.955159289 +0000
6 @@ -6,7 +6,7 @@
7 ###########################################################################
8 _EXEEXT= $(EXEEXT)
10 -INSDIR= ccs/bin
11 +INSDIR= bin
12 TARGET= sccspatch
13 ORIG= spatch
14 PSYMLINKS= $(DEST_DIR)$(INS_BASE)/$(INSDIR)/$(TARGET)$(_EXEEXT)
15 diff -Nurb sccs-5.08/sccs/man/sccs-admin.1 sccs-5.08.patched/sccs/man/sccs-admin.1
16 --- sccs-5.08/sccs/man/sccs-admin.1 2015-04-29 20:40:04.000000000 +0000
17 +++ sccs-5.08.patched/sccs/man/sccs-admin.1 2017-06-03 00:38:14.973215958 +0000
18 @@ -37,7 +37,7 @@
19 .SH SYNOPSIS
20 .LP
21 .LP
22 -.B /usr/ccs/bin/admin
23 +.B /usr/bin/admin
24 .RB [ -bhknoz ]
25 .RB [ -a\c
26 .IR " username " | " groupid" ]...
27 diff -Nurb sccs-5.08/sccs/man/sccs-cdc.1 sccs-5.08.patched/sccs/man/sccs-cdc.1
28 --- sccs-5.08/sccs/man/sccs-cdc.1 2015-04-29 20:40:04.000000000 +0000
29 +++ sccs-5.08.patched/sccs/man/sccs-cdc.1 2017-06-03 00:38:14.978426668 +0000
30 @@ -37,7 +37,7 @@
31 .SH SYNOPSIS
32 .LP
33 .nf
34 -.B "/usr/ccs/bin/cdc \c
35 +.B "/usr/bin/cdc \c
36 .BI -r "sid \c"
37 .RB [ -m\c
38 .IR mr-list "] \c
39 diff -Nurb sccs-5.08/sccs/man/sccs-comb.1 sccs-5.08.patched/sccs/man/sccs-comb.1
40 --- sccs-5.08/sccs/man/sccs-comb.1 2015-04-29 20:40:04.000000000 +0000
41 +++ sccs-5.08.patched/sccs/man/sccs-comb.1 2017-06-03 00:38:14.986067762 +0000
42 @@ -37,7 +37,7 @@
43 .SH SYNOPSIS
44 .LP
45 .nf
46 -.B "/usr/ccs/bin/comb \c
47 +.B "/usr/bin/comb \c
48 .RB [ -os "] \c
49 .RB [ -c\c
50 .IR sid-list "] \c
51 diff -Nurb sccs-5.08/sccs/man/sccs-delta.1 sccs-5.08.patched/sccs/man/sccs-delta.1
52 --- sccs-5.08/sccs/man/sccs-delta.1 2015-04-29 20:40:04.000000000 +0000
53 +++ sccs-5.08.patched/sccs/man/sccs-delta.1 2017-06-03 00:38:14.998828053 +0000
54 @@ -37,7 +37,7 @@
55 .SH SYNOPSIS
56 .LP
57 .nf
58 -.B /usr/ccs/bin/delta \c
59 +.B /usr/bin/delta \c
60 .RB [ -dfhnopsz "] \c
61 .RB [ "-g \c
62 .I sid-list \c
63 @@ -627,7 +627,7 @@
64 for descriptions of the following attributes:
65 .sp
67 -.SS /usr/ccs/bin/delta
68 +.SS /usr/bin/delta
70 .LP
72 diff -Nurb sccs-5.08/sccs/man/sccs-get.1 sccs-5.08.patched/sccs/man/sccs-get.1
73 --- sccs-5.08/sccs/man/sccs-get.1 2015-04-29 20:40:04.000000000 +0000
74 +++ sccs-5.08.patched/sccs/man/sccs-get.1 2017-06-03 00:38:15.018241410 +0000
75 @@ -37,7 +37,7 @@
76 sccs-get, get \- retrieve a version of an SCCS file
77 .SH SYNOPSIS
78 .LP
79 -.B /usr/ccs/bin/get
80 +.B /usr/bin/get
81 .RB [ -beFgkmnopst ]
82 .RB [ -l
83 [p]]
84 @@ -654,7 +654,7 @@
85 .B get
86 version number string and exists.
88 -.SS /usr/ccs/bin/get
89 +.SS /usr/bin/get
91 .br
92 .ne 3
93 @@ -759,7 +759,7 @@
94 .TP
95 .BI -r sid
96 Same as for
97 -.B /usr/ccs/bin/get
98 +.B /usr/bin/get
99 except that
100 .B SID
101 is mandatory.
102 @@ -771,18 +771,18 @@
103 .TP
104 .BI -x sid-list
105 Same as for
106 -.B /usr/ccs/bin/get
107 +.B /usr/bin/get
108 except that
109 .B sid-list
110 is mandatory.
112 .SH OUTPUT
114 -.SS /usr/ccs/bin/get
115 +.SS /usr/bin/get
117 .LP
118 The output format for
119 -.B /usr/ccs/bin/get
120 +.B /usr/bin/get
121 is as follows:
123 .LP
124 @@ -1237,7 +1237,7 @@
125 for descriptions of the following attributes:
126 .sp
128 -.SS /usr/ccs/bin/get
129 +.SS /usr/bin/get
131 .LP
133 diff -Nurb sccs-5.08/sccs/man/sccs-help.1 sccs-5.08.patched/sccs/man/sccs-help.1
134 --- sccs-5.08/sccs/man/sccs-help.1 2015-01-20 22:40:01.000000000 +0000
135 +++ sccs-5.08.patched/sccs/man/sccs-help.1 2017-06-03 00:38:15.022958895 +0000
136 @@ -37,7 +37,7 @@
137 .SH SYNOPSIS
138 .LP
139 .nf
140 -.B /usr/ccs/bin/help \c
141 +.B /usr/bin/help \c
142 .RI [ argument ]...
143 .fi
145 @@ -68,7 +68,7 @@
147 .LP
148 When all else fails, try
149 -.RB ` "/usr/ccs/bin/help stuck" '.
150 +.RB ` "/usr/bin/help stuck" '.
152 .SH ENVIRONMENT VARIABLES
153 .sp
154 diff -Nurb sccs-5.08/sccs/man/sccs-prs.1 sccs-5.08.patched/sccs/man/sccs-prs.1
155 --- sccs-5.08/sccs/man/sccs-prs.1 2015-04-29 20:40:04.000000000 +0000
156 +++ sccs-5.08.patched/sccs/man/sccs-prs.1 2017-06-03 00:38:15.032927992 +0000
157 @@ -37,7 +37,7 @@
158 .SH SYNOPSIS
159 .LP
160 .nf
161 -.B "/usr/ccs/bin/prs \c
162 +.B "/usr/bin/prs \c
163 .RB [ -ael "] \c
164 .RB [ -c\c
165 .IR date-time "] \c
166 @@ -358,7 +358,7 @@
167 .nf
168 example% \c
169 .B
170 -/usr/ccs/bin/prs -e -d":I:\et:P:" program.c
171 +/usr/bin/prs -e -d":I:\et:P:" program.c
172 .fi
173 .in -2
175 diff -Nurb sccs-5.08/sccs/man/sccs-prt.1 sccs-5.08.patched/sccs/man/sccs-prt.1
176 --- sccs-5.08/sccs/man/sccs-prt.1 2015-04-29 20:40:04.000000000 +0000
177 +++ sccs-5.08.patched/sccs/man/sccs-prt.1 2017-06-03 00:38:15.038931158 +0000
178 @@ -37,7 +37,7 @@
179 .SH SYNOPSIS
180 .LP
181 .nf
182 -.B "/usr/ccs/bin/prt \c
183 +.B "/usr/bin/prt \c
184 .RB [ -abdefistu "] \c
185 .RB [ -c\c
186 .IR date-time "] \c
187 @@ -409,7 +409,7 @@
188 The following command:
190 .LP
191 -.B "example% /usr/ccs/bin/prt -y program.c
192 +.B "example% /usr/bin/prt -y program.c
194 .LP
195 produces a one-line display of the delta table entry for the
196 diff -Nurb sccs-5.08/sccs/man/sccs-rcs2sccs.1 sccs-5.08.patched/sccs/man/sccs-rcs2sccs.1
197 --- sccs-5.08/sccs/man/sccs-rcs2sccs.1 2015-01-21 20:52:34.000000000 +0000
198 +++ sccs-5.08.patched/sccs/man/sccs-rcs2sccs.1 2017-06-03 00:38:15.045206082 +0000
199 @@ -31,7 +31,7 @@
200 sccs-rcs2sccs, rcs2sccs \- convert RCS files into SCCS files
201 .SH SYNOPSIS
202 .LP
203 -.B /usr/ccs/bin/rcs2sccs
204 +.B /usr/bin/rcs2sccs
205 .RB [ \-rm ]
206 .RB [ \-V6 ]
207 .RI [ file... ]
208 diff -Nurb sccs-5.08/sccs/man/sccs-rmdel.1 sccs-5.08.patched/sccs/man/sccs-rmdel.1
209 --- sccs-5.08/sccs/man/sccs-rmdel.1 2015-04-29 20:40:04.000000000 +0000
210 +++ sccs-5.08.patched/sccs/man/sccs-rmdel.1 2017-06-03 00:38:15.049906985 +0000
211 @@ -37,7 +37,7 @@
212 .SH SYNOPSIS
213 .LP
214 .nf
215 -.B "/usr/ccs/bin/rmdel \c
216 +.B "/usr/bin/rmdel \c
217 .RB [ -d "] \c
218 .BI -r "sid \c
219 .RB [ -q\c
220 diff -Nurb sccs-5.08/sccs/man/sccs-sact.1 sccs-5.08.patched/sccs/man/sccs-sact.1
221 --- sccs-5.08/sccs/man/sccs-sact.1 2015-04-29 20:40:04.000000000 +0000
222 +++ sccs-5.08.patched/sccs/man/sccs-sact.1 2017-06-03 00:38:15.056885126 +0000
223 @@ -37,7 +37,7 @@
224 .SH SYNOPSIS
225 .LP
226 .nf
227 -.B "/usr/ccs/bin/sact \c
228 +.B "/usr/bin/sact \c
229 .RB [ \-s "] \c
230 .IR s.filename...
231 .fi
232 diff -Nurb sccs-5.08/sccs/man/sccs-sccsdiff.1 sccs-5.08.patched/sccs/man/sccs-sccsdiff.1
233 --- sccs-5.08/sccs/man/sccs-sccsdiff.1 2015-01-20 22:57:14.000000000 +0000
234 +++ sccs-5.08.patched/sccs/man/sccs-sccsdiff.1 2017-06-03 00:38:15.063760405 +0000
235 @@ -37,7 +37,7 @@
236 .SH SYNOPSIS
237 .LP
238 .nf
239 -.B "/usr/ccs/bin/sccsdiff \c
240 +.B "/usr/bin/sccsdiff \c
241 .RB [ -p "] \c
242 .BI -r "sid \c
243 .BI -r "sid \c
244 diff -Nurb sccs-5.08/sccs/man/sccs-unget.1 sccs-5.08.patched/sccs/man/sccs-unget.1
245 --- sccs-5.08/sccs/man/sccs-unget.1 2015-04-29 20:40:04.000000000 +0000
246 +++ sccs-5.08.patched/sccs/man/sccs-unget.1 2017-06-03 00:38:15.071350712 +0000
247 @@ -37,7 +37,7 @@
248 .SH SYNOPSIS
249 .LP
250 .nf
251 -.B "/usr/ccs/bin/unget \c
252 +.B "/usr/bin/unget \c
253 .RB [ -ns "] \c
254 .RB [ -q\c
255 .RI [ nsedelim "]] \c
256 diff -Nurb sccs-5.08/sccs/man/sccs-val.1 sccs-5.08.patched/sccs/man/sccs-val.1
257 --- sccs-5.08/sccs/man/sccs-val.1 2015-02-03 21:03:39.000000000 +0000
258 +++ sccs-5.08.patched/sccs/man/sccs-val.1 2017-06-03 00:38:15.075993965 +0000
259 @@ -37,11 +37,11 @@
260 .SH SYNOPSIS
261 .LP
262 .nf
263 -.BR /usr/ccs/bin/val " -
264 +.BR /usr/bin/val " -
265 .fi
266 .LP
267 .nf
268 -.B /usr/ccs/bin/val \c
269 +.B /usr/bin/val \c
270 .RB [ -T "] [" -s\c
271 .RB "] [" "-m \c
272 .I name\c
273 diff -Nurb sccs-5.08/sccs/man/sccs.1 sccs-5.08.patched/sccs/man/sccs.1
274 --- sccs-5.08/sccs/man/sccs.1 2015-01-20 22:04:45.000000000 +0000
275 +++ sccs-5.08.patched/sccs/man/sccs.1 2017-06-03 00:38:15.091517541 +0000
276 @@ -602,7 +602,7 @@
277 Many of the following
278 .B sccs
279 subcommands invoke programs that reside in
280 -.BR /usr/ccs/bin .
281 +.BR /usr/bin .
282 Many of these subcommands accept additional arguments that are
283 documented in the reference page for the utility program the
284 subcommand invokes.
285 @@ -1884,7 +1884,7 @@
287 .in +2
288 .nf
289 -.B "/usr/ccs/bin/get /usr/src/include/SCCS/s.stdio.h
290 +.B "/usr/bin/get /usr/src/include/SCCS/s.stdio.h
291 .fi
292 .in -2
294 @@ -1904,7 +1904,7 @@
296 .in +2
297 .nf
298 -.B "/usr/ccs/bin/get include/private/s.stdio.h
299 +.B "/usr/bin/get include/private/s.stdio.h
300 .fi
301 .in -2
303 @@ -1951,7 +1951,7 @@
305 .in +2
306 .nf
307 -.RB example% " sccs get /usr/src/sccs/cc.c
308 +.RB example% " sccs get /usr/src/scc.c
309 .fi
310 .in -2
312 @@ -1960,7 +1960,7 @@
314 .in +2
315 .nf
316 -.RB example% " sccs -p/usr/src/sccs/ get cc.c
317 +.RB example% " sccs -p/usr/src/s get cc.c
318 .fi
319 .in -2
321 @@ -2234,7 +2234,7 @@
322 .br
323 .ne 3
324 .TP
325 -.B /usr/ccs/bin/*
326 +.B /usr/bin/*
327 .B SCCS
328 utility programs
330 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/admin.c sccs-5.08.patched/sccs/sccs/cmd/src/admin.c
331 --- sccs-5.08/sccs/sccs/cmd/src/admin.c 2015-03-07 17:51:30.000000000 +0000
332 +++ sccs-5.08.patched/sccs/sccs/cmd/src/admin.c 2017-06-03 00:38:15.105931721 +0000
333 @@ -111,7 +111,7 @@
334 static char had_flag[NFLAGS]; /* -f seen list */
335 static char rm_flag[NFLAGS]; /* -d seen list */
336 #if defined(PROTOTYPES) && defined(INS_BASE)
337 -static char Valpgmp[] = NOGETTEXT(INS_BASE "/ccs/bin/" "val");
338 +static char Valpgmp[] = NOGETTEXT(INS_BASE "/bin/" "val");
339 #endif
340 static char Valpgm[] = NOGETTEXT("val");
341 static int fexists; /* Current file exists */
342 @@ -179,10 +179,10 @@
343 */
344 #ifdef PROTOTYPES
345 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
346 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
347 + NOGETTEXT(INS_BASE "/lib/locale/"));
348 #else
349 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
350 - NOGETTEXT("/usr/ccs/lib/locale/"));
351 + NOGETTEXT("/usr/lib/locale/"));
352 #endif
354 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
355 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/admin.mk sccs-5.08.patched/sccs/sccs/cmd/src/admin.mk
356 --- sccs-5.08/sccs/sccs/cmd/src/admin.mk 2014-08-13 22:07:38.000000000 +0000
357 +++ sccs-5.08.patched/sccs/sccs/cmd/src/admin.mk 2017-06-03 00:38:15.108797383 +0000
358 @@ -8,7 +8,7 @@
359 ###########################################################################
361 #INSDIR= sccs
362 -INSDIR= ccs/bin
363 +INSDIR= bin
364 TARGET= admin
365 CPPOPTS += -DSUN5_0
366 CPPOPTS += -DUSE_LARGEFILES
367 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/bdiff.c sccs-5.08.patched/sccs/sccs/cmd/src/bdiff.c
368 --- sccs-5.08/sccs/sccs/cmd/src/bdiff.c 2015-04-23 20:14:40.000000000 +0000
369 +++ sccs-5.08.patched/sccs/sccs/cmd/src/bdiff.c 2017-06-03 00:38:15.115127826 +0000
370 @@ -89,7 +89,7 @@
371 static int seglim; /* limit of size of file segment to be generated */
373 #if defined(PROTOTYPES) && defined(INS_BASE)
374 -static char diffp[] = INS_BASE "/ccs/bin/" "diff";
375 +static char diffp[] = INS_BASE "/bin/" "diff";
376 #endif
377 static char diff[] = "/usr/bin/diff";
378 static char tempskel[] = "/tmp/bdXXXXXX"; /* used to generate temp file names */
379 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/bdiff.mk sccs-5.08.patched/sccs/sccs/cmd/src/bdiff.mk
380 --- sccs-5.08/sccs/sccs/cmd/src/bdiff.mk 2008-01-02 18:01:58.000000000 +0000
381 +++ sccs-5.08.patched/sccs/sccs/cmd/src/bdiff.mk 2017-06-03 00:38:15.117899055 +0000
382 @@ -5,7 +5,7 @@
383 include $(SRCROOT)/$(RULESDIR)/rules.top
384 ###########################################################################
386 -INSDIR= ccs/bin
387 +INSDIR= bin
388 TARGET= bdiff
390 CPPOPTS += -DSUN5_0
391 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/comb.c sccs-5.08.patched/sccs/sccs/cmd/src/comb.c
392 --- sccs-5.08/sccs/sccs/cmd/src/comb.c 2015-02-06 20:46:32.000000000 +0000
393 +++ sccs-5.08.patched/sccs/sccs/cmd/src/comb.c 2017-06-03 00:38:15.123081470 +0000
394 @@ -90,10 +90,10 @@
395 */
396 #ifdef PROTOTYPES
397 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
398 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
399 + NOGETTEXT(INS_BASE "/lib/locale/"));
400 #else
401 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
402 - NOGETTEXT("/usr/ccs/lib/locale/"));
403 + NOGETTEXT("/usr/lib/locale/"));
404 #endif
406 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
407 @@ -292,7 +292,7 @@
408 rdp = gpkt.p_idel;
409 Do_prs = 0;
410 #if defined(INS_BASE)
411 - fprintf(iop,"PATH=%s/ccs/bin:$PATH\n", INS_BASE);
412 + fprintf(iop,"PATH=%s/bin:$PATH\n", INS_BASE);
413 fprintf(iop,"export PATH\n");
414 #endif
415 fprintf(iop,"trap \"rm -f COMB$$ comb$$ s.COMB$$; exit 2\" 1 2 3 15\n");
416 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/comb.mk sccs-5.08.patched/sccs/sccs/cmd/src/comb.mk
417 --- sccs-5.08/sccs/sccs/cmd/src/comb.mk 2014-08-09 17:25:26.000000000 +0000
418 +++ sccs-5.08.patched/sccs/sccs/cmd/src/comb.mk 2017-06-03 00:38:15.125801994 +0000
419 @@ -8,7 +8,7 @@
420 ###########################################################################
422 #INSDIR= sccs
423 -INSDIR= ccs/bin
424 +INSDIR= bin
425 TARGET= comb
427 CPPOPTS += -DSUN5_0
428 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/delta.c sccs-5.08.patched/sccs/sccs/cmd/src/delta.c
429 --- sccs-5.08/sccs/sccs/cmd/src/delta.c 2015-04-23 20:18:01.000000000 +0000
430 +++ sccs-5.08.patched/sccs/sccs/cmd/src/delta.c 2017-06-03 00:38:15.137503408 +0000
431 @@ -69,17 +69,17 @@
432 static off_t Szqfile;
433 static off_t Checksum_offset;
434 #ifdef PROTOTYPES
435 -static char BDiffpgm[] = NOGETTEXT(INS_BASE "/ccs/bin/" "bdiff");
436 +static char BDiffpgm[] = NOGETTEXT(INS_BASE "/bin/" "bdiff");
437 #else
438 /*
439 * XXX If you are using a K&R compiler and like to install to a path
440 - * XXX different from "/usr/ccs/bin/", you need to edit this string.
441 + * XXX different from "/usr/bin/", you need to edit this string.
442 */
443 -static char BDiffpgm[] = NOGETTEXT("/usr/ccs/bin/bdiff");
444 +static char BDiffpgm[] = NOGETTEXT("/usr/bin/bdiff");
445 #endif
446 static char BDiffpgm2[] = NOGETTEXT("bdiff");
447 #if defined(PROTOTYPES) && defined(INS_BASE)
448 -static char Diffpgmp[] = NOGETTEXT(INS_BASE "/ccs/bin/" "diff");
449 +static char Diffpgmp[] = NOGETTEXT(INS_BASE "/bin/" "diff");
450 #endif
451 static char Diffpgm[] = NOGETTEXT("/usr/bin/diff");
452 static char Diffpgm2[] = NOGETTEXT("/bin/diff");
453 @@ -144,10 +144,10 @@
454 */
455 #ifdef PROTOTYPES
456 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
457 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
458 + NOGETTEXT(INS_BASE "/lib/locale/"));
459 #else
460 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
461 - NOGETTEXT("/usr/ccs/lib/locale/"));
462 + NOGETTEXT("/usr/lib/locale/"));
463 #endif
465 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
466 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/delta.mk sccs-5.08.patched/sccs/sccs/cmd/src/delta.mk
467 --- sccs-5.08/sccs/sccs/cmd/src/delta.mk 2014-08-09 17:25:26.000000000 +0000
468 +++ sccs-5.08.patched/sccs/sccs/cmd/src/delta.mk 2017-06-03 00:38:15.140311228 +0000
469 @@ -8,7 +8,7 @@
470 ###########################################################################
472 #INSDIR= sccs
473 -INSDIR= ccs/bin
474 +INSDIR= bin
475 TARGET= delta
477 CPPOPTS += -DSUN5_0
478 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/diff.h sccs-5.08.patched/sccs/sccs/cmd/src/diff.h
479 --- sccs-5.08/sccs/sccs/cmd/src/diff.h 2011-04-21 23:04:52.000000000 +0000
480 +++ sccs-5.08.patched/sccs/sccs/cmd/src/diff.h 2017-06-03 00:38:15.144164421 +0000
481 @@ -188,11 +188,11 @@
483 #if defined(INS_BASE)
484 #ifdef __STDC__
485 -char diff[] = INS_BASE "/ccs/bin/diff";
486 -char diffh[] = INS_BASE "/ccs/lib/diffh";
487 +char diff[] = INS_BASE "/bin/diff";
488 +char diffh[] = INS_BASE "/lib/diffh";
489 #else
490 -char diff[] = "/usr/ccs//bin/diff";
491 -char diffh[] = "/usr/ccs/lib/diffh";
492 +char diff[] = "/usr//bin/diff";
493 +char diffh[] = "/usr/lib/diffh";
494 #endif
495 #else
496 char diff[] = "/usr/bin/diff";
497 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/diff.mk sccs-5.08.patched/sccs/sccs/cmd/src/diff.mk
498 --- sccs-5.08/sccs/sccs/cmd/src/diff.mk 2009-04-12 21:44:33.000000000 +0000
499 +++ sccs-5.08.patched/sccs/sccs/cmd/src/diff.mk 2017-06-03 00:38:15.146989961 +0000
500 @@ -5,7 +5,7 @@
501 include $(SRCROOT)/$(RULESDIR)/rules.top
502 ###########################################################################
504 -INSDIR= ccs/bin
505 +INSDIR= bin
506 TARGET= diff
507 #SYMLINKS= ../../bin/sccs
509 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/diffh.mk sccs-5.08.patched/sccs/sccs/cmd/src/diffh.mk
510 --- sccs-5.08/sccs/sccs/cmd/src/diffh.mk 2008-01-02 18:01:58.000000000 +0000
511 +++ sccs-5.08.patched/sccs/sccs/cmd/src/diffh.mk 2017-06-03 00:38:15.149776040 +0000
512 @@ -5,7 +5,7 @@
513 include $(SRCROOT)/$(RULESDIR)/rules.top
514 ###########################################################################
516 -INSDIR= ccs/lib
517 +INSDIR= lib
518 TARGET= diffh
519 #SYMLINKS= ../../bin/sccs
521 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/get.c sccs-5.08.patched/sccs/sccs/cmd/src/get.c
522 --- sccs-5.08/sccs/sccs/cmd/src/get.c 2015-03-10 23:31:06.000000000 +0000
523 +++ sccs-5.08.patched/sccs/sccs/cmd/src/get.c 2017-06-03 00:38:15.158626279 +0000
524 @@ -55,13 +55,13 @@
525 #define DATELEN 12
527 #if defined(__STDC__) || defined(PROTOTYPES)
528 -#define INCPATH INS_BASE "/ccs/include" /* place to find binaries */
529 +#define INCPATH INS_BASE "/include" /* place to find binaries */
530 #else
531 /*
532 * XXX With a K&R compiler, you need to edit the following string in case
533 * XXX you like to change the install path.
534 */
535 -#define INCPATH "/usr/ccs/include" /* place to find binaries */
536 +#define INCPATH "/usr/include" /* place to find binaries */
537 #endif
540 @@ -134,10 +134,10 @@
541 */
542 #ifdef PROTOTYPES
543 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
544 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
545 + NOGETTEXT(INS_BASE "/lib/locale/"));
546 #else
547 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
548 - NOGETTEXT("/usr/ccs/lib/locale/"));
549 + NOGETTEXT("/usr/lib/locale/"));
550 #endif
551 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
553 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/get.mk sccs-5.08.patched/sccs/sccs/cmd/src/get.mk
554 --- sccs-5.08/sccs/sccs/cmd/src/get.mk 2014-08-09 17:25:26.000000000 +0000
555 +++ sccs-5.08.patched/sccs/sccs/cmd/src/get.mk 2017-06-03 00:38:15.161353054 +0000
556 @@ -8,7 +8,7 @@
557 ###########################################################################
559 #INSDIR= sccs
560 -INSDIR= ccs/bin
561 +INSDIR= bin
562 TARGET= get
564 CPPOPTS += -DSUN5_0
565 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/help.c sccs-5.08.patched/sccs/sccs/cmd/src/help.c
566 --- sccs-5.08/sccs/sccs/cmd/src/help.c 2011-11-01 23:53:26.000000000 +0000
567 +++ sccs-5.08.patched/sccs/sccs/cmd/src/help.c 2017-06-03 00:38:15.164449190 +0000
568 @@ -45,9 +45,9 @@
569 #include <i18n.h>
571 #ifdef PROTOTYPES
572 -static unsigned char Ohelpcmd[] = NOGETTEXT(INS_BASE "/ccs/lib/help/lib/help2");
573 +static unsigned char Ohelpcmd[] = NOGETTEXT(INS_BASE "/lib/help/lib/help2");
574 #else
575 -static unsigned char Ohelpcmd[] = NOGETTEXT("/usr/ccs/lib/help/lib/help2");
576 +static unsigned char Ohelpcmd[] = NOGETTEXT("/usr/lib/help/lib/help2");
577 #endif
579 int main __PR((int argc, char **argv));
580 @@ -70,10 +70,10 @@
581 */
582 #ifdef PROTOTYPES
583 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
584 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
585 + NOGETTEXT(INS_BASE "/lib/locale/"));
586 #else
587 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
588 - NOGETTEXT("/usr/ccs/lib/locale/"));
589 + NOGETTEXT("/usr/lib/locale/"));
590 #endif
592 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
593 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/help.mk sccs-5.08.patched/sccs/sccs/cmd/src/help.mk
594 --- sccs-5.08/sccs/sccs/cmd/src/help.mk 2008-01-02 18:01:58.000000000 +0000
595 +++ sccs-5.08.patched/sccs/sccs/cmd/src/help.mk 2017-06-03 00:38:15.167184213 +0000
596 @@ -8,7 +8,7 @@
597 ###########################################################################
599 #INSDIR= sccs
600 -INSDIR= ccs/bin
601 +INSDIR= bin
602 TARGET= help
604 CPPOPTS += -DSUN5_0
605 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/help2.c sccs-5.08.patched/sccs/sccs/cmd/src/help2.c
606 --- sccs-5.08/sccs/sccs/cmd/src/help2.c 2015-02-02 21:59:09.000000000 +0000
607 +++ sccs-5.08.patched/sccs/sccs/cmd/src/help2.c 2017-06-03 00:38:15.170942902 +0000
608 @@ -60,21 +60,21 @@
609 *
610 * The file to be searched is determined from the argument. If the
611 * argument does not contain numerics, the search
612 - * will be attempted on '/usr/ccs/lib/help/cmds', with the search key
613 + * will be attempted on '/usr/lib/help/cmds', with the search key
614 * being the whole argument. This is used for SCCS command help.
615 *
616 * If the argument begins with non-numerics but contains
617 - * numerics (e.g, zz32) the file /usr/ccs/lib/help/helploc
618 + * numerics (e.g, zz32) the file /usr/lib/help/helploc
619 * will be checked for a file corresponding to the non numeric prefix,
620 * That file will then be seached for the mesage. If
621 - * /usr/ccs/lib/help/helploc
622 + * /usr/lib/help/helploc
623 * does not exist or the prefix is not found there the search will
624 - * be attempted on '/usr/ccs/lib/help/<non-numeric prefix>',
625 - * (e.g., /usr/ccs/lib/help/zz), with the search key
626 + * be attempted on '/usr/lib/help/<non-numeric prefix>',
627 + * (e.g., /usr/lib/help/zz), with the search key
628 * being <remainder of arg>, (e.g., 32).
629 * If the argument is all numeric, or if the file as
630 * determined above does not exist, the search will be attempted on
631 - * '/usr/ccs/lib/help/default' with the search key being
632 + * '/usr/lib/help/default' with the search key being
633 * the entire argument.
634 * In no case will more than one search per argument be performed.
635 *
636 @@ -115,7 +115,7 @@
637 #else
638 char *default_locale = NOGETTEXT("C"); /* Default English. */
639 #endif
640 - char *helpdir = NOGETTEXT("/ccs/lib/help/locale/");
641 + char *helpdir = NOGETTEXT("/lib/help/locale/");
642 char help_dir[200]; /* Directory to search for help text. */
643 char *locale = NULL; /* User's locale. */
645 @@ -146,10 +146,10 @@
646 */
647 #ifdef PROTOTYPES
648 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
649 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
650 + NOGETTEXT(INS_BASE "/lib/locale/"));
651 #else
652 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
653 - NOGETTEXT("/usr/ccs/lib/locale/"));
654 + NOGETTEXT("/usr/lib/locale/"));
655 #endif
656 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
658 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/help2.mk sccs-5.08.patched/sccs/sccs/cmd/src/help2.mk
659 --- sccs-5.08/sccs/sccs/cmd/src/help2.mk 2014-08-09 17:25:26.000000000 +0000
660 +++ sccs-5.08.patched/sccs/sccs/cmd/src/help2.mk 2017-06-03 00:38:15.173724682 +0000
661 @@ -8,7 +8,7 @@
662 ###########################################################################
664 #INSDIR= sccs
665 -INSDIR= ccs/lib/help/lib
666 +INSDIR= lib/help/lib
667 TARGET= help2
669 CPPOPTS += -DSUN5_0
670 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/prs.c sccs-5.08.patched/sccs/sccs/cmd/src/prs.c
671 --- sccs-5.08/sccs/sccs/cmd/src/prs.c 2015-02-23 23:24:47.000000000 +0000
672 +++ sccs-5.08.patched/sccs/sccs/cmd/src/prs.c 2017-06-03 00:38:15.185819637 +0000
673 @@ -76,7 +76,7 @@
674 # include <schily/sysexits.h>
676 #if defined(PROTOTYPES) && defined(INS_BASE)
677 -static char Getpgmp[] = NOGETTEXT(INS_BASE "/ccs/bin/" "get");
678 +static char Getpgmp[] = NOGETTEXT(INS_BASE "/bin/" "get");
679 #endif
680 static char Getpgm[] = NOGETTEXT("get");
681 static char defline[] = NOGETTEXT(":Dt:\t:DL:\nMRs:\n:MR:COMMENTS:\n:C:");
682 @@ -167,10 +167,10 @@
683 */
684 #ifdef PROTOTYPES
685 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
686 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
687 + NOGETTEXT(INS_BASE "/lib/locale/"));
688 #else
689 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
690 - NOGETTEXT("/usr/ccs/lib/locale/"));
691 + NOGETTEXT("/usr/lib/locale/"));
692 #endif
694 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
695 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/prs.mk sccs-5.08.patched/sccs/sccs/cmd/src/prs.mk
696 --- sccs-5.08/sccs/sccs/cmd/src/prs.mk 2014-08-09 17:25:26.000000000 +0000
697 +++ sccs-5.08.patched/sccs/sccs/cmd/src/prs.mk 2017-06-03 00:38:15.188663595 +0000
698 @@ -8,7 +8,7 @@
699 ###########################################################################
701 #INSDIR= sccs
702 -INSDIR= ccs/bin
703 +INSDIR= bin
704 TARGET= prs
706 CPPOPTS += -DSUN5_0
707 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/prt.c sccs-5.08.patched/sccs/sccs/cmd/src/prt.c
708 --- sccs-5.08/sccs/sccs/cmd/src/prt.c 2014-08-09 17:25:25.000000000 +0000
709 +++ sccs-5.08.patched/sccs/sccs/cmd/src/prt.c 2017-06-03 00:38:15.195133026 +0000
710 @@ -148,10 +148,10 @@
711 */
712 #ifdef PROTOTYPES
713 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
714 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
715 + NOGETTEXT(INS_BASE "/lib/locale/"));
716 #else
717 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
718 - NOGETTEXT("/usr/ccs/lib/locale/"));
719 + NOGETTEXT("/usr/lib/locale/"));
720 #endif
722 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
723 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/prt.mk sccs-5.08.patched/sccs/sccs/cmd/src/prt.mk
724 --- sccs-5.08/sccs/sccs/cmd/src/prt.mk 2014-08-09 17:25:26.000000000 +0000
725 +++ sccs-5.08.patched/sccs/sccs/cmd/src/prt.mk 2017-06-03 00:38:15.197907197 +0000
726 @@ -8,7 +8,7 @@
727 ###########################################################################
729 #INSDIR= sccs
730 -INSDIR= ccs/bin
731 +INSDIR= bin
732 TARGET= prt
734 CPPOPTS += -DSUN5_0
735 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/rcs2sccs.mk sccs-5.08.patched/sccs/sccs/cmd/src/rcs2sccs.mk
736 --- sccs-5.08/sccs/sccs/cmd/src/rcs2sccs.mk 2011-09-30 18:19:41.000000000 +0000
737 +++ sccs-5.08.patched/sccs/sccs/cmd/src/rcs2sccs.mk 2017-06-03 00:38:15.200739834 +0000
738 @@ -8,7 +8,7 @@
739 ###########################################################################
741 #INSDIR= sccs
742 -INSDIR= ccs/bin
743 +INSDIR= bin
744 INSMODE= 0755
745 TARGET= rcs2sccs
746 SCRFILE= rcs2sccs.sh
747 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/rcs2sccs.sh sccs-5.08.patched/sccs/sccs/cmd/src/rcs2sccs.sh
748 --- sccs-5.08/sccs/sccs/cmd/src/rcs2sccs.sh 2011-10-03 14:41:47.000000000 +0000
749 +++ sccs-5.08.patched/sccs/sccs/cmd/src/rcs2sccs.sh 2017-06-03 00:38:15.205023677 +0000
750 @@ -5,7 +5,7 @@
751 # Id: rcs2sccs,v 1.12 90/10/04 20:52:23 kenc Exp Locker: kenc
753 ############################################################
754 -PATH=INS_BASE/ccs/bin:$PATH:/usr/ccs/bin
755 +PATH=INS_BASE/bin:$PATH:/usr/bin
756 ############################################################
757 ex_code=0
758 do_v6=""
759 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/rmchg.c sccs-5.08.patched/sccs/sccs/cmd/src/rmchg.c
760 --- sccs-5.08/sccs/sccs/cmd/src/rmchg.c 2015-02-06 20:46:32.000000000 +0000
761 +++ sccs-5.08.patched/sccs/sccs/cmd/src/rmchg.c 2017-06-03 00:38:15.213270058 +0000
762 @@ -131,10 +131,10 @@
763 */
764 #ifdef PROTOTYPES
765 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
766 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
767 + NOGETTEXT(INS_BASE "/lib/locale/"));
768 #else
769 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
770 - NOGETTEXT("/usr/ccs/lib/locale/"));
771 + NOGETTEXT("/usr/lib/locale/"));
772 #endif
774 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
775 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/rmchg.mk sccs-5.08.patched/sccs/sccs/cmd/src/rmchg.mk
776 --- sccs-5.08/sccs/sccs/cmd/src/rmchg.mk 2014-08-09 17:25:26.000000000 +0000
777 +++ sccs-5.08.patched/sccs/sccs/cmd/src/rmchg.mk 2017-06-03 00:38:15.216030879 +0000
778 @@ -8,7 +8,7 @@
779 ###########################################################################
781 #INSDIR= sccs
782 -INSDIR= ccs/bin
783 +INSDIR= bin
784 TARGET= rmchg
785 HARDLINKS= rmdel cdc
787 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccs_sym.mk sccs-5.08.patched/sccs/sccs/cmd/src/sccs_sym.mk
788 --- sccs-5.08/sccs/sccs/cmd/src/sccs_sym.mk 2009-07-28 23:43:01.000000000 +0000
789 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccs_sym.mk 2017-06-03 00:38:15.218719780 +0000
790 @@ -12,6 +12,6 @@
792 install: $(PSYMLINKS)
794 -$(PSYMLINKS): $(DEST_DIR)$(INS_BASE)/ccs/bin/$(TARGET)$(_EXEEXT)
795 +$(PSYMLINKS): $(DEST_DIR)$(INS_BASE)/bin/$(TARGET)$(_EXEEXT)
796 $(MKDIR) -p $(DEST_DIR)$(INS_BASE)/$(INSDIR)
797 - @echo " ==> INSTALLING symlink \"$@\""; $(RM) $(RM_FORCE) $@; $(SYMLINK) ../ccs/bin/$(TARGET)$(_EXEEXT) $@
798 + @echo " ==> INSTALLING symlink \"$@\""; $(RM) $(RM_FORCE) $@; $(SYMLINK) ../bin/$(TARGET)$(_EXEEXT) $@
799 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccs.c sccs-5.08.patched/sccs/sccs/cmd/src/sccs.c
800 --- sccs-5.08/sccs/sccs/cmd/src/sccs.c 2015-04-23 20:24:10.000000000 +0000
801 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccs.c 2017-06-03 00:38:15.246289076 +0000
802 @@ -187,9 +187,9 @@
803 #endif
804 #else
805 #if defined(__STDC__) || defined(PROTOTYPES)
806 -#define PROGPATH(name) "/usr/ccs/bin/" #name /* place to find binaries */
807 +#define PROGPATH(name) "/usr/bin/" #name /* place to find binaries */
808 #else
809 -#define PROGPATH(name) "/usr/ccs/bin/name" /* place to find binaries */
810 +#define PROGPATH(name) "/usr/bin/name" /* place to find binaries */
811 #endif
812 #endif /* V6 */
813 #else
814 @@ -201,9 +201,9 @@
815 #endif
816 #else
817 #if defined(__STDC__) || defined(PROTOTYPES)
818 -#define PROGPATH(name) "/usr/ccs/bin/" #name /* place to find binaries */
819 +#define PROGPATH(name) "/usr/bin/" #name /* place to find binaries */
820 #else
821 -#define PROGPATH(name) "/usr/ccs/bin/name" /* place to find binaries */
822 +#define PROGPATH(name) "/usr/bin/name" /* place to find binaries */
823 #endif
824 #endif /* XPG4 */
825 #endif /* DESTDIR */
826 @@ -212,13 +212,13 @@
827 #undef PROGPATH
829 #if defined(__STDC__) || defined(PROTOTYPES)
830 -#define PROGPATH(name) INS_BASE "/ccs/bin/" #name /* place to find binaries */
831 +#define PROGPATH(name) INS_BASE "/bin/" #name /* place to find binaries */
832 #else
833 /*
834 * XXX With a K&R compiler, you need to edit the following string in case
835 * XXX you like to change the install path.
836 */
837 -#define PROGPATH(name) "/usr/ccs/bin/name" /* place to find binaries */
838 +#define PROGPATH(name) "/usr/bin/name" /* place to find binaries */
839 #endif
840 #endif /* defined(INS_BASE) && !defined(XPG4) */
842 @@ -429,15 +429,15 @@
843 # endif /* V6 */
845 #ifdef XPG4
846 -/*static char path[] = NOGETTEXT("PATH=/usr/xpg4/bin:/usr/ccs/bin:/usr/bin");*/
847 +/*static char path[] = NOGETTEXT("PATH=/usr/xpg4/bin:/usr/bin:/usr/bin");*/
848 #ifdef PROTOTYPES
849 -static char path[] = NOGETTEXT("PATH=" INS_BASE "/xpg4/bin:" INS_BASE "/ccs/bin:/usr/bin");
850 +static char path[] = NOGETTEXT("PATH=" INS_BASE "/xpg4/bin:" INS_BASE "/bin:/usr/bin");
851 #else
852 /*
853 * XXX With a K&R compiler, you need to edit the following string in case
854 * XXX you like to change the install path.
855 */
856 -static char path[] = NOGETTEXT("PATH=/usr/xpg4/bin:/usr/ccs/bin:/usr/bin");
857 +static char path[] = NOGETTEXT("PATH=/usr/xpg4/bin:/usr/bin:/usr/bin");
858 #endif
859 #endif
861 @@ -499,10 +499,10 @@
862 */
863 #ifdef PROTOTYPES
864 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
865 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
866 + NOGETTEXT(INS_BASE "/lib/locale/"));
867 #else
868 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
869 - NOGETTEXT("/usr/ccs/lib/locale/"));
870 + NOGETTEXT("/usr/lib/locale/"));
871 #endif
873 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
874 @@ -3380,7 +3380,7 @@
875 FILE *nfp;
877 strlcpy(nbuf, setrhome, sizeof (nbuf));
878 - strlcat(nbuf, "/.sccs/ncache", sizeof (nbuf));
879 + strlcat(nbuf, "/.sncache", sizeof (nbuf));
880 nfp = fopen(nbuf, "rb");
881 if (nfp == NULL) {
882 return (-1);
883 @@ -3477,7 +3477,7 @@
884 qsort((void *)anames, anum, sizeof (char *), addcmp);
886 strlcpy(nbuf, setrhome, sizeof (nbuf));
887 - strlcat(nbuf, "/.sccs/ncache", sizeof (nbuf));
888 + strlcat(nbuf, "/.sncache", sizeof (nbuf));
889 nfp = xfcreat(nbuf, 0666);
890 for (i = 0; i < anum; i++) {
891 fputs(anames[i], nfp);
892 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccs.mk sccs-5.08.patched/sccs/sccs/cmd/src/sccs.mk
893 --- sccs-5.08/sccs/sccs/cmd/src/sccs.mk 2014-08-09 17:25:26.000000000 +0000
894 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccs.mk 2017-06-03 00:38:15.249180124 +0000
895 @@ -5,7 +5,7 @@
896 include $(SRCROOT)/$(RULESDIR)/rules.top
897 ###########################################################################
899 -INSDIR= ccs/bin
900 +INSDIR= bin
901 TARGET= sccs
902 #SYMLINKS= ../../bin/sccs
904 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccscvt.c sccs-5.08.patched/sccs/sccs/cmd/src/sccscvt.c
905 --- sccs-5.08/sccs/sccs/cmd/src/sccscvt.c 2015-02-06 20:46:32.000000000 +0000
906 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccscvt.c 2017-06-03 00:38:15.255439538 +0000
907 @@ -88,10 +88,10 @@
908 */
909 #ifdef PROTOTYPES
910 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
911 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
912 + NOGETTEXT(INS_BASE "/lib/locale/"));
913 #else
914 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
915 - NOGETTEXT("/usr/ccs/lib/locale/"));
916 + NOGETTEXT("/usr/lib/locale/"));
917 #endif
919 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
920 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccscvt.mk sccs-5.08.patched/sccs/sccs/cmd/src/sccscvt.mk
921 --- sccs-5.08/sccs/sccs/cmd/src/sccscvt.mk 2014-08-09 17:25:26.000000000 +0000
922 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccscvt.mk 2017-06-03 00:38:15.258191898 +0000
923 @@ -8,7 +8,7 @@
924 ###########################################################################
926 #INSDIR= sccs
927 -INSDIR= ccs/bin
928 +INSDIR= bin
929 TARGET= sccscvt
931 CPPOPTS += -DSUN5_0
932 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccsdiff.mk sccs-5.08.patched/sccs/sccs/cmd/src/sccsdiff.mk
933 --- sccs-5.08/sccs/sccs/cmd/src/sccsdiff.mk 2011-05-18 20:54:29.000000000 +0000
934 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccsdiff.mk 2017-06-03 00:38:15.260969291 +0000
935 @@ -8,7 +8,7 @@
936 ###########################################################################
938 #INSDIR= sccs
939 -INSDIR= ccs/bin
940 +INSDIR= bin
941 INSMODE= 0755
942 TARGET= sccsdiff
943 SCRFILE= sccsdiff.sh
944 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccsdiff.sh sccs-5.08.patched/sccs/sccs/cmd/src/sccsdiff.sh
945 --- sccs-5.08/sccs/sccs/cmd/src/sccsdiff.sh 2015-01-30 20:37:19.000000000 +0000
946 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccsdiff.sh 2017-06-03 00:38:15.264685704 +0000
947 @@ -36,7 +36,7 @@
948 # if running under control of the NSE (-q option given), will look for
949 # get in the directtory from which it was run (if -q, $0 will be full pathname)
950 #
951 -PATH=INS_BASE/ccs/bin:$PATH:/usr/ccs/bin
952 +PATH=INS_BASE/bin:$PATH:/usr/bin
954 trap "rm -f /tmp/get[abc]$$;exit 1" 1 2 3 15
955 umask 077
956 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccslog.c sccs-5.08.patched/sccs/sccs/cmd/src/sccslog.c
957 --- sccs-5.08/sccs/sccs/cmd/src/sccslog.c 2011-10-07 19:56:54.000000000 +0000
958 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccslog.c 2017-06-03 00:38:15.270365198 +0000
959 @@ -137,7 +137,7 @@
961 if (home == NULL)
962 home = ".";
963 - js_snprintf(nbuf, sizeof (nbuf), "%s/.sccs/usermap", home);
964 + js_snprintf(nbuf, sizeof (nbuf), "%s/.susermap", home);
965 f = fopen(nbuf, "r");
966 if (f == NULL) {
967 cannot = 1;
968 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/sccslog.mk sccs-5.08.patched/sccs/sccs/cmd/src/sccslog.mk
969 --- sccs-5.08/sccs/sccs/cmd/src/sccslog.mk 2009-12-22 23:06:03.000000000 +0000
970 +++ sccs-5.08.patched/sccs/sccs/cmd/src/sccslog.mk 2017-06-03 00:38:15.273065719 +0000
971 @@ -5,7 +5,7 @@
972 include $(SRCROOT)/$(RULESDIR)/rules.top
973 ###########################################################################
975 -INSDIR= ccs/bin
976 +INSDIR= bin
977 TARGET= sccslog
978 CPPOPTS += -DUSE_LARGEFILES
979 CPPOPTS += -DSCHILY_PRINT
980 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/unget.c sccs-5.08.patched/sccs/sccs/cmd/src/unget.c
981 --- sccs-5.08/sccs/sccs/cmd/src/unget.c 2015-02-06 20:46:32.000000000 +0000
982 +++ sccs-5.08.patched/sccs/sccs/cmd/src/unget.c 2017-06-03 00:38:15.278098923 +0000
983 @@ -108,10 +108,10 @@
984 */
985 #ifdef PROTOTYPES
986 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
987 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
988 + NOGETTEXT(INS_BASE "/lib/locale/"));
989 #else
990 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
991 - NOGETTEXT("/usr/ccs/lib/locale/"));
992 + NOGETTEXT("/usr/lib/locale/"));
993 #endif
995 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
996 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/unget.mk sccs-5.08.patched/sccs/sccs/cmd/src/unget.mk
997 --- sccs-5.08/sccs/sccs/cmd/src/unget.mk 2014-08-09 17:25:26.000000000 +0000
998 +++ sccs-5.08.patched/sccs/sccs/cmd/src/unget.mk 2017-06-03 00:38:15.280877568 +0000
999 @@ -8,7 +8,7 @@
1000 ###########################################################################
1002 #INSDIR= sccs
1003 -INSDIR= ccs/bin
1004 +INSDIR= bin
1005 TARGET= unget
1006 HARDLINKS= sact
1008 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/val.c sccs-5.08.patched/sccs/sccs/cmd/src/val.c
1009 --- sccs-5.08/sccs/sccs/cmd/src/val.c 2015-02-06 20:46:32.000000000 +0000
1010 +++ sccs-5.08.patched/sccs/sccs/cmd/src/val.c 2017-06-03 00:38:15.290943091 +0000
1011 @@ -144,10 +144,10 @@
1012 */
1013 #ifdef PROTOTYPES
1014 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
1015 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
1016 + NOGETTEXT(INS_BASE "/lib/locale/"));
1017 #else
1018 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
1019 - NOGETTEXT("/usr/ccs/lib/locale/"));
1020 + NOGETTEXT("/usr/lib/locale/"));
1021 #endif
1023 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
1024 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/val.mk sccs-5.08.patched/sccs/sccs/cmd/src/val.mk
1025 --- sccs-5.08/sccs/sccs/cmd/src/val.mk 2014-08-09 17:25:26.000000000 +0000
1026 +++ sccs-5.08.patched/sccs/sccs/cmd/src/val.mk 2017-06-03 00:38:15.293728460 +0000
1027 @@ -8,7 +8,7 @@
1028 ###########################################################################
1030 #INSDIR= sccs
1031 -INSDIR= ccs/bin
1032 +INSDIR= bin
1033 TARGET= val
1035 CPPOPTS += -DSUN5_0
1036 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/vc.mk sccs-5.08.patched/sccs/sccs/cmd/src/vc.mk
1037 --- sccs-5.08/sccs/sccs/cmd/src/vc.mk 2014-08-09 17:25:26.000000000 +0000
1038 +++ sccs-5.08.patched/sccs/sccs/cmd/src/vc.mk 2017-06-03 00:38:15.296466058 +0000
1039 @@ -8,7 +8,7 @@
1040 ###########################################################################
1042 #INSDIR= sccs
1043 -INSDIR= ccs/bin
1044 +INSDIR= bin
1045 TARGET= vc
1047 CPPOPTS += -DSUN5_0
1048 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/what.c sccs-5.08.patched/sccs/sccs/cmd/src/what.c
1049 --- sccs-5.08/sccs/sccs/cmd/src/what.c 2014-08-09 17:25:26.000000000 +0000
1050 +++ sccs-5.08.patched/sccs/sccs/cmd/src/what.c 2017-06-03 00:38:15.300211291 +0000
1051 @@ -82,10 +82,10 @@
1052 */
1053 #ifdef PROTOTYPES
1054 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
1055 - NOGETTEXT(INS_BASE "/ccs/lib/locale/"));
1056 + NOGETTEXT(INS_BASE "/lib/locale/"));
1057 #else
1058 (void) bindtextdomain(NOGETTEXT("SUNW_SPRO_SCCS"),
1059 - NOGETTEXT("/usr/ccs/lib/locale/"));
1060 + NOGETTEXT("/usr/lib/locale/"));
1061 #endif
1063 (void) textdomain(NOGETTEXT("SUNW_SPRO_SCCS"));
1064 diff -Nurb sccs-5.08/sccs/sccs/cmd/src/what.mk sccs-5.08.patched/sccs/sccs/cmd/src/what.mk
1065 --- sccs-5.08/sccs/sccs/cmd/src/what.mk 2014-08-09 17:25:26.000000000 +0000
1066 +++ sccs-5.08.patched/sccs/sccs/cmd/src/what.mk 2017-06-03 00:38:15.302974740 +0000
1067 @@ -8,7 +8,7 @@
1068 ###########################################################################
1070 #INSDIR= sccs
1071 -INSDIR= ccs/bin
1072 +INSDIR= bin
1073 TARGET= what
1074 #SYMLINKS= ../bin/what
1076 diff -Nurb sccs-5.08/sccs/sccs/help.d/ad.mk sccs-5.08.patched/sccs/sccs/help.d/ad.mk
1077 --- sccs-5.08/sccs/sccs/help.d/ad.mk 2007-12-02 20:51:51.000000000 +0000
1078 +++ sccs-5.08.patched/sccs/sccs/help.d/ad.mk 2017-06-03 00:38:15.305687333 +0000
1079 @@ -7,7 +7,7 @@
1080 include $(SRCROOT)/$(RULESDIR)/rules.top
1081 ###########################################################################
1083 -INSDIR= ccs/lib/help/locale/C
1084 +INSDIR= lib/help/locale/C
1085 TARGET= ad
1086 #XMK_FILE= Makefile.man
1088 diff -Nurb sccs-5.08/sccs/sccs/help.d/bd.mk sccs-5.08.patched/sccs/sccs/help.d/bd.mk
1089 --- sccs-5.08/sccs/sccs/help.d/bd.mk 2007-12-02 20:51:51.000000000 +0000
1090 +++ sccs-5.08.patched/sccs/sccs/help.d/bd.mk 2017-06-03 00:38:15.308387152 +0000
1091 @@ -7,7 +7,7 @@
1092 include $(SRCROOT)/$(RULESDIR)/rules.top
1093 ###########################################################################
1095 -INSDIR= ccs/lib/help/locale/C
1096 +INSDIR= lib/help/locale/C
1097 TARGET= bd
1098 #XMK_FILE= Makefile.man
1100 diff -Nurb sccs-5.08/sccs/sccs/help.d/cb.mk sccs-5.08.patched/sccs/sccs/help.d/cb.mk
1101 --- sccs-5.08/sccs/sccs/help.d/cb.mk 2007-12-02 20:51:51.000000000 +0000
1102 +++ sccs-5.08.patched/sccs/sccs/help.d/cb.mk 2017-06-03 00:38:15.311121182 +0000
1103 @@ -7,7 +7,7 @@
1104 include $(SRCROOT)/$(RULESDIR)/rules.top
1105 ###########################################################################
1107 -INSDIR= ccs/lib/help/locale/C
1108 +INSDIR= lib/help/locale/C
1109 TARGET= cb
1110 #XMK_FILE= Makefile.man
1112 diff -Nurb sccs-5.08/sccs/sccs/help.d/cm.mk sccs-5.08.patched/sccs/sccs/help.d/cm.mk
1113 --- sccs-5.08/sccs/sccs/help.d/cm.mk 2007-12-02 20:51:51.000000000 +0000
1114 +++ sccs-5.08.patched/sccs/sccs/help.d/cm.mk 2017-06-03 00:38:15.313834868 +0000
1115 @@ -7,7 +7,7 @@
1116 include $(SRCROOT)/$(RULESDIR)/rules.top
1117 ###########################################################################
1119 -INSDIR= ccs/lib/help/locale/C
1120 +INSDIR= lib/help/locale/C
1121 TARGET= cm
1122 #XMK_FILE= Makefile.man
1124 diff -Nurb sccs-5.08/sccs/sccs/help.d/cmds.mk sccs-5.08.patched/sccs/sccs/help.d/cmds.mk
1125 --- sccs-5.08/sccs/sccs/help.d/cmds.mk 2007-12-02 20:51:51.000000000 +0000
1126 +++ sccs-5.08.patched/sccs/sccs/help.d/cmds.mk 2017-06-03 00:38:15.316506463 +0000
1127 @@ -7,7 +7,7 @@
1128 include $(SRCROOT)/$(RULESDIR)/rules.top
1129 ###########################################################################
1131 -INSDIR= ccs/lib/help/locale/C
1132 +INSDIR= lib/help/locale/C
1133 TARGET= cmds
1134 #XMK_FILE= Makefile.man
1136 diff -Nurb sccs-5.08/sccs/sccs/help.d/co.mk sccs-5.08.patched/sccs/sccs/help.d/co.mk
1137 --- sccs-5.08/sccs/sccs/help.d/co.mk 2007-12-02 20:51:51.000000000 +0000
1138 +++ sccs-5.08.patched/sccs/sccs/help.d/co.mk 2017-06-03 00:38:15.319268372 +0000
1139 @@ -7,7 +7,7 @@
1140 include $(SRCROOT)/$(RULESDIR)/rules.top
1141 ###########################################################################
1143 -INSDIR= ccs/lib/help/locale/C
1144 +INSDIR= lib/help/locale/C
1145 TARGET= co
1146 #XMK_FILE= Makefile.man
1148 diff -Nurb sccs-5.08/sccs/sccs/help.d/de.mk sccs-5.08.patched/sccs/sccs/help.d/de.mk
1149 --- sccs-5.08/sccs/sccs/help.d/de.mk 2007-12-02 20:51:51.000000000 +0000
1150 +++ sccs-5.08.patched/sccs/sccs/help.d/de.mk 2017-06-03 00:38:15.321961086 +0000
1151 @@ -7,7 +7,7 @@
1152 include $(SRCROOT)/$(RULESDIR)/rules.top
1153 ###########################################################################
1155 -INSDIR= ccs/lib/help/locale/C
1156 +INSDIR= lib/help/locale/C
1157 TARGET= de
1158 #XMK_FILE= Makefile.man
1160 diff -Nurb sccs-5.08/sccs/sccs/help.d/default.mk sccs-5.08.patched/sccs/sccs/help.d/default.mk
1161 --- sccs-5.08/sccs/sccs/help.d/default.mk 2007-12-02 20:51:51.000000000 +0000
1162 +++ sccs-5.08.patched/sccs/sccs/help.d/default.mk 2017-06-03 00:38:15.324626296 +0000
1163 @@ -7,7 +7,7 @@
1164 include $(SRCROOT)/$(RULESDIR)/rules.top
1165 ###########################################################################
1167 -INSDIR= ccs/lib/help/locale/C
1168 +INSDIR= lib/help/locale/C
1169 TARGET= default
1170 #XMK_FILE= Makefile.man
1172 diff -Nurb sccs-5.08/sccs/sccs/help.d/ge.mk sccs-5.08.patched/sccs/sccs/help.d/ge.mk
1173 --- sccs-5.08/sccs/sccs/help.d/ge.mk 2007-12-02 20:51:51.000000000 +0000
1174 +++ sccs-5.08.patched/sccs/sccs/help.d/ge.mk 2017-06-03 00:38:15.327288014 +0000
1175 @@ -7,7 +7,7 @@
1176 include $(SRCROOT)/$(RULESDIR)/rules.top
1177 ###########################################################################
1179 -INSDIR= ccs/lib/help/locale/C
1180 +INSDIR= lib/help/locale/C
1181 TARGET= ge
1182 #XMK_FILE= Makefile.man
1184 diff -Nurb sccs-5.08/sccs/sccs/help.d/he.mk sccs-5.08.patched/sccs/sccs/help.d/he.mk
1185 --- sccs-5.08/sccs/sccs/help.d/he.mk 2007-12-02 20:51:51.000000000 +0000
1186 +++ sccs-5.08.patched/sccs/sccs/help.d/he.mk 2017-06-03 00:38:15.329930180 +0000
1187 @@ -7,7 +7,7 @@
1188 include $(SRCROOT)/$(RULESDIR)/rules.top
1189 ###########################################################################
1191 -INSDIR= ccs/lib/help/locale/C
1192 +INSDIR= lib/help/locale/C
1193 TARGET= he
1194 #XMK_FILE= Makefile.man
1196 diff -Nurb sccs-5.08/sccs/sccs/help.d/pr.mk sccs-5.08.patched/sccs/sccs/help.d/pr.mk
1197 --- sccs-5.08/sccs/sccs/help.d/pr.mk 2011-04-30 00:48:39.000000000 +0000
1198 +++ sccs-5.08.patched/sccs/sccs/help.d/pr.mk 2017-06-03 00:38:15.332616202 +0000
1199 @@ -7,7 +7,7 @@
1200 include $(SRCROOT)/$(RULESDIR)/rules.top
1201 ###########################################################################
1203 -INSDIR= ccs/lib/help/locale/C
1204 +INSDIR= lib/help/locale/C
1205 TARGET= pr
1206 #XMK_FILE= Makefile.man
1208 diff -Nurb sccs-5.08/sccs/sccs/help.d/prs.mk sccs-5.08.patched/sccs/sccs/help.d/prs.mk
1209 --- sccs-5.08/sccs/sccs/help.d/prs.mk 2007-12-02 20:51:51.000000000 +0000
1210 +++ sccs-5.08.patched/sccs/sccs/help.d/prs.mk 2017-06-03 00:38:15.335268072 +0000
1211 @@ -7,7 +7,7 @@
1212 include $(SRCROOT)/$(RULESDIR)/rules.top
1213 ###########################################################################
1215 -INSDIR= ccs/lib/help/locale/C
1216 +INSDIR= lib/help/locale/C
1217 TARGET= prs
1218 #XMK_FILE= Makefile.man
1220 diff -Nurb sccs-5.08/sccs/sccs/help.d/rc.mk sccs-5.08.patched/sccs/sccs/help.d/rc.mk
1221 --- sccs-5.08/sccs/sccs/help.d/rc.mk 2007-12-02 20:51:51.000000000 +0000
1222 +++ sccs-5.08.patched/sccs/sccs/help.d/rc.mk 2017-06-03 00:38:15.338011961 +0000
1223 @@ -7,7 +7,7 @@
1224 include $(SRCROOT)/$(RULESDIR)/rules.top
1225 ###########################################################################
1227 -INSDIR= ccs/lib/help/locale/C
1228 +INSDIR= lib/help/locale/C
1229 TARGET= rc
1230 #XMK_FILE= Makefile.man
1232 diff -Nurb sccs-5.08/sccs/sccs/help.d/un.mk sccs-5.08.patched/sccs/sccs/help.d/un.mk
1233 --- sccs-5.08/sccs/sccs/help.d/un.mk 2007-12-02 20:51:51.000000000 +0000
1234 +++ sccs-5.08.patched/sccs/sccs/help.d/un.mk 2017-06-03 00:38:15.340699524 +0000
1235 @@ -7,7 +7,7 @@
1236 include $(SRCROOT)/$(RULESDIR)/rules.top
1237 ###########################################################################
1239 -INSDIR= ccs/lib/help/locale/C
1240 +INSDIR= lib/help/locale/C
1241 TARGET= un
1242 #XMK_FILE= Makefile.man
1244 diff -Nurb sccs-5.08/sccs/sccs/help.d/ut.mk sccs-5.08.patched/sccs/sccs/help.d/ut.mk
1245 --- sccs-5.08/sccs/sccs/help.d/ut.mk 2007-12-02 20:51:51.000000000 +0000
1246 +++ sccs-5.08.patched/sccs/sccs/help.d/ut.mk 2017-06-03 00:38:15.343371931 +0000
1247 @@ -7,7 +7,7 @@
1248 include $(SRCROOT)/$(RULESDIR)/rules.top
1249 ###########################################################################
1251 -INSDIR= ccs/lib/help/locale/C
1252 +INSDIR= lib/help/locale/C
1253 TARGET= ut
1254 #XMK_FILE= Makefile.man
1256 diff -Nurb sccs-5.08/sccs/sccs/help.d/va.mk sccs-5.08.patched/sccs/sccs/help.d/va.mk
1257 --- sccs-5.08/sccs/sccs/help.d/va.mk 2007-12-02 20:51:51.000000000 +0000
1258 +++ sccs-5.08.patched/sccs/sccs/help.d/va.mk 2017-06-03 00:38:15.346056345 +0000
1259 @@ -7,7 +7,7 @@
1260 include $(SRCROOT)/$(RULESDIR)/rules.top
1261 ###########################################################################
1263 -INSDIR= ccs/lib/help/locale/C
1264 +INSDIR= lib/help/locale/C
1265 TARGET= va
1266 #XMK_FILE= Makefile.man
1268 diff -Nurb sccs-5.08/sccs/sccs/help.d/vc.mk sccs-5.08.patched/sccs/sccs/help.d/vc.mk
1269 --- sccs-5.08/sccs/sccs/help.d/vc.mk 2007-12-02 20:51:51.000000000 +0000
1270 +++ sccs-5.08.patched/sccs/sccs/help.d/vc.mk 2017-06-03 00:38:15.348729366 +0000
1271 @@ -7,7 +7,7 @@
1272 include $(SRCROOT)/$(RULESDIR)/rules.top
1273 ###########################################################################
1275 -INSDIR= ccs/lib/help/locale/C
1276 +INSDIR= lib/help/locale/C
1277 TARGET= vc
1278 #XMK_FILE= Makefile.man
1280 diff -Nurb sccs-5.08/sccs/sccs/lib/cassi/src/Makefile sccs-5.08.patched/sccs/sccs/lib/cassi/src/Makefile
1281 --- sccs-5.08/sccs/sccs/lib/cassi/src/Makefile 2007-01-07 19:38:39.000000000 +0000
1282 +++ sccs-5.08.patched/sccs/sccs/lib/cassi/src/Makefile 2017-06-03 00:38:15.351467625 +0000
1283 @@ -7,7 +7,7 @@
1284 include $(SRCROOT)/$(RULESDIR)/rules.top
1285 ###########################################################################
1287 -INSDIR= ccs/lib
1288 +INSDIR= lib
1289 TARGETLIB= cassi
1290 CPPOPTS += -DSUN5_0
1291 CPPOPTS += -DUSE_LARGEFILES
1292 diff -Nurb sccs-5.08/sccs/sccs/lib/comobj/src/help.c sccs-5.08.patched/sccs/sccs/lib/comobj/src/help.c
1293 --- sccs-5.08/sccs/sccs/lib/comobj/src/help.c 2015-02-07 23:43:45.000000000 +0000
1294 +++ sccs-5.08.patched/sccs/sccs/lib/comobj/src/help.c 2017-06-03 00:38:15.355937601 +0000
1295 @@ -56,21 +56,21 @@
1296 *
1297 * The file to be searched is determined from the argument. If the
1298 * argument does not contain numerics, the search
1299 - * will be attempted on '/usr/ccs/lib/help/cmds', with the search key
1300 + * will be attempted on '/usr/lib/help/cmds', with the search key
1301 * being the whole argument. This is used for SCCS command help.
1302 *
1303 * If the argument begins with non-numerics but contains
1304 - * numerics (e.g, zz32) the file /usr/ccs/lib/help/helploc
1305 + * numerics (e.g, zz32) the file /usr/lib/help/helploc
1306 * will be checked for a file corresponding to the non numeric prefix,
1307 * That file will then be seached for the mesage. If
1308 - * /usr/ccs/lib/help/helploc
1309 + * /usr/lib/help/helploc
1310 * does not exist or the prefix is not found there the search will
1311 - * be attempted on '/usr/ccs/lib/help/<non-numeric prefix>',
1312 - * (e.g., /usr/ccs/lib/help/zz), with the search key
1313 + * be attempted on '/usr/lib/help/<non-numeric prefix>',
1314 + * (e.g., /usr/lib/help/zz), with the search key
1315 * being <remainder of arg>, (e.g., 32).
1316 * If the argument is all numeric, or if the file as
1317 * determined above does not exist, the search will be attempted on
1318 - * '/usr/ccs/lib/help/default' with the search key being
1319 + * '/usr/lib/help/default' with the search key being
1320 * the entire argument.
1321 * In no case will more than one search per argument be performed.
1322 *
1323 @@ -92,7 +92,7 @@
1324 * Comments are ignored.
1325 */
1327 -#define HELPLOC "/ccs/lib/help/helploc"
1328 +#define HELPLOC "/lib/help/helploc"
1329 #define DEFAULT_LOCALE "C" /* Default English. */
1331 static int findprt __PR((FILE *f, char *p, char *locale));
1332 @@ -179,7 +179,7 @@
1333 char hfile[max(8192, PATH_MAX+1)];
1334 FILE *iop;
1335 char *dftfile = NOGETTEXT("/default");
1336 - char *helpdir = NOGETTEXT("/ccs/lib/help/locale/");
1337 + char *helpdir = NOGETTEXT("/lib/help/locale/");
1338 char help_dir[max(8192, PATH_MAX+1)]; /* Directory to search for. */
1340 if ((int) size(p) > 50)
1341 diff -Nurb sccs-5.08/sccs/sccs/lib/comobj/src/Makefile sccs-5.08.patched/sccs/sccs/lib/comobj/src/Makefile
1342 --- sccs-5.08/sccs/sccs/lib/comobj/src/Makefile 2007-01-07 19:38:44.000000000 +0000
1343 +++ sccs-5.08.patched/sccs/sccs/lib/comobj/src/Makefile 2017-06-03 00:38:15.358698658 +0000
1344 @@ -7,7 +7,7 @@
1345 include $(SRCROOT)/$(RULESDIR)/rules.top
1346 ###########################################################################
1348 -INSDIR= ccs/lib
1349 +INSDIR= lib
1350 TARGETLIB= comobj
1351 CPPOPTS += -DSUN5_0
1352 CPPOPTS += -DUSE_LARGEFILES
1353 diff -Nurb sccs-5.08/sccs/sccs/lib/mpwlib/src/Makefile sccs-5.08.patched/sccs/sccs/lib/mpwlib/src/Makefile
1354 --- sccs-5.08/sccs/sccs/lib/mpwlib/src/Makefile 2007-01-07 19:38:48.000000000 +0000
1355 +++ sccs-5.08.patched/sccs/sccs/lib/mpwlib/src/Makefile 2017-06-03 00:38:15.361515535 +0000
1356 @@ -7,7 +7,7 @@
1357 include $(SRCROOT)/$(RULESDIR)/rules.top
1358 ###########################################################################
1360 -INSDIR= ccs/lib
1361 +INSDIR= lib
1362 TARGETLIB= mpw
1363 CPPOPTS += -DSUN5_0
1364 CPPOPTS += -DUSE_LARGEFILES