From d7466f5b42c223067af0be0c9576dabd3dd57707 Mon Sep 17 00:00:00 2001
From: shell <shell@openbsd.org>
Date: Wed, 26 Dec 2001 14:39:21 +0000
Subject: [PATCH] Upgrade to 1.09, ok'ed by espie@ - Add HOMEPAGE - Add patch
 for avoid interactive test - use distinfo - fixes DESCR

---
 net/p5-libnet/Makefile                |  20 +--
 net/p5-libnet/distinfo                |   3 +
 net/p5-libnet/files/md5               |   3 -
 net/p5-libnet/patches/patch-Configure | 201 ++++++++++++++++++++++++++
 net/p5-libnet/pkg/DESCR               |   2 +-
 net/p5-libnet/pkg/PLIST               |  11 +-
 6 files changed, 212 insertions(+), 28 deletions(-)
 create mode 100644 net/p5-libnet/distinfo
 delete mode 100644 net/p5-libnet/files/md5
 create mode 100644 net/p5-libnet/patches/patch-Configure

diff --git a/net/p5-libnet/Makefile b/net/p5-libnet/Makefile
index af5d38f60ff..48ff96eded3 100644
--- a/net/p5-libnet/Makefile
+++ b/net/p5-libnet/Makefile
@@ -1,16 +1,18 @@
-#   $OpenBSD: Makefile,v 1.7 2001/05/06 05:00:19 lebel Exp $
+#   $OpenBSD: Makefile,v 1.8 2001/12/26 14:39:21 shell Exp $
 
 COMMENT=	"modules for net-based applications"
 
-DISTNAME=	libnet-1.0703
-PKGNAME=	p5-libnet-1.0703
+DISTNAME=	libnet-1.09
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	net perl5
-NEED_VERSION=	1.402
+NEED_VERSION=	1.502
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR= Net
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
+HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/libnet/Net/libnetFAQ.html
+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -18,14 +20,4 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE= perl
 
