. update to version 1.30.0;

. remove patches taken from HEAD repository.

7 files changed, 15 insertions, 271 deletions

diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 52abf71d95a6..733a9b104d94 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	1.29.0
-PORTREVISION=	2
+PORTVERSION=	1.30.0
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/
@@ -35,7 +34,8 @@ CMAKE_ARGS+=	-DINSTALL_DOC=OFF -DINSTALL_PHP_EXAMPLES=OFF -DINSTALL_MEDIA=OFF \
 MAN1=		gammu.1 gammu-config.1 jadmaker.1 gammu-smsd.1 gammu-smsd-inject.1 \
 		gammu-smsd-monitor.1 gammu-detect.1
 MAN5=		gammu-backup.5 gammu-smsbackup.5 gammu-smsdrc.5 gammurc.5
-MAN7=		gammu-smsd-files.7 gammu-smsd-mysql.7 gammu-smsd-pgsql.7 \
+MAN7=		gammu-smsd-files.7 gammu-smsd-mysql.7 \
+		gammu-smsd-odbc.7 gammu-smsd-pgsql.7 \
 		gammu-smsd-dbi.7 gammu-smsd-tables.7 gammu-smsd-null.7 \
 		gammu-smsd-run.7 gammu-smsd-sql.7
 
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 58109b468405..321d77fa1c16 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gammu-1.29.0.tar.gz) = 6bb301003945a0c299fb7233a6f4e311a714683f0ffca2d7cbf8948d6ff61d5a
-SIZE (gammu-1.29.0.tar.gz) = 7730598
+SHA256 (gammu-1.30.0.tar.gz) = 7fc29a72e3bf0a185886f4aa8bd8c1a67ac0a209a16c2606534f4e5651a6eab2
+SIZE (gammu-1.30.0.tar.gz) = 8048876
diff --git a/comms/gammu/files/patch-contrib_sqlreply_c_Makefile b/comms/gammu/files/patch-contrib_sqlreply_c_Makefile
deleted file mode 100644
index 02317ebfb744..000000000000
--- a/comms/gammu/files/patch-contrib_sqlreply_c_Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-From 35fb0da26e6d38ba9f5b5d357abc920dd3c2b752 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
-Date: Wed, 11 May 2011 10:16:27 +0200
-Subject: [PATCH] Fix include for MySQL (bug #1447).
-
----
- contrib/sqlreply/c/michal.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/sqlreply/c/michal.c b/contrib/sqlreply/c/michal.c
-index d8541d1..192f9f0 100644
---- contrib/sqlreply/c/michal.c
-+++ contrib/sqlreply/c/michal.c
-@@ -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
--- 
-1.6.1
-
diff --git a/comms/gammu/files/patch-daylight.diff b/comms/gammu/files/patch-daylight.diff
deleted file mode 100644
index 92edf91fd63e..000000000000
--- a/comms/gammu/files/patch-daylight.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-From 3b18e8d86c2840df2c1d5b94760f7f9a98bacd6d Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
-Date: Fri, 28 Jan 2011 13:51:21 +0100
-Subject: [PATCH] Check for daylight variable and use it only if available.
-
----
- CMakeLists.txt                       |   10 ++++++++++
- cmake/templates/gammu-config.h.cmake |    7 +++++++
- libgammu/misc/misc.c                 |    4 ++++
- smsd/services/sql.c                  |    4 ++++
- 4 files changed, 25 insertions(+), 0 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3460c1c..899ad86 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -295,6 +295,16 @@ int main(void) {
- "  HAVE_STRUCT_TM_TM_ZONE)
- 
- check_c_source_compiles ("
-+#include <time.h>
-+
-+int main(void) {
-+    struct tm tm;
-+	tm.tm_isdst	= daylight;
-+    return 0;
-+}
-+"  HAVE_DAYLIGHT)
-+
-+check_c_source_compiles ("
- #include <stdio.h>
- 
- int main(void) {
-diff --git a/cmake/templates/gammu-config.h.cmake b/cmake/templates/gammu-config.h.cmake
-index 7c106ab..9a91aa0 100644
---- cmake/templates/gammu-config.h.cmake
-+++ cmake/templates/gammu-config.h.cmake
-@@ -325,6 +325,13 @@
- #endif
- 
- /**
-+ * daylight variable
-+ */
-+#ifndef HAVE_DAYLIGHT
-+#cmakedefine HAVE_DAYLIGHT
-+#endif
-+
-+/**
-  * __FUNC__ support
-  */
- #cmakedefine HAVE_MACRO_FUNC
-diff --git a/libgammu/misc/misc.c b/libgammu/misc/misc.c
-index 03d7687..9e1e96b 100644
---- libgammu/misc/misc.c
-+++ libgammu/misc/misc.c
-@@ -194,7 +194,11 @@ time_t Fill_Time_T(GSM_DateTime DT)
- 
- 	tzset();
- 
-+#ifdef HAVE_DAYLIGHT
- 	tm_starttime.tm_isdst	= daylight;
-+#else
-+	tm_starttime.tm_isdst	= -1;
-+#endif
- #ifdef HAVE_STRUCT_TM_TM_ZONE
- 	/* No time zone information */
- 	tm_starttime.tm_gmtoff = timezone;
-diff --git a/smsd/services/sql.c b/smsd/services/sql.c
-index f10cd14..909dc4d 100644
---- smsd/services/sql.c
-+++ smsd/services/sql.c
-@@ -1186,7 +1186,11 @@ time_t SMSDSQL_ParseDate(GSM_SMSDConfig * Config, const char *date)
- 
- 	tzset();
- 
-+#ifdef HAVE_DAYLIGHT
- 	timestruct.tm_isdst	= daylight;
-+#else
-+	timestruct.tm_isdst	= -1;
-+#endif
- #ifdef HAVE_STRUCT_TM_TM_ZONE
- 	/* No time zone information */
- 	timestruct.tm_gmtoff = timezone;
--- 
-1.6.1
-
diff --git a/comms/gammu/files/patch-glibc-1.diff b/comms/gammu/files/patch-glibc-1.diff
deleted file mode 100644
index bb828cf3b838..000000000000
--- a/comms/gammu/files/patch-glibc-1.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-From 4ab7023f615686f61d804bd5a90f5bb68b1b4fdc Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
-Date: Fri, 28 Jan 2011 14:52:09 +0100
-Subject: [PATCH] Improve searching for glib/gobject.
-
----
- cmake/FindGlib.cmake    |   36 +++++++++++++++++++++++++++++++-----
- cmake/FindGobject.cmake |   34 +++++++++++++++++++++++++++-------
- 2 files changed, 58 insertions(+), 12 deletions(-)
-
-diff --git a/cmake/FindGlib.cmake b/cmake/FindGlib.cmake
-index 1a75a93..9bdee14 100644
---- cmake/FindGlib.cmake
-+++ cmake/FindGlib.cmake
-@@ -1,7 +1,24 @@
--pkg_check_modules(GLIB glib-2.0)
-+pkg_check_modules(GLIB_PKG glib-2.0)
- 
--# Find Glib even if pkg-config is not working (eg. cross compiling to Windows)
--if (NOT GLIB_FOUND)
-+if (GLIB_PKG_FOUND)
-+    find_path(GLIB_INCLUDE_DIR  NAMES glib.h PATH_SUFFIXES glib-2.0
-+       PATHS
-+       ${GLIB_PKG_INCLUDE_DIRS}
-+       /usr/include/glib-2.0
-+       /usr/include
-+       /usr/local/include
-+    )
-+    find_path(GLIB_CONFIG_INCLUDE_DIR NAMES glibconfig.h PATHS ${GLIB_PKG_LIBDIR} PATH_SUFFIXES glib-2.0/include)
-+
-+    find_library(GLIB_LIBRARIES NAMES glib-2.0
-+       PATHS
-+       ${GLIB_PKG_LIBRARY_DIRS}
-+       /usr/lib
-+       /usr/local/lib
-+    )
-+
-+else (GLIB_PKG_FOUND)
-+    # Find Glib even if pkg-config is not working (eg. cross compiling to Windows)
-     find_library(GLIB_LIBRARIES NAMES glib-2.0)
-     string (REGEX REPLACE "/[^/]*$" "" GLIB_LIBRARIES_DIR ${GLIB_LIBRARIES})
- 
-@@ -9,7 +26,16 @@ if (NOT GLIB_FOUND)
-     find_path(GLIB_CONFIG_INCLUDE_DIR NAMES glibconfig.h PATHS ${GLIB_LIBRARIES_DIR} PATH_SUFFIXES glib-2.0/include)
- 
-     if (GLIB_INCLUDE_DIR AND GLIB_CONFIG_INCLUDE_DIR AND GLIB_LIBRARIES)
--        set(GLIB_FOUND TRUE)
-         set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIB_CONFIG_INCLUDE_DIR})
-     endif (GLIB_INCLUDE_DIR AND GLIB_CONFIG_INCLUDE_DIR AND GLIB_LIBRARIES)
--endif (NOT GLIB_FOUND)
-+endif (GLIB_PKG_FOUND)
-+
-+if(GLIB_INCLUDE_DIR AND GLIB_LIBRARIES)
-+   set(GLIB_FOUND TRUE CACHE INTERNAL "glib-2.0 found")
-+   message(STATUS "Found glib-2.0: ${GLIB_INCLUDE_DIR}, ${GLIB_LIBRARIES}")
-+else(GLIB_INCLUDE_DIR AND GLIB_LIBRARIES)
-+   set(GLIB_FOUND FALSE CACHE INTERNAL "glib-2.0 found")
-+   message(STATUS "glib-2.0 not found.")
-+endif(GLIB_INCLUDE_DIR AND GLIB_LIBRARIES)
-+
-+mark_as_advanced(GLIB_INCLUDE_DIR GLIB_LIBRARIES)
-diff --git a/cmake/FindGobject.cmake b/cmake/FindGobject.cmake
-index 5312be7..586c8a2 100644
---- cmake/FindGobject.cmake
-+++ cmake/FindGobject.cmake
-@@ -1,12 +1,32 @@
--pkg_check_modules(GOBJECT gobject-2.0)
-+pkg_check_modules(GOBJECT_PKG gobject-2.0)
- 
--# Find Gobject even if pkg-config is not working (eg. cross compiling to Windows)
--if (NOT GOBJECT_FOUND)
-+if (GOBJECT_PKG_FOUND)
-+    find_path(GOBJECT_INCLUDE_DIR  NAMES glib-object.h PATH_SUFFIXES glib-2.0
-+       PATHS
-+       ${GOBJECT_PKG_INCLUDE_DIRS}
-+       /usr/include/glib-2.0
-+       /usr/include
-+       /usr/local/include
-+    )
-+    find_library(GOBJECT_LIBRARIES NAMES gobject-2.0
-+       PATHS
-+       ${GOBJECT_PKG_LIBRARY_DIRS}
-+       /usr/lib
-+       /usr/local/lib
-+    )
-+else (GOBJECT_PKG_FOUND)
-+    # Find Gobject even if pkg-config is not working (eg. cross compiling to Windows)
-     find_path(GOBJECT_INCLUDE_DIRS NAMES glib-object.h PATH_SUFFIXES glib-2.0)
- 
-     find_library(GOBJECT_LIBRARIES NAMES gobject-2.0)
--    if (GOBJECT_INCLUDE_DIRS AND GOBJECT_LIBRARIES)
--        set(GOBJECT_FOUND TRUE)
--    endif (GOBJECT_INCLUDE_DIRS AND GOBJECT_LIBRARIES)
--endif (NOT GOBJECT_FOUND)
-+endif (GOBJECT_PKG_FOUND)
- 
-+if(GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
-+   set(GOBJECT_FOUND TRUE CACHE INTERNAL "gobject-2.0 found")
-+   message(STATUS "Found gobject-2.0: ${GOBJECT_INCLUDE_DIR}, ${GOBJECT_LIBRARIES}")
-+else(GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
-+   set(GOBJECT_FOUND FALSE CACHE INTERNAL "gobject-2.0 found")
-+   message(STATUS "gobject-2.0 not found.")
-+endif(GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
-+
-+mark_as_advanced(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES)
--- 
-1.6.1
-
diff --git a/comms/gammu/files/patch-glibc-2.diff b/comms/gammu/files/patch-glibc-2.diff
deleted file mode 100644
index ac9357290d35..000000000000
--- a/comms/gammu/files/patch-glibc-2.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9d71b23a73186aad73453973e05a94fb36e16f4f Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
-Date: Fri, 28 Jan 2011 16:08:32 +0100
-Subject: [PATCH] Properly handle need for two include dirs for glib.
-
-The second use is used for glibconfig.h.
----
- cmake/FindGlib.cmake |   15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/cmake/FindGlib.cmake b/cmake/FindGlib.cmake
-index 9bdee14..f1986c9 100644
---- cmake/FindGlib.cmake
-+++ cmake/FindGlib.cmake
-@@ -25,17 +25,18 @@ else (GLIB_PKG_FOUND)
-     find_path(GLIB_INCLUDE_DIR NAMES glib.h PATH_SUFFIXES glib-2.0)
-     find_path(GLIB_CONFIG_INCLUDE_DIR NAMES glibconfig.h PATHS ${GLIB_LIBRARIES_DIR} PATH_SUFFIXES glib-2.0/include)
- 
--    if (GLIB_INCLUDE_DIR AND GLIB_CONFIG_INCLUDE_DIR AND GLIB_LIBRARIES)
--        set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIB_CONFIG_INCLUDE_DIR})
--    endif (GLIB_INCLUDE_DIR AND GLIB_CONFIG_INCLUDE_DIR AND GLIB_LIBRARIES)
- endif (GLIB_PKG_FOUND)
- 
--if(GLIB_INCLUDE_DIR AND GLIB_LIBRARIES)
-+if (GLIB_INCLUDE_DIR AND GLIB_CONFIG_INCLUDE_DIR AND GLIB_LIBRARIES)
-+    set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIB_CONFIG_INCLUDE_DIR})
-+endif (GLIB_INCLUDE_DIR AND GLIB_CONFIG_INCLUDE_DIR AND GLIB_LIBRARIES)
-+
-+if(GLIB_INCLUDE_DIRS AND GLIB_LIBRARIES)
-    set(GLIB_FOUND TRUE CACHE INTERNAL "glib-2.0 found")
-    message(STATUS "Found glib-2.0: ${GLIB_INCLUDE_DIR}, ${GLIB_LIBRARIES}")
--else(GLIB_INCLUDE_DIR AND GLIB_LIBRARIES)
-+else(GLIB_INCLUDE_DIRS AND GLIB_LIBRARIES)
-    set(GLIB_FOUND FALSE CACHE INTERNAL "glib-2.0 found")
-    message(STATUS "glib-2.0 not found.")
--endif(GLIB_INCLUDE_DIR AND GLIB_LIBRARIES)
-+endif(GLIB_INCLUDE_DIRS AND GLIB_LIBRARIES)
- 
--mark_as_advanced(GLIB_INCLUDE_DIR GLIB_LIBRARIES)
-+mark_as_advanced(GLIB_INCLUDE_DIR GLIB_CONFIG_INCLUDE_DIR GLIB_INCLUDE_DIRS GLIB_LIBRARIES)
--- 
-1.6.1
-
diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist
index 074024ae9091..fae5ddbc81a2 100644
--- a/comms/gammu/pkg-plist
+++ b/comms/gammu/pkg-plist
@@ -32,10 +32,17 @@ 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
+lib/libGammu.so
+lib/libGammu.so.7
+lib/libGammu.so.7.1.30.0
+lib/libgsmsd.so
+lib/libgsmsd.so.7
+lib/libgsmsd.so.7.1.30.0
+share/gammu/gnapplet.ini
+share/gammu/gnapplet.sis
+share/gammu/series60-remote.sis
 share/locale/af/LC_MESSAGES/gammu.mo
 share/locale/af/LC_MESSAGES/libgammu.mo
 share/locale/ar/LC_MESSAGES/gammu.mo
@@ -118,5 +125,6 @@ share/locale/zh_TW/LC_MESSAGES/libgammu.mo
 %%PYTHON_SITELIBDIR%%/gammu/worker.pyo
 @dirrmtry share/locale/sw/LC_MESSAGES
 @dirrmtry share/locale/sw
+@dirrm share/gammu
 @dirrm include/gammu
 @dirrm %%PYTHON_SITELIBDIR%%/gammu