1 files changed, 22 insertions, 20 deletions
diff --git a/lang/perl5.8/files/patch-perl.c b/lang/perl5.8/files/patch-perl.c
index b9b348bef069..69c0e55bb12e 100644
--- a/lang/perl5.8/files/patch-perl.c
+++ b/lang/perl5.8/files/patch-perl.c
@@ -1,58 +1,60 @@
 $FreeBSD$
 
---- perl.c.orig	Sun Jun  2 12:29:01 2002
-+++ perl.c	Sun Jun  2 12:30:14 2002
-@@ -3407,6 +3407,26 @@
- #endif /* VMS */
-     }
- 
+--- perl.c.orig	Mon Oct 27 20:32:18 2003
++++ perl.c	Mon Oct 27 20:33:57 2003
+@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
+ /* Use the ~-expanded versions of APPLLIB (undocumented),
+     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
+ */
 +#ifdef SITEARCH_EXP
 +    /* sitearch is always relative to sitelib on Windows for
 +     * DLL-based path intuition to work correctly */
 +#  if !defined(WIN32)
-+    incpush(SITEARCH_EXP, FALSE, FALSE);
++    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
 +#  endif
 +#endif
 +
 +#ifdef SITELIB_EXP
 +#  if defined(WIN32)
-+    incpush(SITELIB_EXP, TRUE, FALSE);	/* this picks up sitearch as well */
++    /* this picks up sitearch as well */
++    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
 +#  else
-+    incpush(SITELIB_EXP, FALSE, FALSE);
++    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
 +#  endif
 +#endif
 +
 +#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
-+    incpush(SITELIB_STEM, FALSE, TRUE);
++    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
-@@ -3445,26 +3465,6 @@
-     incpush(PRIVLIB_EXP, TRUE, FALSE);
+ #ifdef APPLLIB_EXP
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #endif
+@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
+     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
-     incpush(PRIVLIB_EXP, FALSE, FALSE);
+     incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
 -#endif
 -
 -#ifdef SITEARCH_EXP
 -    /* sitearch is always relative to sitelib on Windows for
 -     * DLL-based path intuition to work correctly */
 -#  if !defined(WIN32)
--    incpush(SITEARCH_EXP, FALSE, FALSE);
+-    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
 -#  endif
 -#endif
 -
 -#ifdef SITELIB_EXP
 -#  if defined(WIN32)
--    incpush(SITELIB_EXP, TRUE, FALSE);	/* this picks up sitearch as well */
+-    /* this picks up sitearch as well */
+-    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
 -#  else
--    incpush(SITELIB_EXP, FALSE, FALSE);
+-    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
 -#  endif
 -#endif
 -
 -#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
--    incpush(SITELIB_STEM, FALSE, TRUE);
+-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
  #endif
  
  #ifdef PERL_VENDORARCH_EXP