- Return of development release, update to 1.29.92

- Add license

7 files changed, 72 insertions, 17 deletions

diff --git a/comms/gammu-devel/files/patch-CMakeLists.txt b/comms/gammu-devel/files/patch-CMakeLists.txt
index 3e7fdfc4e1e8..65f4890aea4d 100644
--- a/comms/gammu-devel/files/patch-CMakeLists.txt
+++ b/comms/gammu-devel/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2009-02-25 19:46:07.000000000 +0300
-+++ CMakeLists.txt	2009-03-11 13:04:48.000000000 +0300
-@@ -547,7 +547,7 @@
+--- CMakeLists.txt.orig	2011-03-15 13:15:29.000000000 -0300
++++ CMakeLists.txt	2011-05-19 10:21:23.000000000 -0300
+@@ -640,7 +640,7 @@
  set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
  mark_as_advanced (INSTALL_DOC_DIR)
  
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
index d1a3f820c11b..cbdcf14b82d3 100644
--- a/comms/gammu-devel/files/patch-bluetooth
+++ b/comms/gammu-devel/files/patch-bluetooth
@@ -1,8 +1,8 @@
---- 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
+--- 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
 @@ -23,6 +23,8 @@
  #ifdef GSM_ENABLE_BLUETOOTHDEVICE
- #ifdef GSM_ENABLE_BLUEZ
+ #ifdef BLUEZ_FOUND
  
 +#define BDADDR_ANY NG_HCI_BDADDR_ANY
 +
@@ -31,7 +31,7 @@
  	bdaddr_t			bdaddr;
  	int 				fd;
  
-@@ -53,15 +51,15 @@
+@@ -53,15 +51,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
  
  	smprintf(s, "Connecting to RF channel %i\n",port);
  
@@ -50,8 +50,8 @@
 +	laddr.rfcomm_channel 	= 0;
  
  	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
- 		dbgprintf("Can't bind socket\n");
-@@ -70,9 +68,9 @@
+ 		smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
+@@ -70,9 +68,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
  	}
  
  	str2ba(device, &bdaddr);
@@ -63,4 +63,4 @@
 +	raddr.rfcomm_channel 	= port;
  
  	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
- 		dbgprintf("Can't connect\n");
+ 		smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
diff --git a/comms/gammu-devel/files/patch-common.device.devfunc.c b/comms/gammu-devel/files/patch-common.device.devfunc.c
index cb474f2af445..9de9b4827fe5 100644
--- a/comms/gammu-devel/files/patch-common.device.devfunc.c
+++ b/comms/gammu-devel/files/patch-common.device.devfunc.c
@@ -1,11 +1,11 @@
---- libgammu/device/devfunc.c.orig	Fri Feb 23 23:50:01 2007
-+++ libgammu/device/devfunc.c	Tue Apr 10 23:46:39 2007
-@@ -19,6 +19,8 @@
+--- libgammu/device/devfunc.c.orig	2010-07-12 15:51:05.000000000 +0400
++++ libgammu/device/devfunc.c	2011-01-28 13:21:17.938543134 +0300
+@@ -15,6 +15,8 @@
  #include <string.h>
  #include <fcntl.h>
  #include <stdlib.h>
 +#include <sys/stat.h>
 +#include <sys/socket.h>
  #ifdef WIN32
+ #  include <winsock2.h>
  #  include <io.h>
- #else
diff --git a/comms/gammu-devel/files/patch-common.service.gsmmisc.c b/comms/gammu-devel/files/patch-common.service.gsmmisc.c
index 8e9d933cdfc2..2654e3a8ba91 100644
--- a/comms/gammu-devel/files/patch-common.service.gsmmisc.c
+++ b/comms/gammu-devel/files/patch-common.service.gsmmisc.c
@@ -1,6 +1,6 @@
---- libgammu/service/gsmmisc.c.orig	Fri Dec 30 18:18:47 2005
-+++ libgammu/service/gsmmisc.c	Fri Dec 30 18:19:07 2005
-@@ -3,6 +3,7 @@
+--- libgammu/service/gsmmisc.c.orig	2010-07-12 15:51:05.000000000 +0400
++++ libgammu/service/gsmmisc.c	2011-01-28 13:21:17.940543932 +0300
+@@ -5,6 +5,7 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/stat.h>
diff --git a/comms/gammu-devel/files/patch-contrib.sqlreply.c.Makefile b/comms/gammu-devel/files/patch-contrib.sqlreply.c.Makefile
new file mode 100644
index 000000000000..5b156ee6c7e9
--- /dev/null
+++ b/comms/gammu-devel/files/patch-contrib.sqlreply.c.Makefile
@@ -0,0 +1,14 @@
+--- contrib/sqlreply/c/Makefile.orig	2011-05-19 14:38:18.000000000 -0300
++++ contrib/sqlreply/c/Makefile	2011-05-19 14:38:31.000000000 -0300
+@@ -7,8 +7,8 @@
+ 
+ michal: michal.o
+ 	@echo Linking
+-	@$(CC) michal.o -L/usr/lib/mysql -lmysqlclient -lz -o michal
++	@$(CC) michal.o -L/usr/local/lib/mysql -lmysqlclient -lz -o michal
+ 
+ clean:
+ 	@rm michal michal.o
+-	
+\ No newline at end of file
++	
diff --git a/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c b/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c
new file mode 100644
index 000000000000..347f41055865
--- /dev/null
+++ b/comms/gammu-devel/files/patch-contrib.sqlreply.c.michal.c
@@ -0,0 +1,13 @@
+--- 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/files/patch-docs.man.CMakeLists.txt b/comms/gammu-devel/files/patch-docs.man.CMakeLists.txt
new file mode 100644
index 000000000000..d5daea3ee851
--- /dev/null
+++ b/comms/gammu-devel/files/patch-docs.man.CMakeLists.txt
@@ -0,0 +1,28 @@
+--- docs/man/CMakeLists.txt.orig	2011-05-19 14:16:17.000000000 -0300
++++ docs/man/CMakeLists.txt	2011-05-19 14:16:48.000000000 -0300
+@@ -16,10 +16,10 @@
+     COMPONENT "manpages"
+     )
+ 
+-file(GLOB MAN5_PAGES "*.7")
++file(GLOB MAN7_PAGES "*.7")
+ 
+ install (
+-    FILES ${MAN5_PAGES}
++    FILES ${MAN7_PAGES}
+     DESTINATION "${INSTALL_MAN_DIR}/man7"
+     COMPONENT "manpages"
+     )
+@@ -43,10 +43,10 @@
+         COMPONENT "manpages"
+         )
+ 
+-    file(GLOB MAN5_PAGES "${LANG}/*.7")
++    file(GLOB MAN7_PAGES "${LANG}/*.7")
+ 
+     install (
+-        FILES ${MAN5_PAGES}
++        FILES ${MAN7_PAGES}
+         DESTINATION "${INSTALL_MAN_DIR}/${LANG}/man7"
+         COMPONENT "manpages"
+         )