summaryrefslogtreecommitdiff
path: root/lang/perl5.10/files/patch-perl.c
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2012-03-11 23:49:09 +0000
committerMark Linimon <linimon@FreeBSD.org>2012-03-11 23:49:09 +0000
commit7047959f240813dd8e23b0962c0e5e605cd1d142 (patch)
tree691b175a94411098f1a16b6804d31984c2464863 /lang/perl5.10/files/patch-perl.c
parentPortaudit 0.6.0: (diff)
Undo ports/165457 to not violate POLA. As far as I knew, the PR
was to test what happened when we did eventually delete these two ports, not to delete them immediately. A subsequent commit will add appropriate deprecation messages. Hat: portmgr PR: ports/165457 Feature safe: yes (actually no, however, this is to preserve POLA)
Notes
Notes: svn path=/head/; revision=293132
Diffstat (limited to 'lang/perl5.10/files/patch-perl.c')
-rw-r--r--lang/perl5.10/files/patch-perl.c61
1 files changed, 61 insertions, 0 deletions
diff --git a/lang/perl5.10/files/patch-perl.c b/lang/perl5.10/files/patch-perl.c
new file mode 100644
index 000000000000..2f3753750e72
--- /dev/null
+++ b/lang/perl5.10/files/patch-perl.c
@@ -0,0 +1,61 @@
+--- perl.c
++++ perl.c
+ #else /* IAMSUID */
+@@ -4882,6 +4882,28 @@
+ incpush(APPLLIB_EXP, TRUE, 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, TRUE, TRUE);
++# endif
++#endif
++
++#ifdef SITELIB_EXP
++# if defined(WIN32)
++ /* this picks up sitearch as well */
++ incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
++# else
++ incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
++# endif
++#endif
++
++#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
++ /* Search for version-specific dirs below here */
++ incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
++#endif
++
+ #ifdef ARCHLIB_EXP
+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+ #endif
+@@ -4915,28 +4937,6 @@
+ incpush(PRIVLIB_EXP, FALSE, FALSE, 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, TRUE, TRUE);
+-# endif
+-#endif
+-
+-#ifdef SITELIB_EXP
+-# if defined(WIN32)
+- /* this picks up sitearch as well */
+- incpush(SITELIB_EXP, TRUE, FALSE, TRUE, TRUE);
+-# else
+- incpush(SITELIB_EXP, FALSE, FALSE, TRUE, TRUE);
+-# endif
+-#endif
+-
+-#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
+- /* Search for version-specific dirs below here */
+- incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
+-#endif
+-
+ #ifdef PERL_VENDORARCH_EXP
+ /* vendorarch is always relative to vendorlib on Windows for
+ * DLL-based path intuition to work correctly */