aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2019-08-12 18:34:22 +0800
committermat <mat@FreeBSD.org>2019-08-12 18:34:22 +0800
commit6713ccc7be83295b46586dc1ae161def973b646d (patch)
treec8d51e4f5206c0540af47dc228d6cee1697f56c8
parentbe6b64bc0ca8e158c26dec9e2b98bc727a1e28f0 (diff)
downloadfreebsd-ports-gnome-6713ccc7be83295b46586dc1ae161def973b646d.tar.gz
freebsd-ports-gnome-6713ccc7be83295b46586dc1ae161def973b646d.tar.zst
freebsd-ports-gnome-6713ccc7be83295b46586dc1ae161def973b646d.zip
Fix install for Perl > 5.10.
(Yes, really.) PR: 239742
-rw-r--r--devel/cvslines/files/patch-INSTALL19
1 files changed, 13 insertions, 6 deletions
diff --git a/devel/cvslines/files/patch-INSTALL b/devel/cvslines/files/patch-INSTALL
index df0e8010cc13..6abc11a35d86 100644
--- a/devel/cvslines/files/patch-INSTALL
+++ b/devel/cvslines/files/patch-INSTALL
@@ -1,6 +1,6 @@
---- INSTALL.orig Fri Apr 19 21:26:39 2002
-+++ INSTALL Wed Oct 8 09:22:22 2003
-@@ -73,7 +73,7 @@
+--- INSTALL.orig 2003-07-28 12:34:07 UTC
++++ INSTALL
+@@ -73,7 +73,7 @@ sub x
}
@@ -9,7 +9,7 @@
($u_os, $u_host, $u_osrel) = split(/\s+/, $uname);
# Try to find things in the usual places, but failing those,
-@@ -122,6 +122,7 @@
+@@ -122,6 +122,7 @@ if ($op eq "install")
if ( ! ( ($u_os eq "SunOS" && $u_osrel =~ /^5\./)
|| ($u_os eq "SunOS" && $u_osrel =~ /^4\./)
|| ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)
@@ -17,7 +17,7 @@
|| ($u_os eq "Linux")))
{
print STDERR <<MSG;
-@@ -134,7 +135,7 @@
+@@ -134,13 +135,13 @@ $Myname:
(press Return to continue with the install...)
MSG
@@ -26,7 +26,14 @@
}
$cvs_versmsg = `cvs -v`;
-@@ -151,7 +152,7 @@
+ if ($cvs_versmsg !~ /\nConcurrent Versions System\s+\(CVS\)\s+1\.11\s+/)
+ {
+- $starsave = $*; $* = 1; $cvs_versmsg =~ s/^/ /g; $* = $starsave;
++ $cvs_versmsg =~ s/^/ /gm;
+ print STDERR <<MSG;
+ $Myname:
+
+@@ -151,7 +152,7 @@ $Myname:
$cvs_versmsg
(press Return to continue with the install...)
MSG