Update to 5.2.1. The old distfile is a symlink to this now.

I don't know what changed.

I removed the patches. They did not apply and they files are gone
or context is changed.

Now depend on libpcap via buildlink3.mk. I think the patches
I removed were for a provided version of libpcap.

Use INSTALLATION_DIRS for share/examples/trafshow instead of
INSTALL_DATA_DIR.

Note that the /etc/trafshow is hard-coded. I didn't patch this.

6 files changed, 9 insertions, 75 deletions

diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index bc530d59999..7e301dc8029 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2005/06/17 03:50:28 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/10/11 16:39:29 reed Exp $
 
-DISTNAME=	trafshow-4.0
-PKGREVISION=	1
+DISTNAME=	trafshow-5.2.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.nsk.su/pub/RinetSoftware/
 EXTRACT_SUFX=	.tgz
@@ -21,14 +20,14 @@ BUILD_DEFS+=	USE_INET6
 CPPFLAGS+=	-DINET6
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/trafshow
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/trafshow
+	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/.trafshow \
 		${PREFIX}/share/examples/trafshow/trafshow
 
+.include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/trafshow/distinfo b/net/trafshow/distinfo
index eff19426f6b..1f6a4532ef0 100644
--- a/net/trafshow/distinfo
+++ b/net/trafshow/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:06 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/10/11 16:39:29 reed Exp $
 
-SHA1 (trafshow-4.0.tgz) = 131cd2f9bafa43ad2a344129c190d18530e371c3
-RMD160 (trafshow-4.0.tgz) = c2ab4c197860447eb561e80edef4b712bfbc1fb7
-Size (trafshow-4.0.tgz) = 76376 bytes
+SHA1 (trafshow-5.2.1.tgz) = c1f31c308fd08d301501a4819b4769aefd243c34
+RMD160 (trafshow-5.2.1.tgz) = ac744d8a837e3b1462df37d145a5c271fcf36671
+Size (trafshow-5.2.1.tgz) = 123770 bytes
 SHA1 (patch-aa) = b148e50d762a0b914658788ce484eacf929e0e10
 SHA1 (patch-af) = 82a3a7906d28465ec83724946b360508e59b655c
 SHA1 (patch-ag) = 981a63f03cce85b2f295901b7ea1e7930b859cf1
diff --git a/net/trafshow/patches/patch-aa b/net/trafshow/patches/patch-aa
deleted file mode 100644
index 5502fece78f..00000000000
--- a/net/trafshow/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/05/11 10:21:29 zuntum Exp $
-
---- interfaces.c.orig	Sat Aug 22 10:19:03 1998
-+++ interfaces.c
-@@ -209,6 +209,9 @@
- 	{	if_slip,	DLT_SLIP_BSDOS	}, /* libpcap stupid fake */
- #endif
- 	{	if_ppp,		DLT_PPP		},	/* PPP */
-+#ifdef	DLT_PPP_SERIAL
-+	{	if_ppp,		DLT_PPP_SERIAL	},	/* PPP */
-+#endif
- #ifdef	DLT_PPP_BSDOS
- 	{	if_ppp,		DLT_PPP_BSDOS	}, /* libpcap stupid fake */
- #endif
diff --git a/net/trafshow/patches/patch-af b/net/trafshow/patches/patch-af
deleted file mode 100644
index c1fc30e375f..00000000000
--- a/net/trafshow/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/08/11 05:42:18 itojun Exp $
-
---- Makefile.in.orig	Mon Aug 24 13:54:16 1998
-+++ Makefile.in	Tue May  2 00:51:47 2000
-@@ -28,8 +28,8 @@
- 
- PROG = trafshow
- CC = @CC@
--CCOPT = @V_CCOPT@
--INCLS = -I. @V_INCLS@
-+CCOPT = @CFLAGS@
-+INCLS = -I. @CPPFLAGS@
- DEFS = @DEFS@
- 
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
diff --git a/net/trafshow/patches/patch-ag b/net/trafshow/patches/patch-ag
deleted file mode 100644
index b63852bb6f1..00000000000
--- a/net/trafshow/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/08/11 05:42:44 itojun Exp $
-
---- configure.in-	Fri Aug 11 14:24:26 2000
-+++ configure.in	Fri Aug 11 14:24:34 2000
-@@ -107,2 +107,8 @@
- 
-+netbsd*)
-+	AC_DEFINE(HAVE_RTF_LLINFO)
-+	;;
-+openbsd*)
-+	AC_DEFINE(HAVE_RTF_LLINFO)
-+	;;
- freebsd*)
diff --git a/net/trafshow/patches/patch-ah b/net/trafshow/patches/patch-ah
deleted file mode 100644
index 714d91a3c48..00000000000
--- a/net/trafshow/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/10/02 19:20:41 dillo Exp $
-
---- configure.orig	Wed Oct  2 21:15:39 2002
-+++ configure
-@@ -2554,6 +2629,18 @@ echo "$ac_t""$V_PCAPVER" 1>&6
- V_GROUP=0
- case "$target_os" in
- 
-+netbsd*)
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_RTF_LLINFO 1
-+EOF
-+
-+	;;
-+openbsd*)
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_RTF_LLINFO 1
-+EOF
-+
-+	;;
- freebsd*)
- 	cat >> confdefs.h <<\EOF
- #define HAVE_RTF_LLINFO 1