-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathpatch-sbin__makefml
46 lines (43 loc) · 1.32 KB
/
patch-sbin__makefml
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
--- sbin/makefml.orig 2003-01-26 20:18:01.000000000 +0900
+++ sbin/makefml 2018-04-05 23:22:08.624547000 +0900
@@ -136,8 +136,8 @@
if ($ENV{'MAKEFML'}) {
unshift(@ARGV, split(/\s+/, $ENV{'MAKEFML'}));
}
- require 'getopts.pl';
- &Getopts("adhf:A:O:p:D:vwV:mi:u:UFE:W:c:");
+ use Getopt::Std;
+ getopts('adhf:A:O:p:D:vwV:mi:u:UFE:W:c:');
# toggle flags
# $CGIInstallMode = ($opt_W =~ /cgi/i) ? 1 : 0;
@@ -6355,7 +6355,7 @@
$buf .= "\$$key = '$entry';\n";
}
- if (defined @entry) {
+ if (@entry) {
$buf .= "\@$key = (\n";
foreach $num ($[ .. $#entry) {
$buf .= "\t'$entry[$num]',\n";
@@ -6364,12 +6364,12 @@
}
if ((($] !~ /5\.\d\d\d/) &&
- $key ne "_$package" && $key ne "_DB" && defined %entry
+ $key ne "_$package" && $key ne "_DB" && %entry
)
||
(($] =~ /5\.\d\d\d/) &&
$key ne "$package::" && $key ne "DB::" &&
- (defined %entry) &&
+ (%entry) &&
($dumpPackages || $key !~ /::$/)
&& ($key !~ /^_</ || $dumpDBFiles)
&& !($package eq "dumpvar" && $key eq "stab")
@@ -7112,7 +7112,7 @@
for (split(/\n/, $MAP{$menu})) {
if (/^\s*(\S+)\s*(.*)\s*$/) {
$MAP{$menu, $1} = $2;
- $MAP{$menu, $1} =~ s/\$config{\'_ML_\'}/$config{'_ML_'}/g;
+ $MAP{$menu, $1} =~ s/\$config\{\'_ML_\'\}/$config{'_ML_'}/g;
}
}
}