5 files changed, 45 insertions, 45 deletions

diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index ff6e1155f256..fb639146de76 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.30.0
+PORTVERSION=	1.31.0
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 321d77fa1c16..b2f7119ab020 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gammu-1.30.0.tar.gz) = 7fc29a72e3bf0a185886f4aa8bd8c1a67ac0a209a16c2606534f4e5651a6eab2
-SIZE (gammu-1.30.0.tar.gz) = 8048876
+SHA256 (gammu-1.31.0.tar.gz) = c6331d134384d2a6569b2fb2069d911f994dbbe632b1c8c5fa8e9c01309a41ba
+SIZE (gammu-1.31.0.tar.gz) = 8123548
diff --git a/comms/gammu/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt
index 975c3377796d..1381c27f8100 100644
--- a/comms/gammu/files/patch-CMakeLists.txt
+++ b/comms/gammu/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2011-01-19 10:33:05.000000000 +0300
-+++ CMakeLists.txt	2011-01-28 13:57:29.069544083 +0300
-@@ -622,7 +622,7 @@ mark_as_advanced (INSTALL_LOC_DIR)
+--- CMakeLists.txt.orig	2011-12-21 17:25:37.000000000 +0400
++++ CMakeLists.txt	2011-12-23 14:57:04.447118270 +0400
+@@ -656,7 +656,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
  set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
  mark_as_advanced (INSTALL_DOC_DIR)
  
diff --git a/comms/gammu/files/patch-bluetooth b/comms/gammu/files/patch-bluetooth
index cbdcf14b82d3..9ba26499c15a 100644
--- a/comms/gammu/files/patch-bluetooth
+++ b/comms/gammu/files/patch-bluetooth
@@ -1,5 +1,5 @@
---- libgammu/device/bluetoth/bluez.c.orig	2010-07-12 15:51:05.000000000 +0400
-+++ libgammu/device/bluetoth/bluez.c	2011-01-28 13:21:17.936545967 +0300
+--- libgammu/device/bluetoth/bluez.c.orig	2011-12-21 17:25:37.000000000 +0400
++++ libgammu/device/bluetoth/bluez.c	2011-12-23 15:05:14.498122134 +0400
 @@ -23,6 +23,8 @@
  #ifdef GSM_ENABLE_BLUETOOTHDEVICE
  #ifdef BLUEZ_FOUND
@@ -22,45 +22,45 @@
  
  #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;
+@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac
+ 	/* Some phones need time till they are accessible after SDP browsing */
+ 	for (tries = 0; tries < 5; tries++) {
+ 		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 @@ GSM_Error bluetooth_connect(GSM_StateMac
+@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
  
- 	smprintf(s, "Connecting to RF channel %i\n",port);
+ 		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;
- 	}
+-		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");
+ 			continue;
+ 		}
  
--	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;
+-		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) {
- 		smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
-@@ -70,9 +68,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
- 	}
+ 		if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
+ 			smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
+@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
+ 		}
  
- 	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;
+ 		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) {
- 		smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
+ 		if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
+ 			smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist
index fae5ddbc81a2..8542e79d604a 100644
--- a/comms/gammu/pkg-plist
+++ b/comms/gammu/pkg-plist
@@ -36,10 +36,10 @@ libdata/pkgconfig/gammu.pc
 libdata/pkgconfig/gammu-smsd.pc
 lib/libGammu.so
 lib/libGammu.so.7
-lib/libGammu.so.7.1.30.0
+lib/libGammu.so.7.1.31.0
 lib/libgsmsd.so
 lib/libgsmsd.so.7
-lib/libgsmsd.so.7.1.30.0
+lib/libgsmsd.so.7.1.31.0
 share/gammu/gnapplet.ini
 share/gammu/gnapplet.sis
 share/gammu/series60-remote.sis