From b6bb8c3d3a17625aa826094130b3d84530b6dae4 Mon Sep 17 00:00:00 2001
From: cvs2svn <cvs2svn@FreeBSD.org>
Date: Tue, 28 Apr 2009 21:27:54 +0000
Subject: This commit was manufactured by cvs2svn to create tag
 'RELEASE_7_2_0'.

---
 comms/gammu-devel/files/patch-bluetooth | 66 ---------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 comms/gammu-devel/files/patch-bluetooth

(limited to 'comms/gammu-devel/files/patch-bluetooth')

diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
deleted file mode 100644
index d1a3f820c11b..000000000000
--- a/comms/gammu-devel/files/patch-bluetooth
+++ /dev/null
@@ -1,66 +0,0 @@
---- libgammu/device/bluetoth/bluez.c.orig	2007-03-10 19:47:59.000000000 +0300
-+++ libgammu/device/bluetoth/bluez.c	2007-06-29 20:00:48.000000000 +0400
-@@ -23,6 +23,8 @@
- #ifdef GSM_ENABLE_BLUETOOTHDEVICE
- #ifdef GSM_ENABLE_BLUEZ
- 
-+#define BDADDR_ANY NG_HCI_BDADDR_ANY
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -31,11 +33,7 @@
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <unistd.h>
--#include <bluetooth/bluetooth.h>
--#include <bluetooth/rfcomm.h>
--#include <bluetooth/sdp.h>
--#include <bluetooth/sdp_lib.h>
--#include <bluetooth/hci_lib.h>
-+#include <bluetooth.h>
- 
- #include "../../gsmcomon.h"
- #include "../devfunc.h"
-@@ -44,7 +42,7 @@
- GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
- {
- 	GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
--	struct sockaddr_rc 		laddr, raddr;
-+	struct sockaddr_rfcomm 		laddr, raddr;
- 	bdaddr_t			bdaddr;
- 	int 				fd;
- 
-@@ -53,15 +51,15 @@
- 
- 	smprintf(s, "Connecting to RF channel %i\n",port);
- 
--	fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-+	fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
- 	if (fd < 0) {
- 		smprintf(s, "Can't create socket\n");
- 		return ERR_DEVICENODRIVER;
- 	}
- 
--	bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
--	laddr.rc_family 	= AF_BLUETOOTH;
--	laddr.rc_channel 	= 0;
-+	bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
-+	laddr.rfcomm_family 	= AF_BLUETOOTH;
-+	laddr.rfcomm_channel 	= 0;
- 
- 	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
- 		dbgprintf("Can't bind socket\n");
-@@ -70,9 +68,9 @@
- 	}
- 
- 	str2ba(device, &bdaddr);
--	bacpy(&raddr.rc_bdaddr, &bdaddr);
--	raddr.rc_family 	= AF_BLUETOOTH;
--	raddr.rc_channel 	= port;
-+	bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
-+	raddr.rfcomm_family 	= AF_BLUETOOTH;
-+	raddr.rfcomm_channel 	= port;
- 
- 	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
- 		dbgprintf("Can't connect\n");
-- 
cgit v1.2.3