summaryrefslogtreecommitdiff
path: root/lang/perl5/patches/patch-ab
diff options
context:
space:
mode:
authorhubertf <hubertf>1997-11-22 03:53:21 +0000
committerhubertf <hubertf>1997-11-22 03:53:21 +0000
commita1cfc35295caf671bd52c9bd3c07620416ee1046 (patch)
tree2cf2a85c1704375d5af38664b382c573396d5e93 /lang/perl5/patches/patch-ab
parentc2ad2f5983cfb3d554c3251e65aed0b16daac509 (diff)
downloadpkgsrc-a1cfc35295caf671bd52c9bd3c07620416ee1046.tar.gz
Update for perl 5.004_04 and MI/MD PLIST.
Diffstat (limited to 'lang/perl5/patches/patch-ab')
-rw-r--r--lang/perl5/patches/patch-ab25
1 files changed, 18 insertions, 7 deletions
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index e713b0655e9..ad168dc25d4 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,5 +1,5 @@
---- installperl.ORIG Mon May 12 05:22:27 1997
-+++ installperl Fri May 23 11:40:27 1997
+--- 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");
if ($d_dosuid) {
@@ -9,7 +9,7 @@
}
# Install library files.
-@@ -156,11 +156,12 @@
+@@ -156,17 +156,17 @@
(-l $usrbinperl) &&
((readlink $usrbinperl) eq $expinstperl));
}
@@ -18,12 +18,23 @@
- "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);
+- $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] ")))
+# {
-+ if ('') { # MarkM - May 1997. Take the NO route always.
- unlink($usrbinperl);
- eval { CORE::link $instperl, $usrbinperl } ||
- eval { symlink $expinstperl, $usrbinperl } ||
++# unlink($usrbinperl);
++# eval { CORE::link $instperl, $usrbinperl } ||
++# eval { symlink $expinstperl, $usrbinperl } ||
++# copy($instperl, $usrbinperl);
++# $mainperl_is_instperl = 1;
++# }
+ }
+
+ # Make links to ordinary names if installbin directory isn't current directory.