diff options
| -rw-r--r-- | lang/perl5/Makefile | 4 | ||||
| -rw-r--r-- | lang/perl5/distinfo | 3 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-ah | 65 |
3 files changed, 69 insertions, 3 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 289b29260e3..183b1461dd2 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2001/12/14 19:26:11 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2002/01/28 00:25:27 jlam Exp $ .include "../../lang/perl5/Makefile.common" -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES+= lang devel MAINTAINER= jlam@netbsd.org diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 78199206150..04e827af46a 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2001/10/14 19:55:47 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/01/28 00:25:27 jlam Exp $ SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744 Size (perl-5.6.1.tar.gz) = 5983695 bytes @@ -9,3 +9,4 @@ SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2 SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285 SHA1 (patch-af) = 94d91fba0731c9ee43b3e544f81cc9367a75a77c SHA1 (patch-ag) = 6f25b4799994279172bc756ede9f13506e9b1c28 +SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589 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 |