Ticket #12950: patch-perl.c.2.diff

perl.c

@@ -4876 +4876 @@
     }
 
 /* Use the ~-expanded versions of APPLLIB (undocumented),
-    ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
+    original order: ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
+    macports order: SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB 
 */
 #ifdef APPLLIB_EXP
     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
 #endif
 
-#ifdef ARCHLIB_EXP
-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-#endif
-#ifdef MACOS_TRADITIONAL
-    {
-        Stat_t tmpstatbuf;
-        SV * privdir = newSV(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, FALSE);
-        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, FALSE);
-        
-        SvREFCNT_dec(privdir);
-    }
-    if (!PL_tainting)
-        incpush(":", FALSE, FALSE, TRUE, FALSE);
-#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, TRUE);
-#else
-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-#endif
-
+/* start site* locations */
 #ifdef SITEARCH_EXP
     /* sitearch is always relative to sitelib on Windows for
      * DLL-based path intuition to work correctly */
@@ -4936 +4905 @@
     /* Search for version-specific dirs below here */
     incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
 #endif
+/* end site* locations */
 
+/* start vendor* locations */
 #ifdef PERL_VENDORARCH_EXP
     /* vendorarch is always relative to vendorlib on Windows for
      * DLL-based path intuition to work correctly */
@@ -4956 +4927 @@
 #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
 #endif
+/* end vendor* locations */
+
+#ifdef ARCHLIB_EXP
+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+#endif
+#ifdef MACOS_TRADITIONAL
+    {
+        Stat_t tmpstatbuf;
+        SV * privdir = newSV(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, FALSE);
+        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, FALSE);
+        
+        SvREFCNT_dec(privdir);
+    }
+    if (!PL_tainting)
+        incpush(":", FALSE, FALSE, TRUE, FALSE);
+#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, TRUE);
+#else
+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+#endif
 
 #ifdef PERL_OTHERLIBDIRS
     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);