Attachment #42846 for bug #66714




#

PORTNAME=	WWW-Mechanize
PORTVERSION=	1.02
CATEGORIES=	www perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	WWW


PERL_CONFIGURE=	yes

MAN3=		WWW::Mechanize.3 WWW::Mechanize::Cookbook.3 \
		WWW::Mechanize::Examples.3 WWW::Mechanize::FAQ.3 \
		WWW::Mechanize::Link.3
MAN1=		mech-dump.1

.include <bsd.port.pre.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (WWW-Mechanize-0.72.tar.gz) = c53a8dd33de1c01bc08078096c72bf29	1	MD5 (WWW-Mechanize-1.02.tar.gz) = 81dba4c03fe003ce3f715e6432bdb1aa
2	SIZE (WWW-Mechanize-0.72.tar.gz) = 82958	2	SIZE (WWW-Mechanize-1.02.tar.gz) = 86219

Lines 1-5 Link Here

(-)pkg-plist (+1 lines)
1	bin/mech-dump	1	bin/mech-dump
2	%%SITE_PERL%%/WWW/Mechanize.pm	2	%%SITE_PERL%%/WWW/Mechanize.pm
		3	%%SITE_PERL%%/WWW/Mechanize/Cookbook.pod
3	%%SITE_PERL%%/WWW/Mechanize/Examples.pod	4	%%SITE_PERL%%/WWW/Mechanize/Examples.pod
4	%%SITE_PERL%%/WWW/Mechanize/FAQ.pod	5	%%SITE_PERL%%/WWW/Mechanize/FAQ.pod
5	%%SITE_PERL%%/WWW/Mechanize/Link.pm	6	%%SITE_PERL%%/WWW/Mechanize/Link.pm




--- Makefile.PL.orig	Sun Mar 28 06:06:04 2004
+++ Makefile.PL	Fri May 21 13:02:17 2004
@@ -1,4 +1,3 @@
-require 5.6.1;
 use ExtUtils::MakeMaker qw( WriteMakefile prompt );
 use ExtUtils::Command qw( touch rm_f );
 use File::Spec;
@@ -63,7 +62,7 @@
     clean           => { FILES => join( " ", FLAG_SKIPMECHDUMP, 'WWW-Mechanize-0*' ) },
-my $s = IO::Socket::INET->new(PeerAddr => "www.google.com:80",
-			      Timeout  => 10,
-			     );
-if ($s) {
-    close($s);
-    $skiplive = 0;
-} else {
-    print <<EOT;
-
-It seems that you are not directly connected to the Internet.  Some
-of the WWW::Mechanize tests interact with websites such as Google,
-in addition to its own internal tests.
-
-EOT
-
-    if ( prompt("Do you want to skip these tests?", "y") =~ /^y/i ) {
-	$skiplive = 1;
-    }
-} # failed connect
+my $skiplive = 1;
 
 my $tests = 't/*.t';
 $tests .= ' t/live/*.t' unless $skiplive;
@@ -53,17 +32,17 @@
     'test' => { TESTS => $tests },
 };
 
