update to 1.0605

4 files changed, 65 insertions, 61 deletions

diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 3f9077112eb..b0931fc9c1c 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 1998/11/13 01:37:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.11 1998/11/30 02:50:34 explorer Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
-DISTNAME=		libnet-1.0505
-PKGNAME=		p5-Net-1.0505
+DISTNAME=		libnet-1.0605
+PKGNAME=		p5-Net-1.0605
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
diff --git a/net/p5-Net/files/md5 b/net/p5-Net/files/md5
index 33fd825e9b7..b9b2c89c10e 100644
--- a/net/p5-Net/files/md5
+++ b/net/p5-Net/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:11 agc Exp $
+$NetBSD: md5,v 1.3 1998/11/30 02:50:34 explorer Exp $
 
-MD5 (libnet-1.0505.tar.gz) = 0b049876c52dcfc1949e0309e5fb7af6
+MD5 (libnet-1.0605.tar.gz) = f6b176a5d57598492f10b36df5f7a291
diff --git a/net/p5-Net/patches/patch-aa b/net/p5-Net/patches/patch-aa
index c485847fed9..08e23232c2d 100644
--- a/net/p5-Net/patches/patch-aa
+++ b/net/p5-Net/patches/patch-aa
@@ -1,14 +1,21 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
-
---- Configure.orig	Thu Apr  3 10:16:13 1997
-+++ Configure	Thu Jun 26 20:13:51 1997
-@@ -206,18 +206,21 @@
+--- Configure.orig	Sun Nov 29 18:21:14 1998
++++ Configure	Sun Nov 29 18:31:58 1998
+@@ -195,18 +195,19 @@
  
  #---------------------------------------------------------------------------
  
 -if(!-f $config_pm && $have_old && !$opt_d)
 - {
 -  $msg = <<EDQ;
+-
+-Ah, I see you already have installed libnet before.
+-
+-Do you want to modify/update your configuration (y|n) ?
+-EDQ
+-
+- $opt_d = 1
+-	unless get_bool($msg,0);
+- }
 +#if(!-f $config_pm && $have_old && !$opt_d)
 +# {
 +#  $msg = <<EDQ;
@@ -21,21 +28,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
 +# $opt_d = 1
 +#	unless get_bool($msg,0);
 +# }
-+#
- 
--Ah, I see you already have installed libnet before.
--
--Do you want to modify/update your configuration (y|n) ?
--EDQ
--
-- $opt_d = 1
--	unless get_bool($msg,0);
-- }
 +$opt_d = 0;
  
  #---------------------------------------------------------------------------
  
-@@ -234,7 +237,8 @@
+@@ -223,7 +224,8 @@
  Do you want me to perform hostname lookups (y|n) ?
  EDQ
  
@@ -45,14 +42,14 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
  
  print <<EDQ unless $cfg{'test_exist'};
  
-@@ -249,71 +253,72 @@
+@@ -238,71 +240,71 @@
  
  #---------------------------------------------------------------------------
  
 -print <<EDQ;
 -
 -The following questions all require a list of host names, separated
--with spaces. If you do not have a host avaliable for any of the
+-with spaces. If you do not have a host available for any of the
 -services, then enter a single space, followed by <CR>. To accept the
 -default, hit <CR>
 -
@@ -60,26 +57,25 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
 +#print <<EDQ;
 +#
 +#The following questions all require a list of host names, separated
-+#with spaces. If you do not have a host avaliable for any of the
++#with spaces. If you do not have a host available for any of the
 +#services, then enter a single space, followed by <CR>. To accept the
 +#default, hit <CR>
 +#
 +#EDQ
  
- $msg = 'Enter a list of avaliable NNTP hosts :';
+ $msg = 'Enter a list of available NNTP hosts :';
  
 -$def = $oldcfg{'nntp_hosts'} ||
 -	[ default_hostname($ENV{NNTPSERVER},$ENV{NEWSHOST},'news') ];
 +#$def = $oldcfg{'nntp_hosts'} ||
 +#	[ default_hostname($ENV{NNTPSERVER},$ENV{NEWSHOST},'news') ];
-+
-+$cfg{'nntp_hosts'} = [ default_hostname($ENV{NNTPSERVER},$ENV{NEWSHOST},'news') ];
  
 -$cfg{'nntp_hosts'} = get_host_list($msg,$def);
