From a3358c96a5d9c3ff155070a0d1b777e81c65ac6a Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Wed, 6 Feb 2013 20:32:16 +0000
Subject: Avoid socket buffering on Solaris, a blank screen is not all that
 useful.

Bump PKGREVISION.
---
 net/trafshow/Makefile                 |  4 ++--
 net/trafshow/distinfo                 |  3 ++-
 net/trafshow/patches/patch-trafshow.c | 36 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 net/trafshow/patches/patch-trafshow.c

diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index aac62bbba82..1c356725264 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2013/02/06 19:31:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2013/02/06 20:32:16 jperkin Exp $
 
 DISTNAME=	trafshow-5.2.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	# ftp://ftp.nsk.su/pub/RinetSoftware/
 EXTRACT_SUFX=	.tgz
diff --git a/net/trafshow/distinfo b/net/trafshow/distinfo
index b08ee3c7d3a..52ed91c5ed5 100644
--- a/net/trafshow/distinfo
+++ b/net/trafshow/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2011/11/01 19:10:15 marino Exp $
+$NetBSD: distinfo,v 1.12 2013/02/06 20:32:16 jperkin Exp $
 
 SHA1 (trafshow-5.2.3.tgz) = 1c68f603f12357e932c83de850366c9b46e53d89
 RMD160 (trafshow-5.2.3.tgz) = f1ae068f898160f16ae9b3cb5f9d73ae3aece6cb
 Size (trafshow-5.2.3.tgz) = 142615 bytes
 SHA1 (patch-ai) = 6cfa14ad753bfd2b85e0e8c8cd8d8c25a697d6dd
+SHA1 (patch-trafshow.c) = bc010ec59e7208a92bd2d212f2de044178c2c70a
diff --git a/net/trafshow/patches/patch-trafshow.c b/net/trafshow/patches/patch-trafshow.c
new file mode 100644
index 00000000000..0958479b180
--- /dev/null
+++ b/net/trafshow/patches/patch-trafshow.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-trafshow.c,v 1.1 2013/02/06 20:32:17 jperkin Exp $
+
+* Avoid buffering on Solaris.
+
+--- trafshow.c.orig	2006-03-14 07:58:07.000000000 +0000
++++ trafshow.c
+@@ -23,6 +23,9 @@
+ #ifdef	HAVE_PCAP_GET_SELECTABLE_FD
+ #include <sys/select.h>
+ #endif
++#ifdef __sun
++#include <sys/bufmod.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+@@ -543,6 +546,9 @@ pcap_feed2(arg)
+ 	PCAP_HANDLER *ph, *ph_list = (PCAP_HANDLER *)arg;
+ 	int npkt = -1, ndev, op;
+ 	fd_set readfds;
++#ifdef __sun
++	struct timeval tv = {0, 0};
++#endif
+ 
+ 	for (;;) {
+ #ifdef	notdef
+@@ -555,6 +561,9 @@ pcap_feed2(arg)
+ 			if (!ph->pcap) /* skip non-pcap devices */
+ 				continue;
+ 			op = pcap_get_selectable_fd(ph->pcap);
++#ifdef __sun
++			ioctl(op, SBIOCSTIME, &tv);
++#endif
+ 			if (op < 0) /* should not happen */
+ 				continue;
+ 			if (op + 1 > ndev)
-- 
cgit v1.2.3