summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.3/debian/deprecate-with-apt.diff
blob: 3a145a16712f49ba9e91a4ac5e6f1f92321cc59f (plain)
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
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
Upstream-Status:Inappropriate [debian patches]
From c2bd2059cfbba573643c748ace4ff4db4cbf015d Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Mon, 17 May 2010 13:23:07 +0300
Subject: Point users to Debian packages of deprecated core modules

Bug-Debian: http://bugs.debian.org/580034

Class::ISA, Switch, Pod::Plainer, and (partially) Shell were
deprecated from the Perl core in 5.12.0.

Class::ISA, Switch, Pod::Plainer were removed from the Perl core in
5.14.0.

Shell and Devel::DProf, and Perl 4 libraries, were deprecated from the
Perl core in 5.14.0.

To get a clean transition, perl/perl-modules is going to recommend the
separate Debian packages of these for one release cycle so that they will be
pulled in by default on upgrades.

However, on systems configured to ignore recommendations the deprecation
warnings will still be useful, so modify them slightly to point to the
separate packages instead.

Patch-Name: debian/deprecate-with-apt.diff
---
 lib/abbrev.pl     |    2 +-
 lib/assert.pl     |    2 +-
 lib/bigfloat.pl   |    2 +-
 lib/bigint.pl     |    2 +-
 lib/bigrat.pl     |    2 +-
 lib/cacheout.pl   |    2 +-
 lib/complete.pl   |    2 +-
 lib/ctime.pl      |    2 +-
 lib/deprecate.pm  |   16 +++++++++++++++-
 lib/dotsh.pl      |    2 +-
 lib/exceptions.pl |    2 +-
 lib/fastcwd.pl    |    2 +-
 lib/find.pl       |    2 +-
 lib/finddepth.pl  |    2 +-
 lib/flush.pl      |    2 +-
 lib/getcwd.pl     |    2 +-
 lib/getopt.pl     |    2 +-
 lib/getopts.pl    |    2 +-
 lib/hostname.pl   |    2 +-
 lib/importenv.pl  |    2 +-
 lib/look.pl       |    2 +-
 lib/newgetopt.pl  |    2 +-
 lib/open2.pl      |    2 +-
 lib/open3.pl      |    2 +-
 lib/pwd.pl        |    2 +-
 lib/shellwords.pl |    2 +-
 lib/stat.pl       |    2 +-
 lib/syslog.pl     |    2 +-
 lib/tainted.pl    |    2 +-
 lib/termcap.pl    |    2 +-
 lib/timelocal.pl  |    2 +-
 lib/validate.pl   |    2 +-
 32 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/lib/abbrev.pl b/lib/abbrev.pl
index d46321f..0168631 100644
--- a/lib/abbrev.pl
+++ b/lib/abbrev.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# Usage:
 ;#	%foo = ();
diff --git a/lib/assert.pl b/lib/assert.pl
index d47e006..80593c5 100644
--- a/lib/assert.pl
+++ b/lib/assert.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 #
 # This library is no longer being maintained, and is included for backward
diff --git a/lib/bigfloat.pl b/lib/bigfloat.pl
index 82d0f5c..c21bac6 100644
--- a/lib/bigfloat.pl
+++ b/lib/bigfloat.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 package bigfloat;
 require "bigint.pl";
diff --git a/lib/bigint.pl b/lib/bigint.pl
index 6de1c53..031e8ad 100644
--- a/lib/bigint.pl
+++ b/lib/bigint.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 package bigint;
 #
diff --git a/lib/bigrat.pl b/lib/bigrat.pl
index aaf1713..146a8f4 100644
--- a/lib/bigrat.pl
+++ b/lib/bigrat.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 package bigrat;
 require "bigint.pl";
diff --git a/lib/cacheout.pl b/lib/cacheout.pl
index a5da453..937405d 100644
--- a/lib/cacheout.pl
+++ b/lib/cacheout.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 #
 # This library is no longer being maintained, and is included for backward
