[packages/perl.git] / perl_581-INC.patch

--- perl.c~	Mon Apr 21 16:41:33 2003
+++ perl.c	Sun May  4 16:07:42 2003
@@ -3755,35 +3755,6 @@
 #ifdef ARCHLIB_EXP
     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
 #endif
-#ifdef MACOS_TRADITIONAL
-    {
-	Stat_t tmpstatbuf;
-    	SV * privdir = NEWSV(55, 0);
-	char * macperl = PerlEnv_getenv("MACPERL");
-	
-	if (!macperl)
-	    macperl = "";
-	
-	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
-	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
-	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
-	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
-	
-   	SvREFCNT_dec(privdir);
-    }
-    if (!PL_tainting)
-	incpush(":", FALSE, FALSE, TRUE);
-#else
-#ifndef PRIVLIB_EXP
-#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-#endif
-#if defined(WIN32)
-    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
-#else
-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
-#endif
 
 #ifdef SITEARCH_EXP
     /* sitearch is always relative to sitelib on Windows for
@@ -3803,7 +3774,7 @@
 #endif
 
 #ifdef SITELIB_STEM /* Search for version-specific dirs below here */
-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
+/*  incpush(SITELIB_STEM, FALSE, TRUE, TRUE); */
 #endif
 
 #ifdef PERL_VENDORARCH_EXP
@@ -3823,7 +3794,37 @@
 #endif
 
 #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
-    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+/*  incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); */
+#endif
+
+#ifdef MACOS_TRADITIONAL
+    {
+	Stat_t tmpstatbuf;
+    	SV * privdir = NEWSV(55, 0);
+	char * macperl = PerlEnv_getenv("MACPERL");
+	
+	if (!macperl)
+	    macperl = "";
+	
+	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
+	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
+	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
+	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
+	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
+	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
+	
+   	SvREFCNT_dec(privdir);
+    }
+    if (!PL_tainting)
+	incpush(":", FALSE, FALSE, TRUE);
+#else
+#ifndef PRIVLIB_EXP
+#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
+#endif
+#if defined(WIN32)
+    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+#else
+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
 #endif
 
 #ifdef PERL_OTHERLIBDIRS
Commit	Line	Data
642838fa	1	--- perl.c~ Mon Apr 21 16:41:33 2003
	2	+++ perl.c Sun May 4 16:07:42 2003
	3	@@ -3755,35 +3755,6 @@
	4	#ifdef ARCHLIB_EXP
	5	incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
	6	#endif
	7	-#ifdef MACOS_TRADITIONAL
	8	- {
	9	- Stat_t tmpstatbuf;
	10	- SV * privdir = NEWSV(55, 0);
	11	- char * macperl = PerlEnv_getenv("MACPERL");
	12	-
	13	- if (!macperl)
	14	- macperl = "";
	15	-
	16	- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
	17	- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
	18	- incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
	19	- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
	20	- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
	21	- incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
	22	-
	23	- SvREFCNT_dec(privdir);
	24	- }
	25	- if (!PL_tainting)
	26	- incpush(":", FALSE, FALSE, TRUE);
	27	-#else
	28	-#ifndef PRIVLIB_EXP
	29	-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
	30	-#endif
	31	-#if defined(WIN32)
	32	- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
	33	-#else
	34	- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
	35	-#endif
	36
	37	#ifdef SITEARCH_EXP
	38	/* sitearch is always relative to sitelib on Windows for
	39	@@ -3803,7 +3774,7 @@
	40	#endif
	41
	42	#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
	43	- incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
	44	+/* incpush(SITELIB_STEM, FALSE, TRUE, TRUE); */
	45	#endif
	46
	47	#ifdef PERL_VENDORARCH_EXP
	48	@@ -3823,7 +3794,37 @@
	49	#endif
	50
	51	#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
	52	- incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
	53	+/* incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); */
	54	+#endif
	55	+
	56	+#ifdef MACOS_TRADITIONAL
	57	+ {
	58	+ Stat_t tmpstatbuf;
	59	+ SV * privdir = NEWSV(55, 0);
	60	+ char * macperl = PerlEnv_getenv("MACPERL");
	61	+
	62	+ if (!macperl)
	63	+ macperl = "";
	64	+
65	+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
66	+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
67	+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
68	+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
69	+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
70	+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
71	+
72	+ SvREFCNT_dec(privdir);
73	+ }
74	+ if (!PL_tainting)
75	+ incpush(":", FALSE, FALSE, TRUE);
76	+#else
77	+#ifndef PRIVLIB_EXP
78	+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
79	+#endif
80	+#if defined(WIN32)
81	+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
82	+#else
83	+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
84	#endif
85
86	#ifdef PERL_OTHERLIBDIRS