Update to version 1.23.0.

6 files changed, 26 insertions, 17 deletions

diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index ab3515c8fcb6..d99b896cbde4 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.22.1
+PORTVERSION=	1.23.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com/gammu/releases/
@@ -24,7 +24,11 @@ USE_GNOME=	pkgconfig
 .if defined(NOPORTDOCS)
 EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
 .else
-MAN1=		gammu.1 gammu-config.1 jadmaker.1
+MAN1=		gammu.1 gammu-config.1 jadmaker.1 gammu-smsd.1 gammu-smsd-inject.1 \
+		gammu-smsd-monitor.1
+MAN5=		gammu-smsdrc.5 gammurc.5
+MAN7=		gammu-smsd-files.7 gammu-smsd-mysql.7 gammu-smsd-pgsql.7 \
+		gammu-smsd-dbi.7 gammu-smsd-tables.7
 PORTDOCS=	*
 .endif
 
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 6ba69fbdd484..481671b04f05 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,3 +1,3 @@
-MD5 (gammu-1.22.1.tar.gz) = 937b4a5be60041c8a5bf6488dc004de2
-SHA256 (gammu-1.22.1.tar.gz) = 1722b1770668715a6af01517bb5e77b3463c4aecba22f7299d72114284b8261b
-SIZE (gammu-1.22.1.tar.gz) = 1497101
+MD5 (gammu-1.23.0.tar.gz) = 661f0b82aa61b901e7c7b55692c1abfb
+SHA256 (gammu-1.23.0.tar.gz) = 3ae027d9b672fd67dd3b7e278d8d4f20a63f32b8d50a01a18a6ad6b06f5f84d2
+SIZE (gammu-1.23.0.tar.gz) = 2843091
diff --git a/comms/gammu/files/patch-bluetooth b/comms/gammu/files/patch-bluetooth
index c7629e4612e7..d1a3f820c11b 100644
--- a/comms/gammu/files/patch-bluetooth
+++ b/comms/gammu/files/patch-bluetooth
@@ -1,5 +1,5 @@
---- common/device/bluetoth/bluez.c.orig	2007-03-10 19:47:59.000000000 +0300
-+++ common/device/bluetoth/bluez.c	2007-06-29 20:00:48.000000000 +0400
+--- 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
@@ -38,7 +38,7 @@
 -	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");
+ 		smprintf(s, "Can't create socket\n");
  		return ERR_DEVICENODRIVER;
  	}
  
diff --git a/comms/gammu/files/patch-common.device.devfunc.c b/comms/gammu/files/patch-common.device.devfunc.c
index 6dea7c02c241..cb474f2af445 100644
--- a/comms/gammu/files/patch-common.device.devfunc.c
+++ b/comms/gammu/files/patch-common.device.devfunc.c
@@ -1,9 +1,9 @@
---- common/device/devfunc.c.orig	Fri Feb 23 23:50:01 2007
-+++ common/device/devfunc.c	Tue Apr 10 23:46:39 2007
-@@ -18,6 +18,8 @@
- 
+--- 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 @@
  #include <string.h>
  #include <fcntl.h>
+ #include <stdlib.h>
 +#include <sys/stat.h>
 +#include <sys/socket.h>
  #ifdef WIN32
diff --git a/comms/gammu/files/patch-common.service.gsmmisc.c b/comms/gammu/files/patch-common.service.gsmmisc.c
index 4fd010de5d40..8e9d933cdfc2 100644
--- a/comms/gammu/files/patch-common.service.gsmmisc.c
+++ b/comms/gammu/files/patch-common.service.gsmmisc.c
@@ -1,10 +1,10 @@
---- common/service/gsmmisc.c.orig	Fri Dec 30 18:18:47 2005
-+++ common/service/gsmmisc.c	Fri Dec 30 18:19:07 2005
+--- 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 @@
  #include <string.h>
  #include <stdlib.h>
  #include <sys/stat.h>
 +#include <sys/socket.h>
- #ifdef WIN32
- #  include <io.h>
- #  include <fcntl.h>
+ 
+ #include <gammu-keys.h>
+ #include <gammu-debug.h>
diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist
index 3bfa6e58b2aa..d048af77cf3f 100644
--- a/comms/gammu/pkg-plist
+++ b/comms/gammu/pkg-plist
@@ -1,5 +1,7 @@
 bin/gammu
 bin/gammu-config
+bin/gammu-smsd
+bin/gammu-smsd-inject
 bin/jadmaker
 include/gammu/gammu-backup.h
 include/gammu/gammu-bitmap.h
@@ -23,11 +25,14 @@ include/gammu/gammu-nokia.h
 include/gammu/gammu-ringtone.h
 include/gammu/gammu-security.h
 include/gammu/gammu-settings.h
+include/gammu/gammu-smsd.h
 include/gammu/gammu-statemachine.h
 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
 libdata/pkgconfig/gammu.pc
+libdata/pkgconfig/gammu-smsd.pc
 @dirrm include/gammu