diff options
| author | jlam <jlam> | 2005-06-24 06:43:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-24 06:43:43 +0000 |
| commit | ea8f8b396fcf875bc0284bb5efce01eb11bf7e1b (patch) | |
| tree | 666a7e5cc344f7ca6390ba1b81aaa8b1490d242a /lang/perl5/patches/patch-ah | |
| parent | a79879c6a9b573cab439ada6363b6b2f5c8c30f7 (diff) | |
| download | pkgsrc-ea8f8b396fcf875bc0284bb5efce01eb11bf7e1b.tar.gz | |
Drop the perl-5.6.x package from pkgsrc. Remove lang/perl58 and update
lang/perl5 to perl-5.8.6nb4. Modify packages that referred to
lang/perl58 to point to lang/perl5 instead.
Diffstat (limited to 'lang/perl5/patches/patch-ah')
| -rw-r--r-- | lang/perl5/patches/patch-ah | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah index 5594b0dc301..002c1bb137e 100644 --- a/lang/perl5/patches/patch-ah +++ b/lang/perl5/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.5 2002/01/28 00:25:28 jlam Exp $ +$NetBSD: patch-ah,v 1.6 2005/06/24 06:43:46 jlam Exp $ ---- perl.c.orig Thu Mar 22 00:05:02 2001 +--- perl.c.orig 2004-11-23 10:16:56.000000000 -0500 +++ perl.c -@@ -3408,12 +3408,32 @@ +@@ -4314,12 +4314,33 @@ S_init_perllib(pTHX) } /* Use the ~-expanded versions of APPLLIB (undocumented), @@ -10,56 +10,58 @@ $NetBSD: patch-ah,v 1.5 2002/01/28 00:25:28 jlam Exp $ + SITEARCH SITELIB ARCHLIB PRIVLIB VENDORARCH and VENDORLIB */ #ifdef APPLLIB_EXP - incpush(APPLLIB_EXP, TRUE, TRUE); + incpush(APPLLIB_EXP, TRUE, 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); ++ 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 ARCHLIB_EXP - incpush(ARCHLIB_EXP, FALSE, FALSE); + incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); #endif -@@ -3445,26 +3465,6 @@ - incpush(PRIVLIB_EXP, TRUE, FALSE); - #else - incpush(PRIVLIB_EXP, FALSE, FALSE); --#endif -- +@@ -4353,27 +4374,6 @@ S_init_perllib(pTHX) + 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); - #endif - +- incpush(SITELIB_STEM, FALSE, TRUE, TRUE); +-#endif +- #ifdef PERL_VENDORARCH_EXP + /* vendorarch is always relative to vendorlib on Windows for + * DLL-based path intuition to work correctly */ |