- Fix perl configure erroneously saving /usr/local/script as a site script install directory if it's present, which leads to misinstallation of many ports which install perl scripts (p5-Mail-SpamAssassin, for example)

PR:		149771
Submitted by:	Peter Radcliffe <pir-freebsd.org@pir.net>
Patch by:	myself
Approved by:	jadawin

10 files changed, 61 insertions, 6 deletions

diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 5ad7b48b8abf..740d57c08c52 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.10/files/patch-Configure b/lang/perl5.10/files/patch-Configure
index 0abb559cbc33..21ccd2c8c62e 100644
--- a/lang/perl5.10/files/patch-Configure
+++ b/lang/perl5.10/files/patch-Configure
@@ -1,6 +1,6 @@
 --- Configure.orig	2010-07-14 15:28:45.000000000 +0000
 +++ Configure	2010-07-14 15:29:23.000000000 +0000
-@@ -4780,7 +4780,7 @@
+@@ -4798,7 +4798,7 @@
  libpth=''
  for xxx in $dlist
  do
@@ -9,3 +9,13 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
+@@ -9125,8 +9125,7 @@
+ 
+ : determine where add-on public executable scripts go
+ case "$sitescript" in
+-'')	dflt=$siteprefix/script
+-	$test -d $dflt || dflt=$sitebin ;;
++'')	dflt=$sitebin ;;
+ *)  dflt="$sitescript" ;;
+ esac
+ fn=d~+
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 314f393d6cbe..dc9130dbf0bf 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.12/files/patch-Configure b/lang/perl5.12/files/patch-Configure
index 0abb559cbc33..21ccd2c8c62e 100644
--- a/lang/perl5.12/files/patch-Configure
+++ b/lang/perl5.12/files/patch-Configure
@@ -1,6 +1,6 @@
 --- Configure.orig	2010-07-14 15:28:45.000000000 +0000
 +++ Configure	2010-07-14 15:29:23.000000000 +0000
-@@ -4780,7 +4780,7 @@
+@@ -4798,7 +4798,7 @@
  libpth=''
  for xxx in $dlist
  do
@@ -9,3 +9,13 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
+@@ -9125,8 +9125,7 @@
+ 
+ : determine where add-on public executable scripts go
+ case "$sitescript" in
+-'')	dflt=$siteprefix/script
+-	$test -d $dflt || dflt=$sitebin ;;
++'')	dflt=$sitebin ;;
+ *)  dflt="$sitescript" ;;
+ esac
+ fn=d~+
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 65e2f17fa089..b847383570e0 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.14/files/patch-Configure b/lang/perl5.14/files/patch-Configure
index 0abb559cbc33..21ccd2c8c62e 100644
--- a/lang/perl5.14/files/patch-Configure
+++ b/lang/perl5.14/files/patch-Configure
@@ -1,6 +1,6 @@
 --- Configure.orig	2010-07-14 15:28:45.000000000 +0000
 +++ Configure	2010-07-14 15:29:23.000000000 +0000
-@@ -4780,7 +4780,7 @@
+@@ -4798,7 +4798,7 @@
  libpth=''
  for xxx in $dlist
  do
@@ -9,3 +9,13 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
+@@ -9125,8 +9125,7 @@
+ 
+ : determine where add-on public executable scripts go
+ case "$sitescript" in
+-'')	dflt=$siteprefix/script
+-	$test -d $dflt || dflt=$sitebin ;;
++'')	dflt=$sitebin ;;
+ *)  dflt="$sitescript" ;;
+ esac
+ fn=d~+
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 65e2f17fa089..b847383570e0 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.16/files/patch-Configure b/lang/perl5.16/files/patch-Configure
index 0abb559cbc33..21ccd2c8c62e 100644
--- a/lang/perl5.16/files/patch-Configure
+++ b/lang/perl5.16/files/patch-Configure
@@ -1,6 +1,6 @@
 --- Configure.orig	2010-07-14 15:28:45.000000000 +0000
 +++ Configure	2010-07-14 15:29:23.000000000 +0000
-@@ -4780,7 +4780,7 @@
+@@ -4798,7 +4798,7 @@
  libpth=''
  for xxx in $dlist
  do
@@ -9,3 +9,13 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
+@@ -9125,8 +9125,7 @@
+ 
+ : determine where add-on public executable scripts go
+ case "$sitescript" in
+-'')	dflt=$siteprefix/script
+-	$test -d $dflt || dflt=$sitebin ;;
++'')	dflt=$sitebin ;;
+ *)  dflt="$sitescript" ;;
+ esac
+ fn=d~+
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index cf246d31a749..7e734344f0eb 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.8/files/patch-Configure b/lang/perl5.8/files/patch-Configure
new file mode 100644
index 000000000000..0d11eb985f1b
--- /dev/null
+++ b/lang/perl5.8/files/patch-Configure
@@ -0,0 +1,12 @@
+--- Configure.orig	2008-10-30 10:48:10.000000000 +0300
++++ Configure	2011-08-03 18:35:13.000000000 +0400
+@@ -8899,8 +8899,7 @@
+ 
+ : determine where add-on public executable scripts go
+ case "$sitescript" in
+-'')	dflt=$siteprefix/script
+-	$test -d $dflt || dflt=$sitebin ;;
++'')	dflt=$sitebin ;;
+ *)  dflt="$sitescript" ;;
+ esac
+ fn=d~+