- Update to 0.98.0

PR:		ports/74366
Submitted by:	Kirill Bezzubets <kirill@solaris.ru> (maintainer)

8 files changed, 161 insertions, 175 deletions

diff --git a/comms/gammu/files/patch-bluetooth b/comms/gammu/files/patch-bluetooth
new file mode 100644
index 000000000000..0e1f685e3c80
--- /dev/null
+++ b/comms/gammu/files/patch-bluetooth
@@ -0,0 +1,77 @@
+diff -ur orig/bluetoth.c patched/bluetoth.c
+--- common/device/bluetoth/bluetoth.c	Thu Nov 25 12:36:26 2004
++++ common/device/bluetoth/bluetoth.c	Thu Nov 25 12:46:22 2004
+@@ -30,9 +30,6 @@
+ {
+ 	GSM_Error error;
+ 
+-#ifdef BLUETOOTH_RF_SEARCHING
+-	if (!mystrncasecmp(s->CurrentConfig->Connection, "bluerf", 6)) return bluetooth_findchannel(s);
+-#endif
+ 	
+ 	switch (s->ConnectionType) {
+ 	case GCT_BLUEAT:
+diff -ur common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c
+--- common/device/bluetoth/bluez.c	Thu Nov 25 12:36:26 2004
++++ common/device/bluetoth/bluez.c	Thu Nov 25 12:46:56 2004
+@@ -14,6 +14,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>
+@@ -22,10 +24,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.h>
+ 
+ #include "../../gsmcomon.h"
+ #include "../devfunc.h"
+@@ -34,21 +33,21 @@
+ 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;
+ 
+ 	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) {
+ 		dbgprintf("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");
+@@ -57,9 +56,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");
diff --git a/comms/gammu/files/patch-cfg-autoconf-configure.in b/comms/gammu/files/patch-cfg-autoconf-configure.in
deleted file mode 100644
index c14bf93096a0..000000000000
--- a/comms/gammu/files/patch-cfg-autoconf-configure.in
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/autoconf/configure.in ./cfg/autoconf/configure.in
---- /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/autoconf/configure.in	Tue Nov 25 19:22:06 2003
-+++ ./cfg/autoconf/configure.in	Tue Dec  9 16:53:34 2003
-@@ -85,11 +85,8 @@
-         pthread="no"])
- LDLIBS="$LDLIBS $PTHREAD_LIBS $PTHREAD_CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
--AC_CACHE_CHECK([for the Bluez Bluetooth stack], ac_cv_have_sockaddr_rc,
--     [AC_TRY_COMPILE([#include <sys/socket.h>
--          #include <bluetooth/bluetooth.h>
--          #include <bluetooth/rfcomm.h>],
--          [struct sockaddr_rc rc;],
-+AC_CACHE_CHECK([for FreeBSD Bluetooth stack], ac_cv_have_sockaddr_rc,
-+[AC_CHECK_LIB(bluetooth, main,
-            ac_cv_have_sockaddr_rc=yes,
-                ac_cv_have_sockaddr_rc=no)])
- 
-@@ -431,8 +428,8 @@
-   Nokia PHONET FBUS                             - $gsm_enable_irdaphonet
-   OBEX                                          - $gsm_enable_irdaobex
- 
--  Phone protocols with Bluez Bluetooth stack
--  ------------------------------------------
-+  Phone protocols with FreeBSD Bluetooth stack
-+  --------------------------------------------
-   AT commands                                   - $gsm_enable_blueat
-   Nokia FBUS2                                   - $gsm_enable_bluefbus2
-   Nokia PHONET FBUS                             - $gsm_enable_bluephonet
diff --git a/comms/gammu/files/patch-cfg-config.h b/comms/gammu/files/patch-cfg-config.h
deleted file mode 100644
index 55e1d4ef08af..000000000000
--- a/comms/gammu/files/patch-cfg-config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/config.h ./cfg/config.h
---- /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/config.h	Tue Nov 25 19:24:12 2003
-+++ ./cfg/config.h	Tue Dec  9 16:59:39 2003
-@@ -1,4 +1,4 @@
--/* config.h.  Generated automatically by configure.  */
-+/* config.h.  Generated by configure.  */
- 
- #ifndef _config_h_
- #define _config_h_
-@@ -45,20 +45,20 @@
- #define GSM_ENABLE_ALCABUS 1
- 
- /* Infrared. PHONET FBUS */
--#define GSM_ENABLE_IRDAPHONET 1
-+/* #undef GSM_ENABLE_IRDAPHONET */
- /* Infrared. AT commands */
--#define GSM_ENABLE_IRDAAT 1
-+/* #undef GSM_ENABLE_IRDAAT */
- /* Infrared. OBEX */
--#define GSM_ENABLE_IRDAOBEX 1
-+/* #undef GSM_ENABLE_IRDAOBEX */
- 
- /* Bluetooth stack (like Bluez). FBUS2 (init done using AT commands) */
--/* #undef GSM_ENABLE_BLUEFBUS2 */
-+#define GSM_ENABLE_BLUEFBUS2 1
- /* Bluetooth stack (like Bluez). PHONET FBUS */
--/* #undef GSM_ENABLE_BLUEPHONET */
-+#define GSM_ENABLE_BLUEPHONET 1
- /* Blueooth stack (like Bluez). AT commands */
--/* #undef GSM_ENABLE_BLUEAT */
-+#define GSM_ENABLE_BLUEAT 1
- /* Blueooth stack (like Bluez). OBEX */
--/* #undef GSM_ENABLE_BLUEOBEX */
-+#define GSM_ENABLE_BLUEOBEX 1
- 
- /* --------------------------- Phone modules (specific) ----------------- */
- 
-@@ -93,7 +93,7 @@
- #define GSM_ENABLE_ALCATEL 1
- 
- /* OBEX generic models */
--#define GSM_ENABLE_OBEXGEN 1
-+/* #undef GSM_ENABLE_OBEXGEN */
- 
- /* Symbian with m-router generic models */
- #define GSM_ENABLE_MROUTERGEN 1
diff --git a/comms/gammu/files/patch-common-device-bluetoth-bluetoth.c b/comms/gammu/files/patch-common-device-bluetoth-bluetoth.c
deleted file mode 100644
index 729cc7c15a41..000000000000
--- a/comms/gammu/files/patch-common-device-bluetoth-bluetoth.c
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/device/bluetoth/bluetoth.c ./common/device/bluetoth/bluetoth.c
---- /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/device/bluetoth/bluetoth.c	Sun Nov  2 11:43:28 2003
-+++ ./common/device/bluetoth/bluetoth.c	Tue Dec  9 17:19:59 2003
-@@ -11,11 +11,10 @@
- #include <string.h>
- 
- #ifndef WIN32
--#  include <sys/socket.h>
--#  include <sys/time.h>
--#  include <unistd.h>
--#  include <bluetooth/bluetooth.h>
--#  include <bluetooth/rfcomm.h>
-+#include <sys/socket.h>
-+#include <sys/time.h>
-+#include <unistd.h>
-+#include <bluetooth.h>
- #else
- #  include <windows.h>
- #  include <io.h>
-@@ -25,6 +24,11 @@
- #include "../devfunc.h"
- #include "bluetoth.h"
- 
-+#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
-+#define BDADDR_ANY NG_HCI_BDADDR_ANY
-+
-+#undef WIN32
-+
- #ifdef WIN32
- static GSM_Error bluetooth_connect(GSM_StateMachine *s, int port)
- {
-@@ -80,7 +84,7 @@
- static GSM_Error bluetooth_connect(GSM_StateMachine *s, int port)
- {
- 	GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
--	struct sockaddr_rc 		laddr, raddr;
-+	struct sockaddr_rfcomm 		laddr, raddr;
- 	bdaddr_t			bdaddr;
- 	int 				fd;
- 
-@@ -89,9 +93,9 @@
- 		return GE_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");
-@@ -100,9 +104,9 @@
- 	}
- 
- 	str2ba(s->CurrentConfig->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");
diff --git a/comms/gammu/files/patch-common-device-serial-ser_unx.c b/comms/gammu/files/patch-common-device-serial-ser_unx.c
new file mode 100644
index 000000000000..b5cc51630bab
--- /dev/null
+++ b/comms/gammu/files/patch-common-device-serial-ser_unx.c
@@ -0,0 +1,18 @@
+--- common/device/serial/ser_unx.c.orig	Fri Aug 13 12:10:45 2004
++++ common/device/serial/ser_unx.c	Fri Nov 26 16:25:16 2004
+@@ -230,6 +230,7 @@
+ 		case 57600:	speed2 = B57600;	break;
+ 		case 115200:	speed2 = B115200;	break;
+ 		case 230400:	speed2 = B230400;	break;
++#ifdef B460800
+ 		case 460800:	speed2 = B460800;	break;
+ #ifdef B500000
+ 		case 500000:	speed2 = B500000;	break;
+@@ -243,6 +244,7 @@
+ 		case 3000000:	speed2 = B3000000;	break;
+ 		case 3500000:	speed2 = B3500000;	break;
+ 		case 4000000:	speed2 = B4000000;	break;	
++#endif
+ #endif
+ #endif
+ 	}
diff --git a/comms/gammu/files/patch-common-phone-at-sonyeric.c b/comms/gammu/files/patch-common-phone-at-sonyeric.c
deleted file mode 100644
index 2dcbc3b6083d..000000000000
--- a/comms/gammu/files/patch-common-phone-at-sonyeric.c
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/phone/at/sonyeric.c ./common/phone/at/sonyeric.c
---- /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/phone/at/sonyeric.c	Sun Nov  2 11:45:40 2003
-+++ ./common/phone/at/sonyeric.c	Tue Dec  9 17:36:22 2003
-@@ -1,7 +1,6 @@
-                                            
- #include "../../gsmstate.h"
- 
--#ifdef GSM_ENABLE_ATGEN
- 
- #include <string.h>
- #include <time.h>
-@@ -13,7 +12,6 @@
- extern GSM_Reply_Function 		ATGENReplyFunctions[];
- extern GSM_Error ATGEN_DispatchMessage	(GSM_StateMachine *s);
- 
--#ifdef GSM_ENABLE_OBEXGEN
- 
- extern GSM_Reply_Function 		OBEXGENReplyFunctions[];
- extern GSM_Error OBEXGEN_GetFilePart	(GSM_StateMachine *s, GSM_File *File);
-@@ -403,8 +401,6 @@
- #endif
- }
- 
--#endif
--#endif
- 
- /* How should editor hadle tabs in this file? Add editor commands here.
-  * vim: noexpandtab sw=8 ts=8 sts=8:
diff --git a/comms/gammu/files/patch-configure b/comms/gammu/files/patch-configure
deleted file mode 100644
index 05529ce2c8ad..000000000000
--- a/comms/gammu/files/patch-configure
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig	Sat Oct 18 20:10:50 2003
-+++ configure	Wed Jul  7 21:43:37 2004
-@@ -5,3 +5,3 @@
-     echo "Running autoconf..."
--    autoconf
-+    ${AUTOCONF}
-     test "x$1" = "x--regenerate" && shift
diff --git a/comms/gammu/files/patch-configure.in b/comms/gammu/files/patch-configure.in
new file mode 100644
index 000000000000..7a2c5a701648
--- /dev/null
+++ b/comms/gammu/files/patch-configure.in
@@ -0,0 +1,66 @@
+--- cfg/autoconf/configure.in.orig	Thu Nov 25 13:02:35 2004
++++ cfg/autoconf/configure.in	Thu Nov 25 13:01:56 2004
+@@ -163,14 +163,14 @@
+ dnl Bluetooth stacks
+ gsm_blue_stack=unknown
+ AC_CHECK_HEADERS(bluetooth/bluetooth.h,
+-        [gsm_blue_stack=Bluez
++        [gsm_blue_stack=FreeBSD
+ 	 AC_DEFINE(GSM_ENABLE_BLUEZ)
+-         LDLIBS="$LDLIBS -lbluetooth -lsdp"])
++         LDLIBS="$LDLIBS -lbluetooth"])
+     
+-dnl Path for Bluez bluetooth library
++dnl Path for FreeBSD bluetooth library
+ gsm_bt_dir=""
+ AC_ARG_WITH(bluedir,
+-        [  --with-bluedir=DIR      Specifies the base libbluetooth from Bluez],
++        [  --with-bluedir=DIR      Specifies the base libbluetooth from FreeBSD],
+         [ if test x$withval = xyes; then
+                 AC_MSG_WARN(Usage is: --with-bluedir=DIR)
+           else
+@@ -261,7 +261,7 @@
+         [  --disable-bluefbus      Disable Nokia FBUS2 over Bluetooth stack
+                           (Nokia 6210)],
+         [gsm_enable_bluefbus2="no"],
+-        [if test $gsm_blue_stack = Bluez; then
++        [if test $gsm_blue_stack = FreeBSD; then
+                 AC_DEFINE(GSM_ENABLE_BLUEFBUS2)
+                 gsm_enable_bluefbus2="yes"
+           else
+@@ -271,7 +271,7 @@
+         [  --disable-bluephonet    Disable Nokia PHONET FBUS over Bluetooth
+                           stack (all new Nokias)],
+         [gsm_enable_bluephonet="no"],
+-        [if test $gsm_blue_stack = Bluez; then
++        [if test $gsm_blue_stack = FreeBSD; then
+                 AC_DEFINE(GSM_ENABLE_BLUEPHONET)
+                 gsm_enable_bluephonet="yes"
+           else
+@@ -280,7 +280,7 @@
+ AC_ARG_ENABLE(blueat,
+         [  --disable-blueat        Disable AT commands over Bluetooth stack],
+         [gsm_enable_blueat="no"],
+-        [if test $gsm_blue_stack = Bluez; then
++        [if test $gsm_blue_stack = FreeBSD; then
+                 AC_DEFINE(GSM_ENABLE_BLUEAT)
+                 gsm_enable_blueat="yes"
+           else
+@@ -289,7 +289,7 @@
+ AC_ARG_ENABLE(blueobex,
+         [  --disable-blueobex      Disable OBEX over Bluetooth stack],
+         [gsm_enable_blueobex="no"],
+-        [if test $gsm_blue_stack = Bluez; then
++        [if test $gsm_blue_stack = FreeBSD; then
+                 AC_DEFINE(GSM_ENABLE_BLUEOBEX)
+                 gsm_enable_blueobex="yes"
+           else
+@@ -408,7 +408,7 @@
+   Binaries                                      - $bindir
+   RPM making directory                          - $RPM_DIR
+   Temporary directory                           - $TEMP_DIR
+-  Bluez library path                            - $gsm_bt_dir
++  FreeBSD Bluetooth library path                - $gsm_bt_dir
+   
+   General options
+   ---------------