8 files changed, 74 insertions, 1 deletions

diff --git a/MOVED b/MOVED
index 034a5cb1f403..fb29a9d3d558 100644
--- a/MOVED
+++ b/MOVED
@@ -2582,7 +2582,6 @@ emulators/snespp||2011-09-01|Has expired: BROKEN for more than 6 months
 emulators/xgs||2011-09-01|Has expired: No more public distfiles
 ftp/gproftpd||2011-09-01|Has expired: No more public distfiles
 ftp/muddleftpd||2011-09-01|Has expired: No more public distfiles
-comms/hcidump||2011-09-03|Has expired: No more public distfiles
 audio/gx2osd||2011-09-03|Has expired: No more public distfiles
 devel/p5-Getopt-Mixed||2011-09-03|Use devel/p5-Getopt-Long instead
 net/AquaGatekeeper2||2011-09-03|Binary port of software abandoned by the vendor
diff --git a/comms/Makefile b/comms/Makefile
index f7adeed03556..3cd38cbb08ac 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -49,6 +49,7 @@
     SUBDIR += gsmlib
     SUBDIR += hamfax
     SUBDIR += hamlib
+    SUBDIR += hcidump
     SUBDIR += hf
     SUBDIR += hso-kmod
     SUBDIR += hylafax
diff --git a/comms/hcidump/Makefile b/comms/hcidump/Makefile
new file mode 100644
index 000000000000..b24e78131c52
--- /dev/null
+++ b/comms/hcidump/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	hcidump
+# Date created:				10 Dec 2004
+# Whom:					Pav Lucistnik <pav@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	hcidump
+PORTVERSION=	1.5.1
+CATEGORIES=	comms sysutils
+MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
+
+MAINTAINER=	pav@FreeBSD.org
+COMMENT=	Bluetooth traffic dumper, similar to tcpdump
+
+LICENSE=	GPLv2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+MAN1=		hcidump.1
+MANCOMPRESSED=	yes
+PLIST_FILES=	bin/hcidump
+
+.include <bsd.port.mk>
diff --git a/comms/hcidump/distinfo b/comms/hcidump/distinfo
new file mode 100644
index 000000000000..db5382aa86f5
--- /dev/null
+++ b/comms/hcidump/distinfo
@@ -0,0 +1,2 @@
+SHA256 (hcidump-1.5.1.tar.gz) = fffd83539c9e1c565a381bc4e178597be0c64a1eb3364e6ce31db1f30827ab4e
+SIZE (hcidump-1.5.1.tar.gz) = 32480
diff --git a/comms/hcidump/files/patch-hcidump-Makefile b/comms/hcidump/files/patch-hcidump-Makefile
new file mode 100644
index 000000000000..cc47e508a4b5
--- /dev/null
+++ b/comms/hcidump/files/patch-hcidump-Makefile
@@ -0,0 +1,19 @@
+--- hcidump/Makefile.orig	Fri Mar 12 23:16:58 2004
++++ hcidump/Makefile	Fri Dec 10 21:06:23 2004
+@@ -2,13 +2,12 @@
+ # $FreeBSD$
+ 
+ PROG=		hcidump
+-BINDIR=		/usr/local/bin
+-MANDIR=		/usr/local/man/man
++BINDIR=		${PREFIX}/bin
++MANDIR=		${PREFIX}/man/man
+ MAN1=		hcidump.1
+ SRCS=		hcidump.c
+ WARNS?=		2
+-DEBUG_FLAGS=	-g
+-CFLAGS=		-O2 -I../parser
++CFLAGS+=	-I../parser
+ 
+ DPADD+=		../parser/libparser.a
+ LDADD+=		-L../parser -lparser
diff --git a/comms/hcidump/files/patch-parser-Makefile b/comms/hcidump/files/patch-parser-Makefile
new file mode 100644
index 000000000000..ecb5464b60d3
--- /dev/null
+++ b/comms/hcidump/files/patch-parser-Makefile
@@ -0,0 +1,12 @@
+--- parser/Makefile.orig	Fri Mar 12 23:16:59 2004
++++ parser/Makefile	Fri Dec 10 21:07:28 2004
+@@ -7,8 +7,7 @@
+ MAN=
+ SRCS=		bnep.c cmtp.c hidp.c l2cap.c rfcomm.c hci.c parser.c sdp.c
+ WARNS?=		2
+-DEBUG_FLAGS=	-g
+-CFLAGS=		-O2
++CFLAGS?=	-O2
+ 
+ NOPROFILE=	1
+ 
diff --git a/comms/hcidump/files/patch-parser.c b/comms/hcidump/files/patch-parser.c
new file mode 100644
index 000000000000..8ed8a87e7ed4
--- /dev/null
+++ b/comms/hcidump/files/patch-parser.c
@@ -0,0 +1,11 @@
+--- parser/parser.c.ORIG	Fri Sep 22 23:33:36 2006
++++ parser/parser.c	Fri Sep 22 23:34:45 2006
+@@ -65,7 +65,7 @@
+ 
+ 	if (!parser.state) {
+ 		if (parser.flags & DUMP_TSTAMP)
+-			printf("%8lu.%06lu ", f->ts.tv_sec, f->ts.tv_usec);
++			printf("%8lu.%06lu ", (unsigned long)f->ts.tv_sec, f->ts.tv_usec);
+ 		printf("%c ", (f->in ? '>' : '<'));
+ 		parser.state = 1;
+ 	} else
diff --git a/comms/hcidump/pkg-descr b/comms/hcidump/pkg-descr
new file mode 100644
index 000000000000..97b8df0b982c
--- /dev/null
+++ b/comms/hcidump/pkg-descr
@@ -0,0 +1,5 @@
+HCIdump reads raw HCI data coming from and going to a Bluetooth device and
+prints commands, events and, data in a human-readable form.
+
+Optionally, the dump can be written to a file rather than parsed, so that
+dump file can be parsed later.