Move path to BSDPAN ahead of the path to site_perl. This makes BSDPAN

work when devel/p5-ExtUtils/MakeMaker is installed.

This, again, is a minor change, which does not require re-installation
of the dependant packages.

Reported by:	lth

10 files changed, 50 insertions, 60 deletions

diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index fd4f8e20b6d..3a0396bd78a 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.10/files/patch-perl.c b/lang/perl5.10/files/patch-perl.c
index 69c0e55bb12..918c773b8cc 100644
--- a/lang/perl5.10/files/patch-perl.c
+++ b/lang/perl5.10/files/patch-perl.c
@@ -1,11 +1,9 @@
-$FreeBSD$
-
---- perl.c.orig	Mon Oct 27 20:32:18 2003
-+++ perl.c	Mon Oct 27 20:33:57 2003
-@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
+--- perl.c.orig	Fri Apr 22 16:14:27 2005
++++ perl.c	Thu Dec 22 12:47:28 2005
+@@ -4397,6 +4397,27 @@ S_init_perllib(pTHX)
+     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 */
@@ -27,10 +25,10 @@ $FreeBSD$
 +    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #ifdef ARCHLIB_EXP
+     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
+@@ -4428,27 +4449,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index fd4f8e20b6d..3a0396bd78a 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.12/files/patch-perl.c b/lang/perl5.12/files/patch-perl.c
index 69c0e55bb12..918c773b8cc 100644
--- a/lang/perl5.12/files/patch-perl.c
+++ b/lang/perl5.12/files/patch-perl.c
@@ -1,11 +1,9 @@
-$FreeBSD$
-
---- perl.c.orig	Mon Oct 27 20:32:18 2003
-+++ perl.c	Mon Oct 27 20:33:57 2003
-@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
+--- perl.c.orig	Fri Apr 22 16:14:27 2005
++++ perl.c	Thu Dec 22 12:47:28 2005
+@@ -4397,6 +4397,27 @@ S_init_perllib(pTHX)
+     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 */
@@ -27,10 +25,10 @@ $FreeBSD$
 +    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #ifdef ARCHLIB_EXP
+     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
+@@ -4428,27 +4449,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index fd4f8e20b6d..3a0396bd78a 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.14/files/patch-perl.c b/lang/perl5.14/files/patch-perl.c
index 69c0e55bb12..918c773b8cc 100644
--- a/lang/perl5.14/files/patch-perl.c
+++ b/lang/perl5.14/files/patch-perl.c
@@ -1,11 +1,9 @@
-$FreeBSD$
-
---- perl.c.orig	Mon Oct 27 20:32:18 2003
-+++ perl.c	Mon Oct 27 20:33:57 2003
-@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
+--- perl.c.orig	Fri Apr 22 16:14:27 2005
++++ perl.c	Thu Dec 22 12:47:28 2005
+@@ -4397,6 +4397,27 @@ S_init_perllib(pTHX)
+     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 */
@@ -27,10 +25,10 @@ $FreeBSD$
 +    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #ifdef ARCHLIB_EXP
+     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
+@@ -4428,27 +4449,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index fd4f8e20b6d..3a0396bd78a 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.16/files/patch-perl.c b/lang/perl5.16/files/patch-perl.c
index 69c0e55bb12..918c773b8cc 100644
--- a/lang/perl5.16/files/patch-perl.c
+++ b/lang/perl5.16/files/patch-perl.c
@@ -1,11 +1,9 @@
-$FreeBSD$
-
---- perl.c.orig	Mon Oct 27 20:32:18 2003
-+++ perl.c	Mon Oct 27 20:33:57 2003
-@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
+--- perl.c.orig	Fri Apr 22 16:14:27 2005
++++ perl.c	Thu Dec 22 12:47:28 2005
+@@ -4397,6 +4397,27 @@ S_init_perllib(pTHX)
+     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 */
@@ -27,10 +25,10 @@ $FreeBSD$
 +    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #ifdef ARCHLIB_EXP
+     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
+@@ -4428,27 +4449,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index fd4f8e20b6d..3a0396bd78a 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.8/files/patch-perl.c b/lang/perl5.8/files/patch-perl.c
index 69c0e55bb12..918c773b8cc 100644
--- a/lang/perl5.8/files/patch-perl.c
+++ b/lang/perl5.8/files/patch-perl.c
@@ -1,11 +1,9 @@
-$FreeBSD$
-
---- perl.c.orig	Mon Oct 27 20:32:18 2003
-+++ perl.c	Mon Oct 27 20:33:57 2003
-@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
+--- perl.c.orig	Fri Apr 22 16:14:27 2005
++++ perl.c	Thu Dec 22 12:47:28 2005
+@@ -4397,6 +4397,27 @@ S_init_perllib(pTHX)
+     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 */
@@ -27,10 +25,10 @@ $FreeBSD$
 +    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
 +#endif
 +
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #ifdef ARCHLIB_EXP
+     incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
  #endif
-@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
+@@ -4428,27 +4449,6 @@ S_init_perllib(pTHX)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
  #else
      incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);