diff --git a/lib/complete.pl b/lib/complete.pl
index 9ed041c..2ab0c6a 100644
--- a/lib/complete.pl
+++ b/lib/complete.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;#
 #
diff --git a/lib/ctime.pl b/lib/ctime.pl
index aa00d00..ac24e71 100644
--- a/lib/ctime.pl
+++ b/lib/ctime.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# ctime.pl is a simple Perl emulation for the well known ctime(3C) function.
 #
diff --git a/lib/deprecate.pm b/lib/deprecate.pm
index 7562c69..fc548b0 100644
--- a/lib/deprecate.pm
+++ b/lib/deprecate.pm
@@ -7,6 +7,14 @@ our $VERSION = 0.02;
 our %Config;
 unless (%Config) { require Config; *Config = \%Config::Config; }
 
+# Debian-specific change: recommend the separate Debian packages of
+# deprecated modules where available
+
+my %DEBIAN_PACKAGES = (
+    "Shell"		=> "libshell-perl",
+    "Devel::DProf"	=> "libdevel-dprof-perl"
+);
+
 # This isn't a public API. It's internal to code maintained by the perl-porters
 # If you would like it to be a public API, please send a patch with
 # documentation and tests. Until then, it may change without warning.
@@ -58,9 +66,15 @@ EOM
 	if (defined $callers_bitmask
 	    && (vec($callers_bitmask, $warnings::Offsets{deprecated}, 1)
 		|| vec($callers_bitmask, $warnings::Offsets{all}, 1))) {
-	    warn <<"EOM";
+		if (my $deb = $DEBIAN_PACKAGES{$package}) {
+		    warn <<"EOM";
+$package will be removed from the Perl core distribution in the next major release. Please install the separate $deb package. It is being used at $call_file, line $call_line.
+EOM
+		} else {
+		    warn <<"EOM";
 $package will be removed from the Perl core distribution in the next major release. Please install it from CPAN. It is being used at $call_file, line $call_line.
 EOM
+		}
 	}
     }
 }
diff --git a/lib/dotsh.pl b/lib/dotsh.pl
index 92f1f4c..4085122 100644
--- a/lib/dotsh.pl
+++ b/lib/dotsh.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 #
 #   @(#)dotsh.pl                                               03/19/94
diff --git a/lib/exceptions.pl b/lib/exceptions.pl
index 8af64c8..b5b1427 100644
--- a/lib/exceptions.pl
+++ b/lib/exceptions.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # exceptions.pl
 # tchrist@convex.com
diff --git a/lib/fastcwd.pl b/lib/fastcwd.pl
index 70007a1..2c7c42e 100644
--- a/lib/fastcwd.pl
+++ b/lib/fastcwd.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # By John Bazik
 #
diff --git a/lib/find.pl b/lib/find.pl
index 8e1b42c..7fb2fbf 100644
--- a/lib/find.pl
+++ b/lib/find.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This library is deprecated and unmaintained. It is included for
 # compatibility with Perl 4 scripts which may use it, but it will be
diff --git a/lib/finddepth.pl b/lib/finddepth.pl
index 479905f..c07cea5 100644
--- a/lib/finddepth.pl
+++ b/lib/finddepth.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This library is deprecated and unmaintained. It is included for
 # compatibility with Perl 4 scripts which may use it, but it will be
diff --git a/lib/flush.pl b/lib/flush.pl
index c427976..e5ed0ae 100644
--- a/lib/flush.pl
+++ b/lib/flush.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 #
 # This library is no longer being maintained, and is included for backward
diff --git a/lib/getcwd.pl b/lib/getcwd.pl
index 77b2442..3810a99 100644
--- a/lib/getcwd.pl
+++ b/lib/getcwd.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # By Brandon S. Allbery
 #
