 @@ -1,36 +1,36 @@
-# $NetBSD: Makefile,v 1.12 2009/05/22 07:16:58 plunky Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/20 05:56:02 hasso Exp $
+#
 DISTNAME=	obexftp-0.20
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openobex/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openobex.triq.net/
 COMMENT=	File copying over the Object Exchange (OBEX) protocol
 PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	autoconf gmake pkg-config
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-swig
 .include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h))
+.if ((${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) || ${OPSYS} == "DragonFly")
 CPPFLAGS+=		-DCOMPAT_BLUEZ -DSDP_COMPAT
 .endif
 post-patch:
 	cd ${WRKSRC} && autoconf
 .include "../../comms/openobex/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.6 2006/12/07 14:22:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2009/07/20 05:56:02 hasso Exp $
 SHA1 (obexftp-0.20.tar.bz2) = 0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82
 RMD160 (obexftp-0.20.tar.bz2) = ded5cf4d95eac77d5f6ee0a39f3789eb962534ed
 Size (obexftp-0.20.tar.bz2) = 351641 bytes
-SHA1 (patch-aa) = e70d2fd0655a95a43f3a9440e5a2e2ab91a2ed54
+SHA1 (patch-aa) = 65925a0df323cd391dab48f45fcf6c99dbcc8fbb
-SHA1 (patch-ab) = d4693413a992f53f6aca92d9e920185c1b5e4f0e
+SHA1 (patch-ab) = 0a0c2cbcfc9449df48e8340dba1593d5593129f5
-SHA1 (patch-ac) = d06b6be98745778e2ce8e97762c102d4dbccecfc
+SHA1 (patch-ac) = 6b44406a04ea81eb615d6ed9ffebf2db27008e35
-SHA1 (patch-ad) = 8c3b99cbc2f45fe039aae000aeebb2d5779355f9
+SHA1 (patch-ad) = 00ada8c88756d3201b02e5a0b9467a7ee1ad0f50
-SHA1 (patch-ae) = 276fa421e2f20784cbcb873b0ce6870bef71d033
+SHA1 (patch-ae) = d08fd3b4aa5e2f61eda5ea6d3f6656f8b036af30
-SHA1 (patch-af) = 4de53a6ec0d711f948980cdfdd4adea3928b64bd
+SHA1 (patch-af) = f1e96b8a15a4fec69b81d19635a674ee307d31c1
-SHA1 (patch-ag) = e61fdbba340af591318b1aa3b70272a969e01e70
+SHA1 (patch-ag) = 7a3f10354e8a86022cac360b8a36198d9e7449ab
 SHA1 (patch-ah) = c0fe5bd78e7614a7eb6adb7154676fd9bde7a31c
-SHA1 (patch-ai) = 2e77a0cd8998f3a558a2587b5cbdc7c0e080bc0f
+SHA1 (patch-ai) = 8baf3463303156e890316622ddeb011842acaa85
-SHA1 (patch-aj) = c563733a616ec0ad5b94a3ff8de5e3a2e91ccd5b
+SHA1 (patch-aj) = 26f6509d26aaa893fe6018bd048135fb077e0b9c
-SHA1 (patch-ak) = 3131a38f66bec5d0bba563e72ad2a75f21e65b99
+SHA1 (patch-ak) = bdef026206a0dca2c4781b06bbdfdd90f1c934f6
 SHA1 (patch-al) = 1f2dd6ed302711f17e33584cc34f6f674a6973c7

 @@ -1,69 +1,69 @@
-$NetBSD: patch-aa,v 1.4 2006/12/07 14:22:18 xtraeme Exp $
+$NetBSD: patch-aa,v 1.5 2009/07/20 05:56:03 hasso Exp $
 --- aclocal.m4.orig	2006-05-16 16:50:36.000000000 +0200
 +++ aclocal.m4	2006-10-22 10:07:38.000000000 +0200
 @@ -56,6 +56,9 @@
  				#ifdef __FreeBSD__
  				#include <sys/types.h>
  				#include <bluetooth.h>
-+				#elif defined(__NetBSD__)
++				#elif defined(__NetBSD__) || defined(__DragonFly__)
 +				#include <bluetooth.h>
 +				#include <netbt/rfcomm.h>
  				#else /* Linux */
  				#include <sys/socket.h>
  				#include <bluetooth/bluetooth.h>
 @@ -65,6 +68,9 @@
  				#ifdef __FreeBSD__
  				bdaddr_t bdaddr;
  				struct sockaddr_rfcomm addr;
-+				#elif defined(__NetBSD__)
++				#elif defined(__NetBSD__) || defined(__DragonFly__)
 +				bdaddr_t bdaddr;
 +				struct sockaddr_bt addr;
  				#else /* Linux */
  				bdaddr_t bdaddr;
  				struct sockaddr_rc addr;
 @@ -76,6 +82,7 @@
  		AC_DEFINE([HAVE_BLUETOOTH], [1], [Define if system supports Bluetooth and it's enabled])
  		BLUETOOTH_CFLAGS=""
  		BLUETOOTH_LIBS="-lbluetooth"
 +  		AC_CHECK_LIB(sdp, sdp_open, BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp")
  	fi
  	AC_SUBST(BLUETOOTH_CFLAGS)
  	AC_SUBST(BLUETOOTH_LIBS)
 @@ -92,14 +99,22 @@
  	AC_MSG_CHECKING(for Bluetooth SDP support)
  	AC_TRY_COMPILE(	[
-+				#ifdef __NetBSD__
++				#if defined(__NetBSD__) || defined(__DragonFly__)
 +				#include <bluetooth.h>
 +				#include <sdp.h>
 +				#else
  				#include <bluetooth/sdp.h>
 +				#endif
  			],[
-+				#ifdef __NetBSD__
++				#if defined(__NetBSD__) || defined(__DragonFly__)
 +				sdp_attr_t attr;
 +				#else
  				sdp_list_t sdplist;
 +				#endif
  			],
  				am_cv_sdplib_found=yes,
  				am_cv_sdplib_found=no
+ 			)
+-
  	if test $am_cv_sdplib_found = yes; then
  		AC_DEFINE(HAVE_SDPLIB,1,[Define if system supports Bluetooth SDP])
 @@ -118,6 +133,12 @@
  	AC_MSG_CHECKING(for USB support)
  	AC_TRY_COMPILE( [
-+				#ifdef __NetBSD__
++				#if defined(__NetBSD__) || defined(__DragonFly__)
 +				#include <bluetooth.h>
 +				#else
 +				#include <bluetooth/bluetooth.h>
 +				#endif
++
  				#include <openobex/obex.h>
  				#include <openobex/obex_const.h>
  			],[

 @@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- multicobex/multi_cobex.c.orig	2005-11-24 15:55:11.000000000 +0100
 +++ multicobex/multi_cobex.c	2006-07-09 12:21:14.000000000 +0200
 @@ -49,6 +49,14 @@
  #include <termios.h>
  #endif
 +#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#else
 +#include <bluetooth/bluetooth.h>
 +#endif
 +#endif /* HAVE_BLUETOOTH */
++
  #include <openobex/obex.h>
  #include "multi_cobex.h"
  #include "multi_cobex_private.h"

 @@ -1,26 +1,26 @@
-$NetBSD: patch-ac,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ac,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- obexftp/object.h.orig	2005-09-13 16:53:20.000000000 +0200
 +++ obexftp/object.h	2006-07-09 12:45:14.000000000 +0200
 @@ -22,7 +22,21 @@
  #ifndef OBEXFTP_OBJECT_H
  #define OBEXFTP_OBJECT_H
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
++
  #include <inttypes.h>
 +#include <sys/types.h>
++
 +#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#else
 +#include <bluetooth/bluetooth.h>
 +#endif
 +#endif /* HAVE_BLUETOOTH */
++
  #include <openobex/obex.h>
  #ifdef __cplusplus

 @@ -1,28 +1,28 @@
-$NetBSD: patch-ad,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- obexftp/client.h.orig	2006-01-11 16:22:51.000000000 +0100
 +++ obexftp/client.h	2006-07-09 12:39:10.000000000 +0200
 @@ -22,9 +22,23 @@
  #ifndef OBEXFTP_CLIENT_H
  #define OBEXFTP_CLIENT_H
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
++
  #include <inttypes.h>
  #include <sys/stat.h>
 +#include <sys/types.h>
  #include <time.h>
++
 +#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#else
 +#include <bluetooth/bluetooth.h>
 +#endif
 +#endif /* HAVE_BLUETOOTH */
++
  #include <openobex/obex.h>
  #ifndef OBEX_TRANS_USB
  #define OBEX_TRANS_USB		6

 @@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- obexftp/client.c.orig	2006-07-09 12:37:02.000000000 +0200
 +++ obexftp/client.c	2006-07-09 12:38:10.000000000 +0200
 @@ -48,6 +48,10 @@
  #ifdef __FreeBSD__
  #include <sys/types.h>
  #include <bluetooth.h>
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/types.h>
 +#include <bluetooth.h>
 +#include <netbt/rfcomm.h>
  #else /* Linux */
  #include <bluetooth/bluetooth.h>
  #include <bluetooth/rfcomm.h>

 @@ -1,23 +1,23 @@
-$NetBSD: patch-af,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-af,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- obexftp/obexftp_io.c.orig	2006-07-09 12:40:32.000000000 +0200
 +++ obexftp/obexftp_io.c	2006-07-09 12:41:36.000000000 +0200
 @@ -30,6 +30,18 @@
  #include <string.h>
  #include <time.h>
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
++
 +#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#else
 +#include <bluetooth/bluetooth.h>
 +#endif
 +#endif /* HAVE_BLUETOOTH */
++
  #include <openobex/obex.h>
  #include "obexftp_io.h"

 @@ -1,19 +1,19 @@
-$NetBSD: patch-ag,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-ag,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- obexftp/cache.c.orig	2006-07-09 12:43:21.000000000 +0200
 +++ obexftp/cache.c	2006-07-09 12:43:56.000000000 +0200
 @@ -40,6 +40,14 @@
  #include <langinfo.h>
  #endif
 +#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#else
 +#include <bluetooth/bluetooth.h>
 +#endif
 +#endif /* HAVE_BLUETOOTH */
++
  #include <openobex/obex.h>
  #include "obexftp.h"

 @@ -1,34 +1,34 @@
-$NetBSD: patch-ai,v 1.2 2006/07/24 17:07:15 xtraeme Exp $
+$NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- apps/obexftpd.c.orig	2006-04-13 07:57:55.000000000 +0200
 +++ apps/obexftpd.c
 @@ -23,6 +23,10 @@
   * Created at:    Don, 2 Okt 2003
   */
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
++
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 @@ -45,6 +49,14 @@
  #include <netdb.h>
  #endif /*_WIN32*/
 +#ifdef HAVE_BLUETOOTH
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#else
 +#include <bluetooth/bluetooth.h>
 +#endif
 +#endif /* HAVE_BLUETOOTH */
++
  /* just until there is a server layer in obexftp */
  #include <openobex/obex.h>
 @@ -934,16 +946,21 @@ static void start_server(int transport)
  		exit(0);
+ 	}

 @@ -1,31 +1,31 @@
-$NetBSD: patch-ak,v 1.2 2006/07/24 17:07:15 xtraeme Exp $
+$NetBSD: patch-ak,v 1.3 2009/07/20 05:56:03 hasso Exp $
 --- apps/obexftp_sdp.c.orig	2006-03-08 00:34:15.000000000 +0100
 +++ apps/obexftp_sdp.c
 @@ -25,6 +25,8 @@
  #include <config.h>
  #endif
 +#ifdef HAVE_BLUETOOTH
++
  #include <stdio.h>
  #include <errno.h>
  #include <unistd.h>
 @@ -34,6 +36,53 @@
  #include <sys/types.h>
  #include <sys/socket.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#include <sdp.h>
++
 +#include "obexftp_sdp.h"
++
 +#define OBEXFTP_RFCOMM_CHANNEL	10
++
 +static void *session;
++
 +void
 +obexftp_sdp_unregister(void)
 +{
 +	sdp_close(session);

 @@ -1,22 +1,22 @@
-$NetBSD: patch-aj,v 1.1 2006/07/17 12:29:57 xtraeme Exp $
+$NetBSD: patch-aj,v 1.2 2009/07/20 05:56:03 hasso Exp $
 --- apps/bt_discovery.c.orig	2006-01-11 17:27:35.000000000 +0000
 +++ apps/bt_discovery.c
 @@ -10,6 +10,205 @@
  #include <sys/types.h>
  #include <sys/socket.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <bluetooth.h>
 +#include <err.h>
 +#include <errno.h>
 +#include <sdp.h>
++
 +#include "bt_discovery.h"
++
 +/*
 + * Parse protocol descriptor list for the RFCOMM channel
 + *
 + * seq8 len8				2
 + *	seq8 len8			2
 + *		uuid16 value16		3	L2CAP