-if ( prompt( "Do you want to install the mech-dump utility?", "y" ) =~ /^y/i ) {
+if (1 or prompt( "Do you want to install the mech-dump utility?", "y" ) =~ /^y/i ) {
     $parms->{EXE_FILES} = [ 'bin/mech-dump' ];
     $parms->{PREREQ_PM}->{'Getopt::Long'} = 0;
     $parms->{PREREQ_PM}->{'Pod::Usage'} = 0;
 
-    local @ARGV = FLAG_SKIPMECHDUMP;
+    local @ARGV = (@ARGV, FLAG_SKIPMECHDUMP);
     rm_f();
-} else {
-    local @ARGV = FLAG_SKIPMECHDUMP;
-    touch();
-}
+#} else {
+#    local @ARGV = FLAG_SKIPMECHDUMP;
+#    touch();
+#}
 
 
 eval { require IO::Socket::SSL };

Return to bug 66714

Lines 6-12 Link Here

(-)Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= WWW-Mechanize	8	PORTNAME= WWW-Mechanize
9	PORTVERSION= 0.72	9	PORTVERSION= 1.02
10	CATEGORIES= www perl5	10	CATEGORIES= www perl5
11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
12	MASTER_SITE_SUBDIR= WWW	12	MASTER_SITE_SUBDIR= WWW
Lines 24-31 Link Here
24		24
25	PERL_CONFIGURE= yes	25	PERL_CONFIGURE= yes
26		26
27	MAN3= WWW::Mechanize.3 WWW::Mechanize::Examples.3 \	27	MAN3= WWW::Mechanize.3 WWW::Mechanize::Cookbook.3 \
28	WWW::Mechanize::FAQ.3 WWW::Mechanize::Link.3	28	WWW::Mechanize::Examples.3 WWW::Mechanize::FAQ.3 \
		29	WWW::Mechanize::Link.3
29	MAN1= mech-dump.1	30	MAN1= mech-dump.1
30		31
31	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>

Lines 1-56 Link Here

(-)files/patch-Makefile.PL (-51 / +11 lines)
1	--- Makefile.PL.orig Mon Aug 18 03:35:42 2003	1	--- Makefile.PL.orig Sun Mar 28 06:06:04 2004
2	+++ Makefile.PL Fri Oct 3 11:47:30 2003	2	+++ Makefile.PL Fri May 21 13:02:17 2004
3	@@ -5,28 +5,7 @@	3	@@ -1,4 +1,3 @@
4	use constant FLAG_SKIPMECHDUMP => "t/SKIP-MECH-FORMS";	4	-require 5.6.1;
5		5	use ExtUtils::MakeMaker qw( WriteMakefile prompt );
6	# Much logic stolen fromm libwww-perl's Makefile.PL	6	use ExtUtils::Command qw( touch rm_f );
7	-my $skiplive = 0;	7	use File::Spec;
8	-	8	@@ -63,7 +62,7 @@
9	-require IO::Socket;	9	clean => { FILES => join( " ", FLAG_SKIPMECHDUMP, 'WWW-Mechanize-0*' ) },
10	-my $s = IO::Socket::INET->new(PeerAddr => "www.google.com:80",
11	- Timeout => 10,
12	- );
13	-if ($s) {
14	- close($s);
15	- $skiplive = 0;
16	-} else {
17	- print <<EOT;
18	-
19	-It seems that you are not directly connected to the Internet. Some
20	-of the WWW::Mechanize tests interact with websites such as Google,
21	-in addition to its own internal tests.
22	-
23	-EOT
24	-
25	- if ( prompt("Do you want to skip these tests?", "y") =~ /^y/i ) {
26	- $skiplive = 1;
27	- }
28	-} # failed connect
29	+my $skiplive = 1;
30
31	my $tests = 't/*.t';
32	$tests .= ' t/live/*.t' unless $skiplive;
33	@@ -53,17 +32,17 @@
34	'test' => { TESTS => $tests },
35	};	10	};
36		11
37	-if ( prompt( "Do you want to install the mech-dump utility?", "y" ) =~ /^y/i ) {	12	-if ( prompt( "Do you want to install the mech-dump utility?", "y" ) =~ /^y/i ) {
38	+#if ( prompt( "Do you want to install the mech-dump utility?", "y" ) =~ /^y/i ) {	13	+if (1 or prompt( "Do you want to install the mech-dump utility?", "y" ) =~ /^y/i ) {
39	$parms->{EXE_FILES} = [ 'script/mech-dump' ];	14	$parms->{EXE_FILES} = [ 'bin/mech-dump' ];
40	$parms->{PREREQ_PM}->{'Getopt::Long'} = 0;	15	$parms->{PREREQ_PM}->{'Getopt::Long'} = 0;
41	$parms->{PREREQ_PM}->{'Pod::Usage'} = 0;	16	$parms->{PREREQ_PM}->{'Pod::Usage'} = 0;
42
43	- local @ARGV = FLAG_SKIPMECHDUMP;
44	+ local @ARGV = (@ARGV, FLAG_SKIPMECHDUMP);
45	rm_f();
46	-} else {
47	- local @ARGV = FLAG_SKIPMECHDUMP;
48	- touch();
49	-}
50	+#} else {
51	+# local @ARGV = FLAG_SKIPMECHDUMP;
52	+# touch();
53	+#}
54
55
56	eval { require IO::Socket::SSL };