adjust this build so that it doesn't need to make a .a

library, to avoid breakage on pkgbulk build which does
not provide the same level of mk support as a NetBSD
host

9 files changed, 44 insertions, 47 deletions

diff --git a/sysutils/netbt-hcidump/distinfo b/sysutils/netbt-hcidump/distinfo
index 18f0f30a0bd..267d3a5c63e 100644
--- a/sysutils/netbt-hcidump/distinfo
+++ b/sysutils/netbt-hcidump/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.7 2012/03/09 18:12:55 plunky Exp $
+$NetBSD: distinfo,v 1.8 2012/03/19 12:09:00 plunky Exp $
 
 SHA1 (bluez-hcidump-2.3.tar.gz) = d60e3546c27d68615fe908899ba0d6af5f4d4171
 RMD160 (bluez-hcidump-2.3.tar.gz) = 95ac3961c0ae5c15902d72733579d1dfb3bde04b
 Size (bluez-hcidump-2.3.tar.gz) = 190848 bytes
-SHA1 (patch-aa) = 3a856deba9518923321b3ddffe863d7817a021e1
-SHA1 (patch-ab) = ad50cee12679bd302475f7a62391a3833343f51b
-SHA1 (patch-ac) = 42a0bfc63a64243db201973c1973b914bee92192
+SHA1 (patch-aa) = a56fc03afd98e020c0d46a46804450c538108454
+SHA1 (patch-ab) = e70df2bd673a6442bc3d3312ad04260c9cde7394
+SHA1 (patch-ac) = c107f92140baff9939bc3d70d5da4ef42aff6817
 SHA1 (patch-ad) = 65f5e76b20489907838d2eff47c6fdaea251a7e0
-SHA1 (patch-ae) = a5ce4c703d491472421138bbe7ebb0133832992c
+SHA1 (patch-ae) = 29bd10d4149db9ed9f5970da66f855e3e8e2d5ec
 SHA1 (patch-af) = d32b7ac6add15c95fce071d1f64ad7e1f655c99f
 SHA1 (patch-ah) = 911e4c7d76b18681413a021df6cbf264cb13555e
 SHA1 (patch-ai) = 44800df5e4b4b729cd73478eda0c330024235e81
 SHA1 (patch-aj) = 27b2298a968ca4306072950f5d49bb5c5204777a
-SHA1 (patch-ak) = a9528e81fe86c4b7cac0e82f883e3490d0c092ce
+SHA1 (patch-ak) = d52a279487b5d3d423136f0dd1242516f3cc0596
 SHA1 (patch-al) = 2d62a0a4203c1ecce7b71fd16fe909f0f4356d2c
-SHA1 (patch-am) = d1e1fd830bf3d064dccabbbe2ddd5e302b2e28aa
+SHA1 (patch-am) = 7a0796c3cd89f21e4210592e28b667bc6afe6c5d
 SHA1 (patch-an) = f9889b24e5ec399ef6fb40055c5df5a560d20f92
-SHA1 (patch-ao) = 070fc923cfb303ba9e3f9fd843b3ccd253db0698
-SHA1 (patch-lib_Makefile) = 027fc649ecb277b9402062a605d75122404ab595
+SHA1 (patch-ao) = 5971acdd513c85336d77827729fa410948101e8d
+SHA1 (patch-lib_Makefile) = f0da2eef060c0afed1431b025e4a8b92696e57da
diff --git a/sysutils/netbt-hcidump/patches/patch-aa b/sysutils/netbt-hcidump/patches/patch-aa
index 26f874733a5..719499d3dfb 100644
--- a/sysutils/netbt-hcidump/patches/patch-aa
+++ b/sysutils/netbt-hcidump/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-aa,v 1.3 2012/03/19 12:09:00 plunky Exp $
 
---- Makefile.orig	2012-02-15 08:56:20.000000000 +0000
+--- Makefile.orig	2012-03-19 12:00:46.000000000 +0000
 +++ Makefile
 @@ -0,0 +1,4 @@
 +
diff --git a/sysutils/netbt-hcidump/patches/patch-ab b/sysutils/netbt-hcidump/patches/patch-ab
index f5a3541a84d..c97a9a9c777 100644
--- a/sysutils/netbt-hcidump/patches/patch-ab
+++ b/sysutils/netbt-hcidump/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-ab,v 1.5 2012/03/19 12:09:00 plunky Exp $
 
