update to obexapp 1.4.14, with a clump of minor fixes submitted

by Iain Hibbert:

- use libexpat instead of FreeBSD internal libbsdxml

- fix off by one error with busy spinner, which sometimes
  resulted in a spurious backspace in the output

- fflush(stdout) for busy spinner

- print streaming statistics after transfers in client mode

- use HAVE_BT_DEVADDR rather than testing for __NetBSD__

- use bdaddr_any() functions instead of memcpy()

- allow server mode to bind to channel 0, indicating to the OS
  that the first available channel should be used

- prevent busy loop bug if the socket is remotely closed causing
  the read() to return 0 bytes

- fix some [unsigned comparison] compiler warnings

- provide connection ID for all get requests, improves compatibility
  with remote windows mobile devices

4 files changed, 14 insertions, 30 deletions

diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index bbe2646daff..c44c2a535af 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/15 17:48:44 plunky Exp $
+# $NetBSD: Makefile,v 1.26 2010/11/17 19:14:33 plunky Exp $
 #
 
-DISTNAME=	obexapp-1.4.13
+DISTNAME=	obexapp-1.4.14
 CATEGORIES=	comms
 MASTER_SITES=	http://people.freebsd.org/~emax/obexapp/
 
diff --git a/comms/obexapp/distinfo b/comms/obexapp/distinfo
index 1f54b0dd97b..505aa3d7a11 100644
--- a/comms/obexapp/distinfo
+++ b/comms/obexapp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2010/01/15 17:48:44 plunky Exp $
+$NetBSD: distinfo,v 1.16 2010/11/17 19:14:33 plunky Exp $
 
-SHA1 (obexapp-1.4.13.tar.gz) = 768c15e1558b1cb87b64c328f7ee73be28ae4dc7
-RMD160 (obexapp-1.4.13.tar.gz) = 4efd9e670a4429ff13fee1b2ef8328110517e3f2
-Size (obexapp-1.4.13.tar.gz) = 32001 bytes
-SHA1 (patch-ac) = 604a84e13aff146698e44eee7350216e716a5066
-SHA1 (patch-af) = ef1a6723cd5a66cbd6483e146197fbd8409dbbd3
+SHA1 (obexapp-1.4.14.tar.gz) = 10580f215cf895e58ac8c7a9ade2c83f647e0273
+RMD160 (obexapp-1.4.14.tar.gz) = 905e6cb0ae742a00624b4db3f33649be4fabfe97
+Size (obexapp-1.4.14.tar.gz) = 32468 bytes
+SHA1 (patch-af) = 445194ab971b9de4ecca689958423a69573accd0
diff --git a/comms/obexapp/patches/patch-ac b/comms/obexapp/patches/patch-ac
deleted file mode 100644
index da726075acd..00000000000
--- a/comms/obexapp/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/01/15 17:48:44 plunky Exp $
-
---- util.c.orig	2010-01-08 19:37:12.000000000 +0000
-+++ util.c
-@@ -30,9 +30,9 @@
-  */
- 
- #include <bluetooth.h>
--#include <bsdxml.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <expat.h>
- #include <iconv.h>
- #include <langinfo.h>
- #include <libgen.h>
diff --git a/comms/obexapp/patches/patch-af b/comms/obexapp/patches/patch-af
index 660cc02261a..854be7e1cc1 100644
--- a/comms/obexapp/patches/patch-af
+++ b/comms/obexapp/patches/patch-af
@@ -1,23 +1,23 @@
-$NetBSD: patch-af,v 1.5 2010/01/15 17:48:44 plunky Exp $
+$NetBSD: patch-af,v 1.6 2010/11/17 19:14:34 plunky Exp $
 
---- Makefile.orig	2010-01-08 18:31:22.000000000 +0000
+--- Makefile.orig	2010-11-03 18:28:50.000000000 +0000
 +++ Makefile
-@@ -16,9 +16,15 @@ DEBUG_FLAGS=	-g
+@@ -16,9 +16,16 @@ DEBUG_FLAGS=	-g
  CFLAGS+=	-I/usr/local/include \
  		-I/usr/local/include/openobex
  
--DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE}
+-DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBREADLINE}
 +DPADD=		${LIBBLUETOOTH} ${LIBREADLINE}
  LDADD=		-L/usr/lib -L/usr/local/lib \
--		-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv
+-		-lbluetooth -lsdp -lopenobex -lexpat -lreadline -liconv
 +		-lbluetooth -lopenobex -lexpat -lreadline -liconv
  
--.include <bsd.prog.mk>
 +.if (${HAVE_LIBSDP:Uyes} == "no")
 +CPPFLAGS+=	-DSDP_COMPAT
 +.else
 +DPADD+=		${LIBSDP}
 +LDADD+=		-lsdp
 +.endif
++ 
+ .include <bsd.prog.mk>
  
-+.include <bsd.prog.mk>