Use phkmalloc instead of Perl's own malloc. Also clean up the FreeBSD

hints file for future releases. This will be submitted to the Perl
maintainers.

2 files changed, 43 insertions, 31 deletions

diff --git a/lang/perl5.12/files/patch-ab b/lang/perl5.12/files/patch-ab
index 8394b47cc834..ba42c1827211 100644
--- a/lang/perl5.12/files/patch-ab
+++ b/lang/perl5.12/files/patch-ab
@@ -1,34 +1,3 @@
-*** hints/freebsd.sh	Mon Feb 12 11:52:51 1996
---- hints/freebsd.sh	Sat Jun  1 19:08:28 1996
-***************
-*** 47,54 ****
-  # It does not covert all 2.1-current versions as the output of uname
-  # changed a few times.
-  #
-! 2.0.5*|2.0-built*|2.1*)
-   	usevfork='true'
-  	;;
-  #
-  # Guesses at what will be needed after 2.1
---- 47,64 ----
-  # It does not covert all 2.1-current versions as the output of uname
-  # changed a few times.
-  #
-! # Even though seteuid/setegid are available, they've been turned off
-! # because perl isn't coded with saved set[ug]id variables in mind.
-! # In addition, a small patch is requried to suidperl to avoid a security
-! # problem with FreeBSD.
-! #
-! 2.0.5*|2.0-built*|2.1*|2.2*)
-   	usevfork='true'
-+ 	d_dosuid='define'
-+ 	d_setregid='define'
-+ 	d_setreuid='define'
-+ 	d_setegid='undef'
-+ 	d_seteuid='undef'
-  	;;
-  #
-  # Guesses at what will be needed after 2.1
 --- perl.c.orig	Tue Feb 27 13:30:44 1996
 +++ perl.c	Sun Jun  2 09:22:34 1996
 @@ -1606,10 +1606,10 @@
diff --git a/lang/perl5.12/files/patch-ad b/lang/perl5.12/files/patch-ad
new file mode 100644
index 000000000000..4bcd19842a3e
--- /dev/null
+++ b/lang/perl5.12/files/patch-ad
@@ -0,0 +1,43 @@
+--- hints/freebsd.sh.orig	Mon Feb 12 21:52:51 1996
++++ hints/freebsd.sh	Wed Oct 23 18:00:16 1996
+@@ -43,16 +43,38 @@
+ 	d_setruid='undef'
+ 	;;
+ #
+-# Trying to cover 2.0.5, 2.1-current and future 2.1
++# Trying to cover 2.0.5, 2.1-current and future 2.1/2.2
+ # It does not covert all 2.1-current versions as the output of uname
+ # changed a few times.
+ #
++# Even though seteuid/setegid are available, they've been turned off
++# because perl isn't coded with saved set[ug]id variables in mind.
++# In addition, a small patch is requried to suidperl to avoid a security
++# problem with FreeBSD.
++#
+ 2.0.5*|2.0-built*|2.1*)
+  	usevfork='true'
++	d_dosuid='define'
++	d_setregid='define'
++	d_setreuid='define'
++	d_setegid='undef'
++	d_seteuid='undef'
++	;;
++#
++# 2.2 and above have phkmalloc(3).
++2.2*)
++ 	usevfork='true'
++	usemymalloc='n'
++	d_dosuid='define'
++	d_setregid='define'
++	d_setreuid='define'
++	d_setegid='undef'
++	d_seteuid='undef'
+ 	;;
+ #
+-# Guesses at what will be needed after 2.1
++# Guesses at what will be needed after 2.2
+ *)	usevfork='true'
++	usemymalloc='n'
+ 	;;
+ esac
+