upgrade to 1.0607

4 files changed, 40 insertions, 33 deletions

diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 1316ca4d5a16..3459a719a77f 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       libnet-1.0606
-PKGNAME=        p5-Net-1.0606
+DISTNAME=       libnet-1.0607
+PKGNAME=        p5-Net-1.0607
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net/distinfo b/net/p5-Net/distinfo
index 1df67064f3a8..f61926e73441 100644
--- a/net/p5-Net/distinfo
+++ b/net/p5-Net/distinfo
@@ -1 +1 @@
-MD5 (libnet-1.0606.tar.gz) = a1abd4ccf2cf5c85cc518c4867d304e7
+MD5 (libnet-1.0607.tar.gz) = bce57ec6d44f711f6b6fd229efba457f
diff --git a/net/p5-Net/files/patch-aa b/net/p5-Net/files/patch-aa
index de7f54aeba5c..34e8059403c8 100644
--- a/net/p5-Net/files/patch-aa
+++ b/net/p5-Net/files/patch-aa
@@ -1,10 +1,16 @@
---- Configure.orig	Wed Nov  5 11:27:54 1997
-+++ Configure	Sun Apr 26 10:35:56 1998
-@@ -195,18 +195,19 @@
+--- Configure.orig	Sat Sep 18 19:28:55 1999
++++ Configure	Sat Jan  8 02:06:32 2000
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # $Id: Configure,v 1.8 1997/03/04 09:22:32 gbarr Exp $
+ 
+@@ -241,18 +241,19 @@
  
  #---------------------------------------------------------------------------
  
--if(!-f $config_pm && $have_old && !$opt_d)
+-if($have_old && !$opt_d)
 - {
 -  $msg = <<EDQ;
 -
@@ -16,7 +22,7 @@
 - $opt_d = 1
 -	unless get_bool($msg,0);
 - }
-+#if(!-f $config_pm && $have_old && !$opt_d)
++#if($have_old && !$opt_d)
 +# {
 +#  $msg = <<EDQ;
 +#
@@ -26,13 +32,13 @@
 +#EDQ
 +#
 +# $opt_d = 1
-+#	unless get_bool($msg,0);
++#        unless get_bool($msg,0);
 +# }
 +$opt_d = 0;
  
  #---------------------------------------------------------------------------
  
-@@ -223,7 +224,8 @@
+@@ -269,7 +270,8 @@
  Do you want me to perform hostname lookups (y|n) ?
  EDQ
  
@@ -42,7 +48,7 @@
  
  print <<EDQ unless $cfg{'test_exist'};
  
-@@ -238,71 +240,78 @@
+@@ -284,71 +286,78 @@
  
  #---------------------------------------------------------------------------
  
@@ -146,7 +152,7 @@
  
  #---------------------------------------------------------------------------
  
-@@ -318,9 +327,10 @@
+@@ -364,9 +373,10 @@
  FTP proxy hostname :
  EDQ
  
@@ -159,7 +165,7 @@
  
  #---------------------------------------------------------------------------
  
-@@ -341,37 +351,39 @@
+@@ -414,37 +424,39 @@
  
  #---------------------------------------------------------------------------
  
@@ -215,7 +221,7 @@
  
  #---------------------------------------------------------------------------
  
-@@ -387,7 +399,8 @@
+@@ -460,7 +472,8 @@
  Do you want me to run these tests (y|n) ?
  EDQ
  
diff --git a/net/p5-Net/pkg-plist b/net/p5-Net/pkg-plist
index f21134d77951..8228a29fd012 100644
--- a/net/p5-Net/pkg-plist
+++ b/net/p5-Net/pkg-plist
@@ -1,21 +1,22 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Cmd.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Domain.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/DummyInetd.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/NNTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Netrc.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/PH.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/POP3.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SMTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SNPP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Time.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP/A.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP/E.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP/I.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP/L.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP/dataconn.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Config.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Cmd.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Config.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Domain.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/DummyInetd.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/FTP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/FTP/A.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/FTP/E.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/FTP/I.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/FTP/L.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/FTP/dataconn.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/NNTP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Netrc.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/PH.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/POP3.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/SMTP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/SNPP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/Time.pm
+lib/perl5/site_perl/%%PERL_VER%%/Net/libnet.cfg
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/FTP
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net