summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/p5-Net-Pcap/Makefile7
-rw-r--r--net/p5-Net-Pcap/distinfo6
-rw-r--r--net/p5-Net-Pcap/patches/patch-Makefile.PL11
-rw-r--r--net/p5-Net-Pcap/patches/patch-aa4
4 files changed, 22 insertions, 6 deletions
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index 0f6e674e303..312c25581a1 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/05/29 23:37:09 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2014/07/14 11:59:02 jperkin Exp $
#
DISTNAME= Net-Pcap-0.16
@@ -23,6 +23,11 @@ PERL5_PACKLIST= auto/Net/Pcap/.packlist
MAKE_PARAMS+= INC=-I${BUILDLINK_PREFIX.libpcap}/include
MAKE_PARAMS+= LIBS='-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib -lpcap'
+SUBST_CLASSES+= pcaplib
+SUBST_STAGE.pcaplib= pre-configure
+SUBST_FILES.pcaplib= Makefile.PL
+SUBST_SED.pcaplib= -e 's,@PCAP_LIBDIR@,${BUILDLINK_PREFIX.libpcap}/lib,'
+
.include "../../lang/perl5/module.mk"
.include "../../net/libpcap/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-Pcap/distinfo b/net/p5-Net-Pcap/distinfo
index 8fc7840c148..aa81d5b1bef 100644
--- a/net/p5-Net-Pcap/distinfo
+++ b/net/p5-Net-Pcap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2014/01/10 15:40:28 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2014/07/14 11:59:02 jperkin Exp $
SHA1 (Net-Pcap-0.16.tar.gz) = 19093760cce2830c16c1a081a7dc324cfe043c9b
RMD160 (Net-Pcap-0.16.tar.gz) = 12cb441018c37244f58b6647ab6047c4d7443449
Size (Net-Pcap-0.16.tar.gz) = 82023 bytes
-SHA1 (patch-Makefile.PL) = 2a6e58e17d68fc75f1a40dbe2155b3b08ad2878e
-SHA1 (patch-aa) = bbb5a5129b6f07f3ade687f2e1405d34726bdbb7
+SHA1 (patch-Makefile.PL) = a55a336e89cfda11880e66402230555f92ec2a8d
+SHA1 (patch-aa) = 29d763f589c8667eb1d9a2afc64dcfa576dd14dd
diff --git a/net/p5-Net-Pcap/patches/patch-Makefile.PL b/net/p5-Net-Pcap/patches/patch-Makefile.PL
index ab35765ada2..7caf8b2498b 100644
--- a/net/p5-Net-Pcap/patches/patch-Makefile.PL
+++ b/net/p5-Net-Pcap/patches/patch-Makefile.PL
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.PL,v 1.1 2014/01/10 15:40:28 jperkin Exp $
+$NetBSD: patch-Makefile.PL,v 1.2 2014/07/14 11:59:02 jperkin Exp $
Do not override CCFLAGS and LIBS.
@@ -15,3 +15,12 @@ Do not override CCFLAGS and LIBS.
}
for my $arg (@ARGV) {
+@@ -530,7 +530,7 @@ sub have_functions {
+ my @funcs = ();
+ print "detecting available functions... ";
+
+- my @paths = DynaLoader::dl_findfile(qw(-lpcap));
++ my @paths = DynaLoader::dl_findfile(qw(-L@PCAP_LIBDIR@ -lpcap));
+ my $libref = DynaLoader::dl_load_file($paths[0]);
+
+ for my $func (@_) {
diff --git a/net/p5-Net-Pcap/patches/patch-aa b/net/p5-Net-Pcap/patches/patch-aa
index 19c5942916e..fbbbadb0356 100644
--- a/net/p5-Net-Pcap/patches/patch-aa
+++ b/net/p5-Net-Pcap/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2008/08/24 20:07:42 he Exp $
+$NetBSD: patch-aa,v 1.2 2014/07/14 11:59:02 jperkin Exp $
+
+Handle *BSD.
--- t/03-openlive.t.orig 2007-12-22 20:46:39.000000000 +0100
+++ t/03-openlive.t