diff options
Diffstat (limited to 'lang/perl5/patches/patch-ab')
| -rw-r--r-- | lang/perl5/patches/patch-ab | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab index 8dc34ae357a..36b4b5f72f1 100644 --- a/lang/perl5/patches/patch-ab +++ b/lang/perl5/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:23 agc Exp $ +$NetBSD: patch-ab,v 1.4 2000/01/17 03:07:11 christos Exp $ ---- installperl.BAK Wed Nov 19 23:02:26 1997 -+++ installperl Wed Nov 19 23:04:08 1997 -@@ -93,7 +93,7 @@ - safe_unlink("$installbin/sperl$ver$exe_ext"); +--- installperl.orig Sat Jan 16 11:31:26 1999 ++++ installperl Sun Jan 16 21:26:37 2000 +@@ -182,7 +182,7 @@ + safe_unlink("$installbin/s$perl$ver$exe_ext"); if ($d_dosuid) { - copy("suidperl$exe_ext", "$installbin/sperl$ver$exe_ext"); -- chmod(04711, "$installbin/sperl$ver$exe_ext"); + copy("suidperl$exe_ext", "$installbin/s$perl$ver$exe_ext"); +- chmod(04711, "$installbin/s$perl$ver$exe_ext"); + chmod(04111, "$installbin/sperl$ver$exe_ext"); } # Install library files. -@@ -156,17 +156,17 @@ +@@ -275,19 +275,19 @@ (-l $usrbinperl) && ((readlink $usrbinperl) eq $expinstperl)); } @@ -19,22 +19,26 @@ $NetBSD: patch-ab,v 1.3 1998/08/07 11:09:23 agc Exp $ - (yn("Many scripts expect perl to be installed as $usrbinperl.\n" . - "Do you wish to have $usrbinperl be the same as\n" . - "$expinstperl? [y] "))) -- { +- { - unlink($usrbinperl); -- eval { CORE::link $instperl, $usrbinperl } || -- eval { symlink $expinstperl, $usrbinperl } || -- copy($instperl, $usrbinperl); +- ( $Config{'d_link'} eq 'define' && +- eval { CORE::link $instperl, $usrbinperl } ) || +- eval { symlink $expinstperl, $usrbinperl } || +- copy($instperl, $usrbinperl); +- - $mainperl_is_instperl = 1; - } +# if ((! $mainperl_is_instperl) && +# (yn("Many scripts expect perl to be installed as $usrbinperl.\n" . +# "Do you wish to have $usrbinperl be the same as\n" . +# "$expinstperl? [y] "))) -+# { ++# { +# unlink($usrbinperl); -+# eval { CORE::link $instperl, $usrbinperl } || -+# eval { symlink $expinstperl, $usrbinperl } || -+# copy($instperl, $usrbinperl); ++# ( $Config{'d_link'} eq 'define' && ++# eval { CORE::link $instperl, $usrbinperl } ) || ++# eval { symlink $expinstperl, $usrbinperl } || ++# copy($instperl, $usrbinperl); ++# +# $mainperl_is_instperl = 1; +# } } |