diff options
| -rw-r--r-- | net/tcpdump/Makefile | 14 | ||||
| -rw-r--r-- | net/tcpdump/distinfo | 8 | ||||
| -rw-r--r-- | net/tcpdump/patches/patch-aa | 22 | ||||
| -rw-r--r-- | net/tcpdump/patches/patch-ab | 22 |
4 files changed, 58 insertions, 8 deletions
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index b53d20ed7ac..d0d7ef47310 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 18:19:44 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/13 15:50:35 seb Exp $ -DISTNAME= tcpdump-3.6.1 +DISTNAME= tcpdump-3.7.1 CATEGORIES= net MASTER_SITES= http://www.tcpdump.org/release/ @@ -8,11 +8,15 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.tcpdump.org/ COMMENT= network monitoring tool -DEPENDS+= libpcap>=0.6.1:../libpcap - ONLY_FOR_PLATFORM= SunOS-*-* # in NetBSD base system GNU_CONFIGURE= YES -USE_SSL= YES +USE_BUILDLINK_ONLY= YES + +.if exists(/usr/include/netinet/ip6.h) +CONFIGURE_ARGS+= --enable-ipv6 +.endif +.include "../../net/libpcap/buildlink.mk" +.include "../../security/openssl/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo index 86f6673d65e..37fcb919f92 100644 --- a/net/tcpdump/distinfo +++ b/net/tcpdump/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:35 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/02/13 15:50:35 seb Exp $ -SHA1 (tcpdump-3.6.1.tar.gz) = 3b0781fa3b4000d55f37a8c3acddcb4c52ec8c66 -Size (tcpdump-3.6.1.tar.gz) = 380465 bytes +SHA1 (tcpdump-3.7.1.tar.gz) = 325ce99f4bb66b29df9c93d58e028972bc9c6065 +Size (tcpdump-3.7.1.tar.gz) = 428737 bytes +SHA1 (patch-aa) = 7ccc4b926069df4fb36729f099cd442f019b83b4 +SHA1 (patch-ab) = 41d6949dea26b60393bc3b2fba0aa7b405393b24 diff --git a/net/tcpdump/patches/patch-aa b/net/tcpdump/patches/patch-aa new file mode 100644 index 00000000000..83a25a7918b --- /dev/null +++ b/net/tcpdump/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2002/02/13 15:50:36 seb Exp $ + +--- configure.in.orig Thu Jan 17 06:00:16 2002 ++++ configure.in +@@ -568,6 +568,8 @@ + + AC_VAR_H_ERRNO + ++# configure's patch is hand-trimmed after regen from patched configure.in ++ + AC_ARG_WITH(crypto, [ --without-crypto disable crypto support], + [], [ + AC_MSG_CHECKING(for SSLeay) +@@ -589,8 +591,6 @@ + done + AC_MSG_RESULT($ac_cv_ssleay_path) + if test "$ac_cv_ssleay_path" != no; then +- V_INCLS="$V_INCLS $incdir" +- LDFLAGS="-L$dir/lib $LDFLAGS" + if test -f $ac_cv_ssleay_path/lib/libRSAglue.a; then + LIBS="$LIBS -lRSAglue" + fi diff --git a/net/tcpdump/patches/patch-ab b/net/tcpdump/patches/patch-ab new file mode 100644 index 00000000000..9a980d1cc1e --- /dev/null +++ b/net/tcpdump/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2002/02/13 15:50:36 seb Exp $ + +--- configure.orig Wed Feb 13 12:30:44 2002 ++++ configure +@@ -4296,6 +4296,8 @@ + fi + + ++# configure's patch is hand-trimmed after regen from patched configure.in ++ + # Check whether --with-crypto or --without-crypto was given. + if test "${with_crypto+set}" = set; then + withval="$with_crypto" +@@ -4322,8 +4324,6 @@ + done + echo "$ac_t""$ac_cv_ssleay_path" 1>&6 + if test "$ac_cv_ssleay_path" != no; then +- V_INCLS="$V_INCLS $incdir" +- LDFLAGS="-L$dir/lib $LDFLAGS" + if test -f $ac_cv_ssleay_path/lib/libRSAglue.a; then + LIBS="$LIBS -lRSAglue" + fi |