- Update to 1.31.90

5 files changed, 51 insertions, 58 deletions

diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index c377e331f391..71f961ff2d46 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.29.92
+PORTVERSION=	1.31.90
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/
@@ -15,12 +15,12 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	GNU All Mobile Management Utilities - Development version
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
 
 CONFLICTS=	gammu-[1-9]* gammu-python-[1-9]*
 
-LICENSE=	GPLv2
-
 CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
 USE_CMAKE=	yes
@@ -28,6 +28,7 @@ USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20
 USE_BZIP2=	yes
+USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
diff --git a/comms/gammu-devel/distinfo b/comms/gammu-devel/distinfo
index 0b6059151a66..7f15c35d425f 100644
--- a/comms/gammu-devel/distinfo
+++ b/comms/gammu-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gammu-1.29.92.tar.bz2) = f84bbc6ab77943ebe4128f56e53db1421693123724af6f5e974ede70268bf818
-SIZE (gammu-1.29.92.tar.bz2) = 6221288
+SHA256 (gammu-1.31.90.tar.bz2) = 086135cbce9a0ae29913df4b4e6da2410ef4db8ed93f22a7e03219db58ba27a4
+SIZE (gammu-1.31.90.tar.bz2) = 6292651
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
index cbdcf14b82d3..9ba26499c15a 100644
--- a/comms/gammu-devel/files/patch-bluetooth
+++ b/comms/gammu-devel/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-devel/files/patch-contrib.sqlreply.c.michal.c b/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c
deleted file mode 100644
index 347f41055865..000000000000
--- a/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- contrib/sqlreply/c/michal.c.orig	2011-05-19 14:55:52.000000000 -0300
-+++ contrib/sqlreply/c/michal.c	2011-05-19 14:51:33.000000000 -0300
-@@ -13,8 +13,8 @@
- #else
- #include <stdio.h>
- #include <time.h>
--#include <mysql/mysql.h>
--#include <mysql/mysqld_error.h>
-+#include <mysql.h>
-+#include <mysqld_error.h>
- #include <sys/types.h>
- #include <unistd.h>
- #endif
diff --git a/comms/gammu-devel/pkg-plist b/comms/gammu-devel/pkg-plist
index d24499a3a6c2..cbdcdb329650 100644
--- a/comms/gammu-devel/pkg-plist
+++ b/comms/gammu-devel/pkg-plist
@@ -32,10 +32,15 @@ include/gammu/gammu-types.h
 include/gammu/gammu-unicode.h
 include/gammu/gammu-wap.h
 include/gammu/gammu.h
-lib/libGammu.a
-lib/libgsmsd.a
+lib/libGammu.so
+lib/libGammu.so.7
+lib/libGammu.so.7.1.31.90
+lib/libgsmsd.so
+lib/libgsmsd.so.7
+lib/libgsmsd.so.7.1.31.90
 libdata/pkgconfig/gammu.pc
 libdata/pkgconfig/gammu-smsd.pc
+share/gammu/gammu-s60-remote.sis
 share/locale/af/LC_MESSAGES/gammu.mo
 share/locale/af/LC_MESSAGES/libgammu.mo
 share/locale/ar/LC_MESSAGES/gammu.mo
@@ -96,7 +101,6 @@ share/locale/zh_TW/LC_MESSAGES/gammu.mo
 share/locale/zh_TW/LC_MESSAGES/libgammu.mo
 %%DATADIR%%/gnapplet.ini
 %%DATADIR%%/gnapplet.sis
-%%DATADIR%%/series60-remote.sis
 %%PYTHON_SITELIBDIR%%/gammu/__init__.py
 %%PYTHON_SITELIBDIR%%/gammu/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gammu/__init__.pyo
@@ -121,6 +125,7 @@ share/locale/zh_TW/LC_MESSAGES/libgammu.mo
 %%PYTHON_SITELIBDIR%%/gammu/worker.pyo
 @dirrmtry share/locale/sw/LC_MESSAGES
 @dirrmtry share/locale/sw
+@dirrmtry share/gammu
 @dirrm include/gammu
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gammu