From 9c0b38f44877f67bd758c6e1126cf0bc993485c0 Mon Sep 17 00:00:00 2001
From: avsm <avsm@openbsd.org>
Date: Wed, 30 Apr 2003 13:28:21 +0000
Subject: [PATCH] upgrade to p5-Net-Server-0.85, our local patches have been
 merged

---
 devel/p5-Net-Server/Makefile                          |  4 ++--
 devel/p5-Net-Server/distinfo                          |  6 +++---
 devel/p5-Net-Server/patches/patch-t_Server_BASE_t     | 11 -----------
 devel/p5-Net-Server/patches/patch-t_Server_Fork_t     | 11 -----------
 devel/p5-Net-Server/patches/patch-t_Server_INET_t     | 11 -----------
 .../p5-Net-Server/patches/patch-t_Server_MultiType_t  | 11 -----------
 .../patches/patch-t_Server_PreForkSimple_t            | 11 -----------
 devel/p5-Net-Server/patches/patch-t_Server_PreFork_t  | 11 -----------
 devel/p5-Net-Server/patches/patch-t_UDP_test_t        | 11 -----------
 devel/p5-Net-Server/patches/patch-t_UNIX_test_t       | 11 -----------
 10 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_Server_BASE_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_Server_Fork_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_Server_INET_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_Server_MultiType_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_Server_PreForkSimple_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_Server_PreFork_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_UDP_test_t
 delete mode 100644 devel/p5-Net-Server/patches/patch-t_UNIX_test_t

diff --git a/devel/p5-Net-Server/Makefile b/devel/p5-Net-Server/Makefile
index fc7cfe22465..5e520647cb9 100644
--- a/devel/p5-Net-Server/Makefile
+++ b/devel/p5-Net-Server/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2002/07/23 18:09:10 avsm Exp $
+# $OpenBSD: Makefile,v 1.6 2003/04/30 13:28:21 avsm Exp $
 
 COMMENT=	"extensible framework for Perl server engines"
 
-DISTNAME=	Net-Server-0.84
+DISTNAME=	Net-Server-0.85
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
diff --git a/devel/p5-Net-Server/distinfo b/devel/p5-Net-Server/distinfo
index bfcc95fb275..78beb9c112a 100644
--- a/devel/p5-Net-Server/distinfo
+++ b/devel/p5-Net-Server/distinfo
@@ -1,3 +1,3 @@
-MD5 (Net-Server-0.84.tar.gz) = a33ed11af871d8374390a9f849de8442
-RMD160 (Net-Server-0.84.tar.gz) = 1608fd14b03c5bcfefd5c6334f756be3c71d1bd7
-SHA1 (Net-Server-0.84.tar.gz) = dd84981823b78fdd6cb0c39bd7755aedae6c849d
+MD5 (Net-Server-0.85.tar.gz) = 5e56cf97ef7bafbdbe2ca0e66ef1da99
+RMD160 (Net-Server-0.85.tar.gz) = 49ed0f0aa54fee3a42ae4c78c3d1686598750272
+SHA1 (Net-Server-0.85.tar.gz) = 27202158006fd63db1e31bd390bbaa53fb324f27
diff --git a/devel/p5-Net-Server/patches/patch-t_Server_BASE_t b/devel/p5-Net-Server/patches/patch-t_Server_BASE_t
deleted file mode 100644
index 97ee350d8b2..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_Server_BASE_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_Server_BASE_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/Server_BASE.t.orig	Tue Jul 23 19:03:11 2002
-+++ t/Server_BASE.t	Tue Jul 23 19:03:38 2002
-@@ -39,6 +39,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_Server_Fork_t b/devel/p5-Net-Server/patches/patch-t_Server_Fork_t
deleted file mode 100644
index af7c4817902..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_Server_Fork_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_Server_Fork_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/Server_Fork.t.orig	Tue Jul 23 19:03:44 2002
-+++ t/Server_Fork.t	Tue Jul 23 19:03:56 2002
-@@ -57,6 +57,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_Server_INET_t b/devel/p5-Net-Server/patches/patch-t_Server_INET_t
deleted file mode 100644
index 157603c4c58..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_Server_INET_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_Server_INET_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/Server_INET.t.orig	Tue Jul 23 19:04:01 2002
-+++ t/Server_INET.t	Tue Jul 23 19:04:17 2002
-@@ -59,6 +59,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_Server_MultiType_t b/devel/p5-Net-Server/patches/patch-t_Server_MultiType_t
deleted file mode 100644
index c1f645425f0..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_Server_MultiType_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_Server_MultiType_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/Server_MultiType.t.orig	Tue Jul 23 19:04:23 2002
-+++ t/Server_MultiType.t	Tue Jul 23 19:04:35 2002
-@@ -61,6 +61,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_Server_PreForkSimple_t b/devel/p5-Net-Server/patches/patch-t_Server_PreForkSimple_t
deleted file mode 100644
index f0d93bb2a18..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_Server_PreForkSimple_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_Server_PreForkSimple_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/Server_PreForkSimple.t.orig	Tue Jul 23 19:05:08 2002
-+++ t/Server_PreForkSimple.t	Tue Jul 23 19:05:21 2002
-@@ -66,6 +66,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_Server_PreFork_t b/devel/p5-Net-Server/patches/patch-t_Server_PreFork_t
deleted file mode 100644
index ae1f7294ca7..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_Server_PreFork_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_Server_PreFork_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/Server_PreFork.t.orig	Tue Jul 23 19:04:42 2002
-+++ t/Server_PreFork.t	Tue Jul 23 19:04:58 2002
-@@ -65,6 +65,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_UDP_test_t b/devel/p5-Net-Server/patches/patch-t_UDP_test_t
deleted file mode 100644
index 8e693a7b38d..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_UDP_test_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_UDP_test_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/UDP_test.t.orig	Tue Jul 23 19:06:43 2002
-+++ t/UDP_test.t	Tue Jul 23 19:06:58 2002
-@@ -61,6 +61,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;
diff --git a/devel/p5-Net-Server/patches/patch-t_UNIX_test_t b/devel/p5-Net-Server/patches/patch-t_UNIX_test_t
deleted file mode 100644
index 5464d9a8f8f..00000000000
--- a/devel/p5-Net-Server/patches/patch-t_UNIX_test_t
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-t_UNIX_test_t,v 1.1 2002/07/23 18:09:10 avsm Exp $
---- t/UNIX_test.t.orig	Tue Jul 23 19:06:11 2002
-+++ t/UNIX_test.t	Tue Jul 23 19:06:22 2002
-@@ -65,6 +65,7 @@ my @ports      = ();
- for my $i (0..99){
-   my $sock = IO::Socket::INET->new(PeerAddr => 'localhost',
- 				   PeerPort => ($start_port + $i),
-+				   Timeout  => 2,
- 				   Proto    => 'tcp');
-   push @ports, ($start_port + $i) if ! defined $sock;
-   last if $num_ports == @ports;