Update for perl 5.004_04 and MI/MD PLIST.

5 files changed, 51 insertions, 86 deletions

diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index b2e88165402..d62cf672e53 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,37 +1,20 @@
---- Configure.orig	Wed Jun 11 00:28:03 1997
-+++ Configure	Thu Oct  2 10:07:10 1997
+--- Configure.BAK	Wed Nov 19 22:58:47 1997
++++ Configure	Wed Nov 19 23:01:54 1997
 @@ -65,7 +65,7 @@
  fi
  
  : Proper PATH setting
 -paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
-+paths='/bin /usr/bin /usr/pkg/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
++paths='/bin /usr/bin ${PREFIX}/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
  paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
  paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
  paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-@@ -91,11 +91,11 @@
- *)	CDPATH='' ;;
- esac
- 
--: Sanity checks
--if test ! -t 0; then
--	echo "Say 'sh $me', not 'sh <$me'"
--	exit 1
--fi
-+: Sanity checks Disabled for FreeBSD port building - MarkM - May 1997
-+: if test ! -t 0; : then
-+:	echo "Say 'sh $me', not 'sh <$me'"
-+:	exit 1
-+: fi
- 
- : Test and see if we are running under ksh, either blatantly or in disguise.
- if (PATH=.; alias -x) >/dev/null 2>&1; then
 @@ -725,7 +725,7 @@
  archobjs=''
  : Possible local include directories to search.
  : Set locincpth to "" in a hint file to defeat local include searches.
 -locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-+locincpth="/usr/pkg/include /usr/local/include /opt/local/include /usr/gnu/include"
++locincpth="${PREFIX}/include /usr/local/include /opt/local/include /usr/gnu/include"
  locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
  :
  : no include file wanted by default
@@ -40,21 +23,21 @@
  
  : Possible local library directories to search.
 -loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
-+loclibpth="/usr/pkg/lib /usr/local/lib /opt/local/lib /usr/gnu/lib"
++loclibpth="${PREFIX}/lib /usr/local/lib /opt/local/lib /usr/gnu/lib"
  loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
  
  : general looking path for locating libraries
- glibpth="/shlib /usr/shlib /lib/pa1.1 /usr/lib/large"
+ glibpth="/shlib /usr/shlib /usr/lib/pa1.1 /usr/lib/large"
  glibpth="$glibpth /lib /usr/lib $xlibpth"
  glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
 -glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
-+glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/pkg/lib /usr/local/lib"
++glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib ${PREFIX}/lib"
  
  : Private path used by Configure to find libraries.  Its value
  : is prepended to libpth. This variable takes care of special
  : machines, like the mips.  Usually, it should be empty.
 -plibpth=''
-+plibpth='/usr/pkg/lib'
++plibpth='${PREFIX}/lib'
  
  : full support for void wanted by default
  defvoidused=15
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.
diff --git a/lang/perl5/patches/patch-ac b/lang/perl5/patches/patch-ac
index b97fb42c955..e1215448151 100644
--- a/lang/perl5/patches/patch-ac
+++ b/lang/perl5/patches/patch-ac
@@ -1,29 +1,18 @@
---- hints/freebsd.sh.orig	Wed Apr 23 16:01:37 1997
-+++ hints/freebsd.sh	Tue Jun  3 14:29:50 1997
-@@ -63,6 +63,7 @@
- 	d_setreuid='define'
- 	d_setegid='undef'
- 	d_seteuid='undef'
-+	d_dosuid='define'
- 	test -r ./broken-db.msg && . ./broken-db.msg
- 	;;
- #
-@@ -76,12 +77,18 @@
- 	d_setreuid='define'
- 	d_setegid='undef'
- 	d_seteuid='undef'
-+	d_dosuid='define'
- 	;;
- #
- # Guesses at what will be needed after 2.2
- *)	usevfork='true'
- 	usemymalloc='n'
- 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+	d_setregid='define'
-+	d_setreuid='define'
-+	d_setegid='undef'
-+	d_seteuid='undef'
-+	d_dosuid='define'
- 	;;
- esac
+--- perl.h.BAK	Wed Nov 19 23:07:32 1997
++++ perl.h	Wed Nov 19 23:08:54 1997
+@@ -223,6 +223,15 @@
+ #   include <sys/param.h>
+ #endif
  
++/* needed for IAMSUID case for 4.4BSD systems
++ * XXX there should probably be a Configure variable
++ */
++
++#ifdef I_SYS_PARAM
++#if (defined (BSD) && (BSD >= 199306))
++#   include <sys/mount.h>
++#endif /* !BSD */
++#endif /* !I_SYS_PARAM */
+ 
+ /* Use all the "standard" definitions? */
+ #if defined(STANDARD_C) && defined(I_STDLIB)
diff --git a/lang/perl5/patches/patch-ad b/lang/perl5/patches/patch-ad
index e6863c22280..1fea824e9e6 100644
--- a/lang/perl5/patches/patch-ad
+++ b/lang/perl5/patches/patch-ad
@@ -1,24 +1,6 @@
---- perl.h.ORIG	Mon Apr 28 17:36:10 1997
-+++ perl.h	Fri May 23 11:56:49 1997
-@@ -223,6 +223,15 @@
- #   include <sys/param.h>
- #endif
- 
-+/* needed for IAMSUID case for 4.4BSD systems 
-+ * XXX there should probably be a Configure variable
-+ */
-+
-+#ifdef I_SYS_PARAM
-+#if (defined (BSD) && (BSD >= 199306))
-+#   include <sys/mount.h>
-+#endif /* !BSD */
-+#endif /* !I_SYS_PARAM */
- 
- /* Use all the "standard" definitions? */
- #if defined(STANDARD_C) && defined(I_STDLIB)
---- perl5.004/perl.c.ORIG	Fri May 16 00:14:03 1997
-+++ perl.c	Fri May 23 11:56:49 1997
-@@ -1917,6 +1917,20 @@
+--- perl.c.BAK	Wed Nov 19 23:09:31 1997
++++ perl.c	Wed Nov 19 23:10:58 1997
+@@ -2036,6 +2036,20 @@
  		croak("Can't swap uid and euid");	/* really paranoid */
  	    if (Stat(SvPVX(GvSV(curcop->cop_filegv)),&tmpstatbuf) < 0)
  		croak("Permission denied");	/* testing full pathname here */
@@ -30,7 +12,7 @@
 +            if (fstatfs(fileno(rsfp),&stfs) < 0)
 +                croak("Can't statfs filesystem of script \"%s\"",origfilename);
 +
-+            if (stfs.f_flags & MNT_NOSUID)
++           if (stfs.f_flags & MNT_NOSUID)
 +                croak("Permission denied");
 +        }
 +#endif /* IAMSUID */
diff --git a/lang/perl5/patches/patch-ae b/lang/perl5/patches/patch-ae
index 1c95a05a5db..f4c8b7fdf14 100644
--- a/lang/perl5/patches/patch-ae
+++ b/lang/perl5/patches/patch-ae
@@ -1,10 +1,10 @@
---- makedepend.SH.orig  Mon Sep  8 21:27:36 1997
-+++ makedepend.SH       Mon Sep  8 21:29:04 1997
-@@ -60,6 +60,7 @@
+--- makedepend.SH.BAK	Wed Nov 19 23:11:49 1997
++++ makedepend.SH	Wed Nov 19 23:12:34 1997
+@@ -66,6 +66,7 @@
      # to be out of date.  I don't know if OS/2 has touch, so do this:
      case "$osname" in
      os2) ;;
-+    freebsd) ;;
++    netbsd) ;;
      *) $touch $firstmakefile ;;
      esac
  fi