From 011d6642799945a55d2052bb8734053eb0475f24 Mon Sep 17 00:00:00 2001
From: Anton Berezin <tobez@FreeBSD.org>
Date: Tue, 29 Oct 2002 15:47:13 +0000
Subject: [PATCH] Fix a bug in perl 5.6.1 described in

http://archive.develooper.com/perl5-porters@perl.org/msg58812.html

with a patch from

http://archive.develooper.com/perl5-porters@perl.org/msg58819.html

While we normally do not fix non-FreeBSD problems with 3rd party
software, it is expected that perl 5.6.1 will be used widely for some
time to come, and the bug is bad enough to grant the inclusion of the
patch here.
---
 lang/perl5.6/Makefile         |  2 +-
 lang/perl5.6/files/patch-mg.c | 11 +++++++++++
 lang/perl5/Makefile           |  2 +-
 lang/perl5/files/patch-mg.c   | 11 +++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 lang/perl5.6/files/patch-mg.c
 create mode 100644 lang/perl5/files/patch-mg.c

diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index d88341c43852..e7ec4e3e6fb4 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.6/files/patch-mg.c b/lang/perl5.6/files/patch-mg.c
new file mode 100644
index 000000000000..c9ef2a1322b0
--- /dev/null
+++ b/lang/perl5.6/files/patch-mg.c
@@ -0,0 +1,11 @@
+--- mg.c.orig	Tue Oct 29 16:24:52 2002
++++ mg.c	Tue Oct 29 16:32:26 2002
+@@ -562,6 +562,8 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
+ 		(void)SvOK_off(sv);
+ 	    else if (PL_in_eval)
+  		sv_setiv(sv, PL_in_eval & ~(EVAL_INREQUIRE));
++	    else
++		sv_setiv(sv, 0);
+ 	}
+ 	break;
+     case '\024':		/* ^T */
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index d88341c43852..e7ec4e3e6fb4 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5/files/patch-mg.c b/lang/perl5/files/patch-mg.c
new file mode 100644
index 000000000000..c9ef2a1322b0
--- /dev/null
+++ b/lang/perl5/files/patch-mg.c
@@ -0,0 +1,11 @@
+--- mg.c.orig	Tue Oct 29 16:24:52 2002
++++ mg.c	Tue Oct 29 16:32:26 2002
+@@ -562,6 +562,8 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg)
+ 		(void)SvOK_off(sv);
+ 	    else if (PL_in_eval)
+  		sv_setiv(sv, PL_in_eval & ~(EVAL_INREQUIRE));
++	    else
++		sv_setiv(sv, 0);
+ 	}
+ 	break;
+     case '\024':		/* ^T */