++$cfg{'nntp_hosts'} = [ default_hostname($ENV{NNTPSERVER},$ENV{NEWSHOST},'news') ];
  
  #---------------------------------------------------------------------------
  
- $msg = 'Enter a list of avaliable SMTP hosts :';
+ $msg = 'Enter a list of available SMTP hosts :';
  
 -$def = $oldcfg{'smtp_hosts'} ||
 -	[ default_hostname(split(/:/,$ENV{SMTPHOSTS} || ""), 'mailhost') ];
@@ -91,7 +87,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
  
  #---------------------------------------------------------------------------
  
- $msg = 'Enter a list of avaliable POP3 hosts :';
+ $msg = 'Enter a list of available POP3 hosts :';
  
 -$def = $oldcfg{'pop3_hosts'} || [];
 +# $def = $oldcfg{'pop3_hosts'} || [];
@@ -101,17 +97,17 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
  
  #---------------------------------------------------------------------------
  
- $msg = 'Enter a list of avaliable SNPP hosts :';
+ $msg = 'Enter a list of available SNPP hosts :';
  
 -$def = $oldcfg{'snpp_hosts'} || [];
-+# $def = $oldcfg{'snpp_hosts'} || [];
++#$def = $oldcfg{'snpp_hosts'} || [];
  
 -$cfg{'snpp_hosts'} = get_host_list($msg,$def);
 +$cfg{'snpp_hosts'} = [];
  
  #---------------------------------------------------------------------------
  
- $msg = 'Enter a list of avaliable PH Hosts   :'  ;
+ $msg = 'Enter a list of available PH Hosts   :'  ;
  
 -$def = $oldcfg{'ph_hosts'} ||
 -	[ default_hostname('dirserv') ];
@@ -123,39 +119,39 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
  
  #---------------------------------------------------------------------------
  
- $msg = 'Enter a list of avaliable TIME Hosts   :'  ;
+ $msg = 'Enter a list of available TIME Hosts   :'  ;
  
 -$def = $oldcfg{'time_hosts'} || [];
-+# $def = $oldcfg{'time_hosts'} || [];
++#$def = $oldcfg{'time_hosts'} || [];
  
 -$cfg{'time_hosts'} = get_host_list($msg,$def);
 +$cfg{'time_hosts'} = [];
  
  #---------------------------------------------------------------------------
  
- $msg = 'Enter a list of avaliable DAYTIME Hosts   :'  ;
+ $msg = 'Enter a list of available DAYTIME Hosts   :'  ;
  
 -$def = $oldcfg{'daytime_hosts'} || $oldcfg{'time_hosts'};
-+# $def = $oldcfg{'daytime_hosts'} || $oldcfg{'time_hosts'};
++#$def = $oldcfg{'daytime_hosts'} || $oldcfg{'time_hosts'};
  
 -$cfg{'daytime_hosts'} = get_host_list($msg,$def);
 +$cfg{'daytime_hosts'} = [];
  
  #---------------------------------------------------------------------------
  
-@@ -329,9 +334,9 @@
+@@ -318,9 +320,9 @@
  FTP proxy hostname :
  EDQ
  
 -$def = $oldcfg{'ftp_firewall'} || $ENV{FTP_FIREWALL};
-+# $def = $oldcfg{'ftp_firewall'} || $ENV{FTP_FIREWALL};
++#$def = $oldcfg{'ftp_firewall'} || $ENV{FTP_FIREWALL};
  
 -$cfg{'ftp_firewall'} = get_hostname($msg,$def);
 +$cfg{'ftp_firewall'} = $ENV{FTP_FIREWALL};
  
  #---------------------------------------------------------------------------
  
-@@ -352,37 +357,36 @@
+@@ -341,37 +343,37 @@
  
  #---------------------------------------------------------------------------
  
@@ -181,35 +177,34 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:49 agc Exp $
  $msg = "\nShould all FTP connections via a firewall/proxy be passive (y|n) ?";
  
 -$def = $oldcfg{'ftp_ext_passive'} || 0;
--
--$cfg{'ftp_ext_passive'} = get_bool($msg,$def);
-+# $def = $oldcfg{'ftp_ext_passive'} || 0;
++#$def = $oldcfg{'ftp_ext_passive'} || 0;
  
+-$cfg{'ftp_ext_passive'} = get_bool($msg,$def);
 +$cfg{'ftp_ext_passive'} = 0;
  