diff --git a/lib/getopt.pl b/lib/getopt.pl
index 1d4008a..019a165 100644
--- a/lib/getopt.pl
+++ b/lib/getopt.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $
 #
diff --git a/lib/getopts.pl b/lib/getopts.pl
index 37ecb4a..3d27418 100644
--- a/lib/getopts.pl
+++ b/lib/getopts.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# getopts.pl - a better getopt.pl
 #
diff --git a/lib/hostname.pl b/lib/hostname.pl
index f57375e..b055d30 100644
--- a/lib/hostname.pl
+++ b/lib/hostname.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # From: asherman@fmrco.com (Aaron Sherman)
 #
diff --git a/lib/importenv.pl b/lib/importenv.pl
index 625edf6..52ee722 100644
--- a/lib/importenv.pl
+++ b/lib/importenv.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This library is no longer being maintained, and is included for backward
 # compatibility with Perl 4 programs which may require it.
diff --git a/lib/look.pl b/lib/look.pl
index 7be55b2..12dcace 100644
--- a/lib/look.pl
+++ b/lib/look.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# Usage: &look(*FILEHANDLE,$key,$dict,$fold)
 #
diff --git a/lib/newgetopt.pl b/lib/newgetopt.pl
index 4ac9470..08df6cb 100644
--- a/lib/newgetopt.pl
+++ b/lib/newgetopt.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This library is no longer being maintained, and is included for backward
 # compatibility with Perl 4 programs which may require it.
diff --git a/lib/open2.pl b/lib/open2.pl
index ceb5653..a05f2ab 100644
--- a/lib/open2.pl
+++ b/lib/open2.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This legacy library is deprecated and will be removed in a future
 # release of perl.
diff --git a/lib/open3.pl b/lib/open3.pl
index 9f4d5a4..27f7ab4 100644
--- a/lib/open3.pl
+++ b/lib/open3.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This legacy library is deprecated and will be removed in a future
 # release of perl.
diff --git a/lib/pwd.pl b/lib/pwd.pl
index bd8123b..bdace6e 100644
--- a/lib/pwd.pl
+++ b/lib/pwd.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# pwd.pl - keeps track of current working directory in PWD environment var
 ;#
diff --git a/lib/shellwords.pl b/lib/shellwords.pl
index b562f5f..7f16375 100644
--- a/lib/shellwords.pl
+++ b/lib/shellwords.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# This legacy library is deprecated and will be removed in a future
 ;# release of perl.
diff --git a/lib/stat.pl b/lib/stat.pl
index feda273..910ce1c 100644
--- a/lib/stat.pl
+++ b/lib/stat.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# This legacy library is deprecated and will be removed in a future
 ;# release of perl.
diff --git a/lib/syslog.pl b/lib/syslog.pl
index 7504a5d..4c2b95f 100644
--- a/lib/syslog.pl
+++ b/lib/syslog.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 #
 # syslog.pl
diff --git a/lib/tainted.pl b/lib/tainted.pl
index e88bca1..d58c765 100644
--- a/lib/tainted.pl
+++ b/lib/tainted.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 # This legacy library is deprecated and will be removed in a future
 # release of perl.
diff --git a/lib/termcap.pl b/lib/termcap.pl
index a84cba3..e641f4d 100644
--- a/lib/termcap.pl
+++ b/lib/termcap.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# $RCSfile: termcap.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:16 $
 #
diff --git a/lib/timelocal.pl b/lib/timelocal.pl
index fefb9da..2297888 100644
--- a/lib/timelocal.pl
+++ b/lib/timelocal.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# timelocal.pl
 ;#
diff --git a/lib/validate.pl b/lib/validate.pl
index fc2d16a..1a8aef4 100644
--- a/lib/validate.pl
+++ b/lib/validate.pl
@@ -1,4 +1,4 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install the separate libperl4-corelibs-perl package. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
 
 ;# The validate routine takes a single multiline string consisting of
 ;# lines containing a filename plus a file test to try on it.  (The