diff options
| author | jlam <jlam> | 2002-01-28 00:25:27 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-01-28 00:25:27 +0000 |
| commit | bd66a62d59f214226ee71eabfcf3fb295ed35514 (patch) | |
| tree | f3b0c8c6464b272e93ec58b191570f47c0a95a4d /lang/perl5/patches | |
| parent | 4c9a32bdea171d5a0d123385af6c963da524e8e2 (diff) | |
| download | pkgsrc-bd66a62d59f214226ee71eabfcf3fb295ed35514.tar.gz | |
Update lang/perl5 to 5.6.1nb7. Changes from version 5.6.1nb6 include
changing the default module/library search path to have site_perl come
before the standard directories. In other words, the previous search path
on an i386 was:
/usr/pkg/lib/perl5/5.6.1/i386-netbsd
/usr/pkg/lib/perl5/5.6.1
/usr/pkg/lib/perl5/site_perl/5.6.1/i386-netbsd
/usr/pkg/lib/perl5/site_perl/5.6.1
/usr/pkg/lib/perl5/site_perl
but it is now:
/usr/pkg/lib/perl5/site_perl/5.6.1/i386-netbsd
/usr/pkg/lib/perl5/site_perl/5.6.1
/usr/pkg/lib/perl5/site_perl
/usr/pkg/lib/perl5/5.6.1/i386-netbsd
/usr/pkg/lib/perl5/5.6.1
The rationale for this is that when we install a module that is newer than
one in the standard library, the new module goes into the site_perl
directory as it's an add-on module. However, we can't use the newer module
without modifying either the scripts of the perl environment to find the
newer module explicitly because of the order of the library search path:
the site_perl directories come after the standard directories. The normal
solution is to directly replace the module in the standard library with
the newer module. However, this isn't really on option when installing
via pkgsrc because the older module files are owned by the perl package.
By placing the the site_perl directories before the standard directories,
newer modules that we install via pkgsrc are simply found before the older
ones in the standard library.
Diffstat (limited to 'lang/perl5/patches')
| -rw-r--r-- | lang/perl5/patches/patch-ah | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah new file mode 100644 index 00000000000..5594b0dc301 --- /dev/null +++ b/lang/perl5/patches/patch-ah @@ -0,0 +1,65 @@ +$NetBSD: patch-ah,v 1.5 2002/01/28 00:25:28 jlam Exp $ + +--- perl.c.orig Thu Mar 22 00:05:02 2001 ++++ perl.c +@@ -3408,12 +3408,32 @@ + } + + /* Use the ~-expanded versions of APPLLIB (undocumented), +- ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB ++ SITEARCH SITELIB ARCHLIB PRIVLIB VENDORARCH and VENDORLIB + */ + #ifdef APPLLIB_EXP + incpush(APPLLIB_EXP, TRUE, 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); ++# endif ++#endif ++ ++#ifdef SITELIB_EXP ++# if defined(WIN32) ++ incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ ++# else ++ incpush(SITELIB_EXP, FALSE, FALSE); ++# endif ++#endif ++ ++#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ ++ incpush(SITELIB_STEM, FALSE, TRUE); ++#endif ++ + #ifdef ARCHLIB_EXP + incpush(ARCHLIB_EXP, FALSE, FALSE); + #endif +@@ -3445,26 +3465,6 @@ + incpush(PRIVLIB_EXP, TRUE, FALSE); + #else + incpush(PRIVLIB_EXP, FALSE, FALSE); +-#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); +-# endif +-#endif +- +-#ifdef SITELIB_EXP +-# if defined(WIN32) +- incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ +-# else +- incpush(SITELIB_EXP, FALSE, FALSE); +-# endif +-#endif +- +-#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ +- incpush(SITELIB_STEM, FALSE, TRUE); + #endif + + #ifdef PERL_VENDORARCH_EXP |