1. Merge from src/contrib/perl5/lib/ExtUtils/Attic/Install.pm rev. 1.2:

	  Force installs. This is to allow (semi-)automatic garbage removal by
      "find /usr/libdata -ctime -N -delete".

Well - substitute /usr/libdata with /usr/local/lib/perl5 here.

Requested by:	sheldonh

2. Do not link with libbind even if Configure detects it.  A particular
reason for that is that perl's getpw* stop working with NIS.

Reported by:	Russell Cattelan <cattelan@thebarn.com>

21 files changed, 98 insertions, 42 deletions

diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.10/files/patch-Install.pm b/lang/perl5.10/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5.10/files/patch-Install.pm
+++ b/lang/perl5.10/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5.10/files/patch-ac b/lang/perl5.10/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5.10/files/patch-ac
+++ b/lang/perl5.10/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.12/files/patch-Install.pm b/lang/perl5.12/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5.12/files/patch-Install.pm
+++ b/lang/perl5.12/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5.12/files/patch-ac b/lang/perl5.12/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5.12/files/patch-ac
+++ b/lang/perl5.12/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.14/files/patch-Install.pm b/lang/perl5.14/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5.14/files/patch-Install.pm
+++ b/lang/perl5.14/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5.14/files/patch-ac b/lang/perl5.14/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5.14/files/patch-ac
+++ b/lang/perl5.14/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.16/files/patch-Install.pm b/lang/perl5.16/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5.16/files/patch-Install.pm
+++ b/lang/perl5.16/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5.16/files/patch-ac b/lang/perl5.16/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5.16/files/patch-ac
+++ b/lang/perl5.16/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.6/files/patch-Install.pm b/lang/perl5.6/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5.6/files/patch-Install.pm
+++ b/lang/perl5.6/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5.6/files/patch-ac b/lang/perl5.6/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5.6/files/patch-ac
+++ b/lang/perl5.6/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5.8/files/patch-Install.pm b/lang/perl5.8/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5.8/files/patch-Install.pm
+++ b/lang/perl5.8/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5.8/files/patch-ac b/lang/perl5.8/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5.8/files/patch-ac
+++ b/lang/perl5.8/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 21ac952..064357a 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/lang/perl5/files/patch-Install.pm b/lang/perl5/files/patch-Install.pm
index 06bef47..fbadbd1 100644
--- a/lang/perl5/files/patch-Install.pm
+++ b/lang/perl5/files/patch-Install.pm
@@ -1,7 +1,14 @@
-$FreeBSD$
-
---- lib/ExtUtils/Install.pm.orig	Sun Jun 16 13:36:29 2002
-+++ lib/ExtUtils/Install.pm	Sun Jun 16 13:36:50 2002
+--- lib/ExtUtils/Install.pm.orig	Fri Feb 23 03:57:55 2001
++++ lib/ExtUtils/Install.pm	Wed Jul 10 17:57:13 2002
+@@ -132,7 +132,7 @@
+ 		$diff++;
+ 	    }
+ 
+-	    if ($diff){
++	    if ($diff||1){
+ 		if (-f $targetfile){
+ 		    forceunlink($targetfile) unless $nonono;
+ 		} else {
 @@ -156,7 +156,7 @@
  	    } else {
  		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
diff --git a/lang/perl5/files/patch-ac b/lang/perl5/files/patch-ac
index 3a0c075..c9cfeb9 100644
--- a/lang/perl5/files/patch-ac
+++ b/lang/perl5/files/patch-ac
@@ -2,7 +2,7 @@ $FreeBSD$
 
 --- hints/freebsd.sh.orig	Sun Apr  8 06:09:16 2001
 +++ hints/freebsd.sh	Sat Jun  1 23:41:18 2002
-@@ -85,10 +85,16 @@
+@@ -85,10 +85,17 @@
  	d_setreuid='define'
  	d_setegid='undef'
  	d_seteuid='undef'
@@ -11,6 +11,7 @@ $FreeBSD$
  *)	usevfork='true'
  	usemymalloc='n'
  	libswanted=`echo $libswanted | sed 's/ malloc / /'`
++ 	libswanted=`echo $libswanted | sed 's/ bind / /'`
 +	d_setregid='define'
 +	d_setreuid='define'
 +	d_setegid='undef'