aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Berezin <tobez@FreeBSD.org>2012-12-22 17:23:34 +0000
committerAnton Berezin <tobez@FreeBSD.org>2012-12-22 17:23:34 +0000
commite2eec3ca7b529c5d56ba45374623897074c06c4d (patch)
treed13835381f1cc8b8ebd9e3c6be791ecaba3dcfb6
parentccc1a2a946e92468e041f619557aa462d5a78db2 (diff)
downloadports-e2eec3ca7b529c5d56ba45374623897074c06c4d.tar.gz
ports-e2eec3ca7b529c5d56ba45374623897074c06c4d.zip
Notes
-rw-r--r--net/p5-Net-Pcap/Makefile8
-rw-r--r--net/p5-Net-Pcap/files/extra-patch-t__03-openlive.t14
2 files changed, 1 insertions, 21 deletions
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 50a6f18a677d..5573d6e76f74 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -19,10 +19,4 @@ PERL_CONFIGURE= yes
MAN1= pcapinfo.1
MAN3= Net::Pcap.3
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800000
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-t__03-openlive.t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/p5-Net-Pcap/files/extra-patch-t__03-openlive.t b/net/p5-Net-Pcap/files/extra-patch-t__03-openlive.t
deleted file mode 100644
index 05d5559e2f83..000000000000
--- a/net/p5-Net-Pcap/files/extra-patch-t__03-openlive.t
+++ /dev/null
@@ -1,14 +0,0 @@
---- t/03-openlive.t.orig 2007-12-22 10:46:39.000000000 -0900
-+++ t/03-openlive.t 2012-04-05 16:45:58.000000000 -0800
-@@ -64,8 +64,10 @@
- is( $@, '', "open_live()" );
- if($^O eq 'MSWin32' or $^O eq 'cygwin') {
- like( $err, '/^Error opening adapter:/', " - \$err must be set: $err" );
--} elsif($^O eq 'darwin' or $^O eq 'freebsd' or $^O eq 'openbsd') {
-+} elsif($^O eq 'darwin' or $^O eq 'openbsd') {
- like( $err, "/^(?:BIOCSETIF: )?$fakedev: Device not configured/", " - \$err must be set: $err" );
-+} elsif($^O eq 'freebsd') {
-+ is( $err, ''); # Since pcap 1.0.0 nonexisting gives empty string.
- } else {
- like( $err, '/^(?:bind|ioctl|SIOCGIFHWADDR): (?:No such device)/', " - \$err must be set: $err" );
- }