-pre-configure:
-	@cd ${WRKSRC} && perl ./Configure -d
-
-post-build:
-	@cd ${WRKSRC} && sed -e 1s,/usr/local/bin/perl,/usr/bin/perl, \
-		< Configure > configure-libnet
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/configure-libnet ${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/net/p5-libnet/distinfo b/net/p5-libnet/distinfo
new file mode 100644
index 00000000000..7c27e5764fb
--- /dev/null
+++ b/net/p5-libnet/distinfo
@@ -0,0 +1,3 @@
+MD5 (libnet-1.09.tar.gz) = 5311081fdafcea0fa070ca79ae77b6ac
+RMD160 (libnet-1.09.tar.gz) = d61008725f36512fec618a786aa8691bfbe62051
+SHA1 (libnet-1.09.tar.gz) = 09fb95b5ee1ba50044937fa5ffd060a38a2ae06a
diff --git a/net/p5-libnet/files/md5 b/net/p5-libnet/files/md5
deleted file mode 100644
index 695f77a74f4..00000000000
--- a/net/p5-libnet/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libnet-1.0703.tar.gz) = 78dc0672a735756ec3c2bba15498cfa0
-RMD160 (libnet-1.0703.tar.gz) = 92e1ba8fb50e101bc8c4be21e7275b582daf059c
-SHA1 (libnet-1.0703.tar.gz) = ec1fe8058105f230ee89738b1fdc7443e458d971
diff --git a/net/p5-libnet/patches/patch-Configure b/net/p5-libnet/patches/patch-Configure
new file mode 100644
index 00000000000..83154486fd4
--- /dev/null
+++ b/net/p5-libnet/patches/patch-Configure
@@ -0,0 +1,201 @@
+$OpenBSD: patch-Configure,v 1.1 2001/12/26 14:39:21 shell Exp $
+
+--- Configure.orig	Thu Mar 22 06:15:29 2001
++++ Configure	Sat Dec 22 17:03:11 2001
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/env perl
+ #
+ # $Id: patch-Configure,v 1.1 2001/12/26 14:39:21 shell Exp $
+ 
+@@ -258,18 +258,19 @@
+ 
+ #---------------------------------------------------------------------------
+ 
+-if($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($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);
++# }
++$opt_d = 0;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -286,7 +287,7 @@
+ Do you want me to perform hostname lookups (y|n) ?
+ EDQ
+ 
+-$cfg{'test_exist'} = get_bool($msg, $oldcfg{'test_exist'});
++$cfg{'test_exist'} = 1;
+ 
+ print <<EDQ unless $cfg{'test_exist'};
+ 
+@@ -301,21 +302,21 @@
+ 
+ #---------------------------------------------------------------------------
+ 
+-print <<EDQ;
+-
+-The following questions all require a list of host names, separated
+-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
++# print <<EDQ;
++# 
++# The following questions all require a list of host names, separated
++# 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 available NNTP hosts :';
+ 
+ $def = $oldcfg{'nntp_hosts'} ||
+ 	[ default_hostname($ENV{NNTPSERVER},$ENV{NEWSHOST},'news') ];
+ 
+-$cfg{'nntp_hosts'} = get_host_list($msg,$def);
++$cfg{'nntp_hosts'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -324,7 +325,7 @@
+ $def = $oldcfg{'smtp_hosts'} ||
+ 	[ default_hostname(split(/:/,$ENV{SMTPHOSTS} || ""), 'mailhost') ];
+ 
+-$cfg{'smtp_hosts'} = get_host_list($msg,$def);
++$cfg{'smtp_hosts'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -332,7 +333,7 @@
+ 
+ $def = $oldcfg{'pop3_hosts'} || [];
+ 
+-$cfg{'pop3_hosts'} = get_host_list($msg,$def);
++$cfg{'pop3_hosts'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -340,7 +341,7 @@
+ 
+ $def = $oldcfg{'snpp_hosts'} || [];
+ 
+-$cfg{'snpp_hosts'} = get_host_list($msg,$def);
++$cfg{'snpp_hosts'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -349,7 +350,7 @@
+ $def = $oldcfg{'ph_hosts'} ||
+ 	[ default_hostname('dirserv') ];
+ 
+-$cfg{'ph_hosts'}   =  get_host_list($msg,$def);
++$cfg{'ph_hosts'}   =  $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -357,7 +358,7 @@
+ 
+ $def = $oldcfg{'time_hosts'} || [];
+ 
+-$cfg{'time_hosts'} = get_host_list($msg,$def);
++$cfg{'time_hosts'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -365,7 +366,7 @@
+ 
+ $def = $oldcfg{'daytime_hosts'} || $oldcfg{'time_hosts'};
+ 
+-$cfg{'daytime_hosts'} = get_host_list($msg,$def);
++$cfg{'daytime_hosts'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -378,7 +379,8 @@
+ (y|n) ?
+ EDQ
+ 
+-if(get_bool($msg,0)) {
++# XXX Should probably honor USE_SOCKS? --mjl
++if(0 && get_bool($msg,0)) {
+ 
+   $msg = <<'EDQ';
+ What series of FTP commands do you need to send to your
+@@ -489,15 +491,15 @@
+ 
+ #---------------------------------------------------------------------------
+ 
+-print <<EDQ;
+-
+-Normally when FTP needs a data connection the client tells the server
+-a port to connect to, and the server initiates a connection to the client.
+-
+-Some setups, in particular firewall setups, can/do not work using this
+-protocol. In these situations the client must make the connection to the
+-server, this is called a passive transfer.
+-EDQ
++# print <<EDQ;
++# 
++# Normally when FTP needs a data connection the client tells the server
++# a port to connect to, and the server initiates a connection to the client.
++# 
++# Some setups, in particular firewall setups, can/do not work using this
++# protocol. In these situations the client must make the connection to the
++# server, this is called a passive transfer.
++# EDQ
+ 
+ if (defined $cfg{'ftp_firewall'}) {
+   $msg = "\nShould all FTP connections via a firewall/proxy be passive (y|n) ?";
+@@ -515,16 +517,16 @@
+ 
+ $def = $oldcfg{'ftp_int_passive'} || 0;
+ 
+-$cfg{'ftp_int_passive'} = get_bool($msg,$def);
++$cfg{'ftp_int_passive'} = 0;
+ 
+ 
+ #---------------------------------------------------------------------------
+ 
+-$def = $oldcfg{'inet_domain'} || $ENV{LOCALDOMAIN};
++$def = $oldcfg{'inet_domain'} || $ENV{DOMAIN_NAME};
+ 
+-$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'} = $def;
+ 
+ #---------------------------------------------------------------------------
+ 
+@@ -540,7 +542,7 @@
+ Do you want me to run these tests (y|n) ?
+ EDQ
+ 
+-$cfg{'test_hosts'} = get_bool($msg,$oldcfg{'test_hosts'});
++$cfg{'test_hosts'} = 0;
+ 
+ #---------------------------------------------------------------------------
+ 
diff --git a/net/p5-libnet/pkg/DESCR b/net/p5-libnet/pkg/DESCR
index 08f7d72b595..07a8eee7eda 100644
--- a/net/p5-libnet/pkg/DESCR
+++ b/net/p5-libnet/pkg/DESCR
@@ -6,5 +6,5 @@ Net::Time	RFC867		Daytime Protocol
 Net::Time	RFC868		Time Protocol
 Net::NNTP	RFC977		Network News Transfer Protocol
 Net::POP3	RFC1939		Post Office Protocol 3
-Net::SNPP	RFC1861		Simple Network Pager Protocol
 
+WWW: ${HOMEPAGE}
diff --git a/net/p5-libnet/pkg/PLIST b/net/p5-libnet/pkg/PLIST
index 15a7504d6fc..d0539103673 100644
--- a/net/p5-libnet/pkg/PLIST
+++ b/net/p5-libnet/pkg/PLIST
@@ -1,9 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/01/08 23:51:42 danh Exp $
-bin/configure-libnet
+@comment $OpenBSD: PLIST,v 1.6 2001/12/26 14:39:21 shell Exp $
 libdata/perl5/site_perl/Net/Cmd.pm
 libdata/perl5/site_perl/Net/Config.pm
 libdata/perl5/site_perl/Net/Domain.pm
-libdata/perl5/site_perl/Net/DummyInetd.pm
 libdata/perl5/site_perl/Net/FTP.pm
 libdata/perl5/site_perl/Net/FTP/A.pm
 libdata/perl5/site_perl/Net/FTP/E.pm
@@ -12,25 +10,18 @@ libdata/perl5/site_perl/Net/FTP/L.pm
 libdata/perl5/site_perl/Net/FTP/dataconn.pm
 libdata/perl5/site_perl/Net/NNTP.pm
 libdata/perl5/site_perl/Net/Netrc.pm
-libdata/perl5/site_perl/Net/PH.pm
 libdata/perl5/site_perl/Net/POP3.pm
 libdata/perl5/site_perl/Net/SMTP.pm
-libdata/perl5/site_perl/Net/SNPP.pm
 libdata/perl5/site_perl/Net/Time.pm
-@comment no checksum
 libdata/perl5/site_perl/Net/libnet.cfg
-@exec echo "Finish configuring p5-libnet by using 'configure-libnet -o %D/%F'"
 libdata/perl5/site_perl/Net/libnetFAQ.pod
 man/man3/Net::Cmd.3p
 man/man3/Net::Domain.3p
-man/man3/Net::DummyInetd.3p
 man/man3/Net::FTP.3p
 man/man3/Net::NNTP.3p
 man/man3/Net::Netrc.3p
-man/man3/Net::PH.3p
 man/man3/Net::POP3.3p
 man/man3/Net::SMTP.3p
-man/man3/Net::SNPP.3p
 man/man3/Net::Time.3p
 man/man3/Net::libnetFAQ.3p
 @dirrm libdata/perl5/site_perl/Net/FTP