summaryrefslogtreecommitdiff
path: root/net/ngrep
diff options
context:
space:
mode:
authorwiz <wiz>2001-09-14 23:05:42 +0000
committerwiz <wiz>2001-09-14 23:05:42 +0000
commit7496512abfb3e50473fb3ef0721988ee1e63ff92 (patch)
treecb9b9f7c99270a0e3fecd8c4002338d059cbd8f9 /net/ngrep
parent3f44db1e33c643a3a63fac8d3527311a28bb235e (diff)
downloadpkgsrc-7496512abfb3e50473fb3ef0721988ee1e63ff92.tar.gz
Use libpcap buildlink.mk. pkg/13919 by Stoned Elipot.
Diffstat (limited to 'net/ngrep')
-rw-r--r--net/ngrep/Makefile7
-rw-r--r--net/ngrep/distinfo4
-rw-r--r--net/ngrep/patches/patch-aa23
3 files changed, 27 insertions, 7 deletions
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index eb33da5e0de..8b9805b18d0 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/24 11:43:47 abs Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/14 23:05:42 wiz Exp $
#
DISTNAME= ngrep-1.39
@@ -11,16 +11,17 @@ COMMENT= network grep
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-pcre
+# ngrep's configure use --includedir/$includedir in a weird way!
+CONFIGURE_ARGS+=--includedir=${BUILDLINK_DIR}/include
WRKSRC= ${WRKDIR}/ngrep
ALL_TARGET= ngrep
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-DEPENDS+= libpcap>=0.4:../../net/libpcap
-
do-configure:
cd ${WRKSRC}; ./configure --prefix=${PREFIX}
.endif
+.include "../../net/libpcap/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ngrep/distinfo b/net/ngrep/distinfo
index 09785fc9ec2..50c0a0477b1 100644
--- a/net/ngrep/distinfo
+++ b/net/ngrep/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/09/14 23:05:42 wiz Exp $
SHA1 (ngrep-1.39.tar.gz) = 705851cdef6e535cebf397b27f78ff3112e62824
Size (ngrep-1.39.tar.gz) = 676694 bytes
-SHA1 (patch-aa) = ddc309b1e1c9e03d36037e81627adabd3bd28bd8
+SHA1 (patch-aa) = b45836431187c112083841a5c714bb5ba1482181
diff --git a/net/ngrep/patches/patch-aa b/net/ngrep/patches/patch-aa
index da748b4fde2..b8b5601c2a4 100644
--- a/net/ngrep/patches/patch-aa
+++ b/net/ngrep/patches/patch-aa
@@ -1,8 +1,27 @@
-$NetBSD: patch-aa,v 1.3 2001/03/05 14:39:09 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2001/09/14 23:05:43 wiz Exp $
--- configure.orig Tue Feb 27 07:08:56 2001
+++ configure
-@@ -1835,7 +1835,12 @@
+@@ -1551,16 +1551,8 @@
+ for dir in $possible_dirs ; do
+ if test -d $dir -a -r "$dir/pcap.h" -a \
+ -r "$dir/net/bpf.h" ; then
+- if test -n "$pcap_dir" -a "$pcap_dir" != "$dir"; then
+- echo
+- echo; echo more than one set found in:
+- echo $pcap_dir
+- echo $dir
+- echo; echo please wipe out all unused pcap installations
+- exit
+- else
+- pcap_dir="$dir"
+- fi
++ pcap_dir="$dir"
++ break
+ fi
+ done
+
+@@ -1835,7 +1827,12 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"