---- lib/bluetooth.h.orig	2011-12-22 00:18:58.000000000 +0000
+--- lib/bluetooth.h.orig	2012-02-29 18:23:20.000000000 +0000
 +++ lib/bluetooth.h
 @@ -30,6 +30,7 @@
  extern "C" {
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.4 2012/02/15 09:30:23 plunky Exp $
  #include <stdio.h>
  #include <stdint.h>
  #include <string.h>
-@@ -107,6 +108,20 @@ enum {
+@@ -135,6 +136,20 @@ enum {
  #else
  #error "Unknown byte order"
  #endif
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.4 2012/02/15 09:30:23 plunky Exp $
  
  /* Bluetooth unaligned access */
  #define bt_get_unaligned(ptr)			\
-@@ -189,6 +204,7 @@ static inline uint16_t bt_get_be16(void 
+@@ -217,6 +232,7 @@ static inline uint16_t bt_get_be16(const
  #error "Unknown byte order"
  #endif
  
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.4 2012/02/15 09:30:23 plunky Exp $
  /* BD Address */
  typedef struct {
  	uint8_t b[6];
-@@ -197,6 +213,7 @@ typedef struct {
+@@ -225,6 +241,7 @@ typedef struct {
  #define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
  #define BDADDR_ALL   (&(bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}})
  #define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.4 2012/02/15 09:30:23 plunky Exp $
  
  /* Copy, swap, convert BD Address */
  static inline int bacmp(const bdaddr_t *ba1, const bdaddr_t *ba2)
-@@ -209,9 +226,12 @@ static inline void bacpy(bdaddr_t *dst, 
+@@ -237,9 +254,12 @@ static inline void bacpy(bdaddr_t *dst, 
  }
  
  void baswap(bdaddr_t *dst, const bdaddr_t *src);
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.4 2012/02/15 09:30:23 plunky Exp $
  int str2ba(const char *str, bdaddr_t *ba);
  int ba2oui(const bdaddr_t *ba, char *oui);
  int bachk(const char *str);
-@@ -220,11 +240,14 @@ int baprintf(const char *format, ...);
+@@ -248,11 +268,14 @@ int baprintf(const char *format, ...);
  int bafprintf(FILE *stream, const char *format, ...);
  int basprintf(char *str, const char *format, ...);
  int basnprintf(char *str, size_t size, const char *format, ...);
diff --git a/sysutils/netbt-hcidump/patches/patch-ac b/sysutils/netbt-hcidump/patches/patch-ac
index 04ef6a169f1..217fa3f8c35 100644
--- a/sysutils/netbt-hcidump/patches/patch-ac
+++ b/sysutils/netbt-hcidump/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-ac,v 1.3 2012/03/19 12:09:00 plunky Exp $
 
---- lib/hci.h.orig	2011-12-22 00:18:58.000000000 +0000
+--- lib/hci.h.orig	2012-02-29 18:23:20.000000000 +0000
 +++ lib/hci.h
 @@ -39,6 +39,7 @@ extern "C" {
  #define HCI_MAX_EVENT_SIZE	260
@@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.2 2012/02/15 09:30:23 plunky Exp $
  
  #ifndef __NO_HCI_DEFS
  
-@@ -2252,6 +2254,7 @@ typedef struct {
+@@ -2262,6 +2264,7 @@ typedef struct {
  
  #endif /* _NO_HCI_DEFS */
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.2 2012/02/15 09:30:23 plunky Exp $
  /* HCI Socket options */
  #define HCI_DATA_DIR	1
  #define HCI_FILTER	2
-@@ -2363,6 +2366,12 @@ struct hci_inquiry_req {
+@@ -2374,6 +2377,12 @@ struct hci_inquiry_req {
  	uint8_t  num_rsp;
  };
  #define IREQ_CACHE_FLUSH 0x0001
diff --git a/sysutils/netbt-hcidump/patches/patch-ae b/sysutils/netbt-hcidump/patches/patch-ae
index 964f9a98016..b69b8541caa 100644
--- a/sysutils/netbt-hcidump/patches/patch-ae
+++ b/sysutils/netbt-hcidump/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-ae,v 1.3 2012/03/19 12:09:00 plunky Exp $
 
---- lib/l2cap.h.orig	2011-12-22 00:18:58.000000000 +0000
+--- lib/l2cap.h.orig	2012-02-29 18:23:20.000000000 +0000
 +++ lib/l2cap.h
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  extern "C" {
  #endif
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.2 2012/02/15 09:30:23 plunky Exp $
  #include <sys/socket.h>
  
  /* L2CAP defaults */
-@@ -69,6 +70,7 @@ struct l2cap_conninfo {
+@@ -70,6 +71,7 @@ struct l2cap_conninfo {
  #define L2CAP_LM_TRUSTED	0x0008
  #define L2CAP_LM_RELIABLE	0x0010
  #define L2CAP_LM_SECURE		0x0020
diff --git a/sysutils/netbt-hcidump/patches/patch-ak b/sysutils/netbt-hcidump/patches/patch-ak
index f49e23e23c2..9c386f4f303 100644
--- a/sysutils/netbt-hcidump/patches/patch-ak
+++ b/sysutils/netbt-hcidump/patches/patch-ak
@@ -1,9 +1,9 @@
-$NetBSD: patch-ak,v 1.3 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-ak,v 1.4 2012/03/19 12:09:00 plunky Exp $
 
---- src/Makefile.orig	2012-02-15 08:56:20.000000000 +0000
+--- src/Makefile.orig	2012-03-19 12:00:46.000000000 +0000
 +++ src/Makefile
-@@ -0,0 +1,16 @@
-+.PATH: ../parser
+@@ -0,0 +1,17 @@
++.PATH: ../parser ../lib
 +
 +PROG=	hcidump
 +MAN=	hcidump.8
@@ -11,11 +11,12 @@ $NetBSD: patch-ak,v 1.3 2012/02/15 09:30:23 plunky Exp $
 +BINDIR=	${PREFIX}/sbin
 +
 +SRCS=	hcidump.c							\
++	bluetooth.c hci_lib.c						\
 +	att.c avctp.c avdtp.c avrcp.c bnep.c bpa.c capi.c cmtp.c	\
 +	csr.c ericsson.c hci.c hcrp.c hidp.c l2cap.c lmp.c obex.c	\
 +	parser.c ppp.c rfcomm.c sdp.c smp.c tcpip.c
 +
 +CPPFLAGS+=	-I..
-+LDADD+=		../lib/libbluez.a -lbluetooth
++LDADD+=		-lbluetooth
 +
 +.include <bsd.prog.mk>
diff --git a/sysutils/netbt-hcidump/patches/patch-am b/sysutils/netbt-hcidump/patches/patch-am
index 750fd72a3d4..817eb0ab512 100644
--- a/sysutils/netbt-hcidump/patches/patch-am
+++ b/sysutils/netbt-hcidump/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.3 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-am,v 1.4 2012/03/19 12:09:00 plunky Exp $
 
---- lib/hci.c.orig	2011-12-22 00:18:58.000000000 +0000
+--- lib/hci.c.orig	2012-02-29 18:23:20.000000000 +0000
 +++ lib/hci.c
 @@ -71,6 +71,7 @@ static char *hci_bit2str(hci_map *m, uns
  	return str;
diff --git a/sysutils/netbt-hcidump/patches/patch-ao b/sysutils/netbt-hcidump/patches/patch-ao
index a1240611a43..ac71d9457fb 100644
--- a/sysutils/netbt-hcidump/patches/patch-ao
+++ b/sysutils/netbt-hcidump/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.5 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-ao,v 1.6 2012/03/19 12:09:00 plunky Exp $
 
---- src/hcidump.c.orig	2011-12-22 00:18:58.000000000 +0000
+--- src/hcidump.c.orig	2012-02-29 18:23:20.000000000 +0000
 +++ src/hcidump.c
 @@ -48,6 +48,10 @@
  #include "lib/hci.h"
@@ -124,7 +124,7 @@ $NetBSD: patch-ao,v 1.5 2012/02/15 09:30:23 plunky Exp $
  	int defpsm = 0;
  	int defcompid = DEFAULT_COMPID;
  	int opt, pppdump_fd = -1, audio_fd = -1;
-@@ -909,7 +939,7 @@ int main(int argc, char *argv[])
+@@ -910,7 +940,7 @@ int main(int argc, char *argv[])
  		switch(opt) {
  		case 'i':
  			if (strcasecmp(optarg, "none") && strcasecmp(optarg, "system"))
diff --git a/sysutils/netbt-hcidump/patches/patch-lib_Makefile b/sysutils/netbt-hcidump/patches/patch-lib_Makefile
index c31cb418f9f..63d2d6b9386 100644
--- a/sysutils/netbt-hcidump/patches/patch-lib_Makefile
+++ b/sysutils/netbt-hcidump/patches/patch-lib_Makefile
@@ -1,15 +1,11 @@
-$NetBSD: patch-lib_Makefile,v 1.2 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-lib_Makefile,v 1.3 2012/03/19 12:09:00 plunky Exp $
 
---- lib/Makefile.orig	2012-02-15 08:56:20.000000000 +0000
+--- lib/Makefile.orig	2012-03-19 12:00:46.000000000 +0000
 +++ lib/Makefile
-@@ -0,0 +1,10 @@
-+MKLINT=no
+@@ -0,0 +1,6 @@
++# this file conflicts with parser/hci.c so just rename it
 +
-+LIB=	bluez
-+LIBISPRIVATE=yes
++all: hci_lib.c
 +
-+SRCS=		bluetooth.c hci.c
-+
-+CPPFLAGS+=	-I..
-+
-+.include <bsd.lib.mk>
++hci_lib.c: hci.c
++	cp hci.c hci_lib.c