+ 
 -$def = $oldcfg{'ftp_int_passive'} || 0;
-+# $def = $oldcfg{'ftp_int_passive'} || 0;
++#$def = $oldcfg{'ftp_int_passive'} || 0;
  
  $msg = "\nShould all other FTP connections be passive (y|n) ?";
  
 -$cfg{'ftp_int_passive'} = get_bool($msg,$def);
-+$cfg{'ftp_int_passive'} = 0;
++$cfg{'ftp_int_passive'} = 1;
  
  
  #---------------------------------------------------------------------------
  
--$def = $oldcfg{'inet_domain'} || $ENV{LOCALDOMAIN};
-+# $def = $oldcfg{'inet_domain'} || $ENV{LOCALDOMAIN};
+ $def = $oldcfg{'inet_domain'} || $ENV{LOCALDOMAIN};
  
 -$ans = Prompt("\nWhat is your local internet domain name :",$def);
-+# $ans = Prompt("\nWhat is your local internet domain name :",$def);
++#$ans = Prompt("\nWhat is your local internet domain name :",$def);
  
 -$cfg{'inet_domain'} = ($ans =~ /(\S+)/)[0];
 +$cfg{'inet_domain'} = "";
  
  #---------------------------------------------------------------------------
  
-@@ -398,7 +402,7 @@
+@@ -387,7 +389,7 @@
  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 29d8620bbaa..e9986777d10 100644
--- a/net/p5-Net/pkg/PLIST
+++ b/net/p5-Net/pkg/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/28 15:34:02 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/11/30 02:50:35 explorer Exp $
+lib/perl5/site_perl/FAQ.pod
 lib/perl5/site_perl/Net/Cmd.pm
-lib/perl5/site_perl/Net/Config.pm
 lib/perl5/site_perl/Net/Domain.pm
 lib/perl5/site_perl/Net/DummyInetd.pm
 lib/perl5/site_perl/Net/FTP.pm
+lib/perl5/site_perl/Net/FTP/A.pm
+lib/perl5/site_perl/Net/FTP/E.pm
+lib/perl5/site_perl/Net/FTP/I.pm
+lib/perl5/site_perl/Net/FTP/L.pm
+lib/perl5/site_perl/Net/FTP/dataconn.pm
 lib/perl5/site_perl/Net/NNTP.pm
 lib/perl5/site_perl/Net/Netrc.pm
 lib/perl5/site_perl/Net/PH.pm
@@ -11,17 +16,21 @@ lib/perl5/site_perl/Net/POP3.pm
 lib/perl5/site_perl/Net/SMTP.pm
 lib/perl5/site_perl/Net/SNPP.pm
 lib/perl5/site_perl/Net/Time.pm
-lib/perl5/man/man3/Net::Time.3.gz
-lib/perl5/man/man3/Net::DummyInetd.3.gz
-lib/perl5/man/man3/Net::NNTP.3.gz
-lib/perl5/man/man3/Net::SNPP.3.gz
-lib/perl5/man/man3/Net::POP3.3.gz
-lib/perl5/man/man3/Net::SMTP.3.gz
-lib/perl5/man/man3/Net::Domain.3.gz
-lib/perl5/man/man3/Net::FTP.3.gz
-lib/perl5/man/man3/Net::Netrc.3.gz
-lib/perl5/man/man3/Net::Cmd.3.gz
-lib/perl5/man/man3/Net::PH.3.gz
+lib/perl5/man/man3/FAQ.3
+lib/perl5/man/man3/Net::Time.3
+lib/perl5/man/man3/Net::DummyInetd.3
+lib/perl5/man/man3/Net::NNTP.3
+lib/perl5/man/man3/Net::SNPP.3
+lib/perl5/man/man3/Net::POP3.3
+lib/perl5/man/man3/Net::SMTP.3
+lib/perl5/man/man3/Net::Domain.3
+lib/perl5/man/man3/Net::FTP.3
+lib/perl5/man/man3/Net::Netrc.3
+lib/perl5/man/man3/Net::Cmd.3
+lib/perl5/man/man3/Net::PH.3
+lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/Net/Config.pm
 lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Net/.packlist
+@dirrm lib/perl5/site_perl/Net/FTP
 @dirrm lib/perl5/site_perl/Net
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/Net
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/Net