Update gammu and py-gammu to 1.26.0.

Memory usage was reduced. Tons of bugs were fixed. Support for
reading messages from Motorola phones was improved.
Also BlueTooth support was improved.

11 files changed, 13 insertions, 462 deletions

diff --git a/comms/gammu/Makefile.common b/comms/gammu/Makefile.common
index 7bc3aba95ab..10d1a5e803b 100644
--- a/comms/gammu/Makefile.common
+++ b/comms/gammu/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2009/08/26 22:09:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2009/09/04 23:19:58 wiz Exp $
 #
 # used by comms/gammu/Makefile
 # used by comms/py-gammu/Makefile
 
-DISTNAME=	gammu-1.25.0
+DISTNAME=	gammu-1.26.0
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://mirror.clickcreations.com/gammu/releases/ \
diff --git a/comms/gammu/PLIST b/comms/gammu/PLIST
index a6a6393d292..6749036af9f 100644
--- a/comms/gammu/PLIST
+++ b/comms/gammu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/09/04 23:19:58 wiz Exp $
 bin/gammu
 bin/gammu-config
 bin/gammu-smsd
@@ -34,11 +34,11 @@ include/gammu/gammu-unicode.h
 include/gammu/gammu-wap.h
 include/gammu/gammu.h
 lib/libGammu.so
-lib/libGammu.so.6
-lib/libGammu.so.6.${PKGVERSION}
+lib/libGammu.so.7
+lib/libGammu.so.7.${PKGVERSION}
 lib/libgsmsd.so
-lib/libgsmsd.so.6
-lib/libgsmsd.so.6.${PKGVERSION}
+lib/libgsmsd.so.7
+lib/libgsmsd.so.7.${PKGVERSION}
 lib/pkgconfig/gammu-smsd.pc
 lib/pkgconfig/gammu.pc
 man/cs/man1/gammu-config.1
@@ -166,6 +166,8 @@ share/locale/sk/LC_MESSAGES/gammu.mo
 share/locale/sk/LC_MESSAGES/libgammu.mo
 share/locale/sv/LC_MESSAGES/gammu.mo
 share/locale/sv/LC_MESSAGES/libgammu.mo
+share/locale/sw/LC_MESSAGES/gammu.mo
+share/locale/sw/LC_MESSAGES/libgammu.mo
 share/locale/zh_CN/LC_MESSAGES/gammu.mo
 share/locale/zh_CN/LC_MESSAGES/libgammu.mo
 share/locale/zh_TW/LC_MESSAGES/gammu.mo
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 019c76bf962..a114dc1e6ef 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/08/26 22:09:48 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/09/04 23:19:58 wiz Exp $
 
-SHA1 (gammu-1.25.0.tar.bz2) = 379f62217f8f26df2119c9b3204bfc126e3d2161
-RMD160 (gammu-1.25.0.tar.bz2) = 034c2a202b3a425025f13a882dfbae428d91b631
-Size (gammu-1.25.0.tar.bz2) = 1838498 bytes
-SHA1 (patch-aa) = 9e573f48c957152c7893ef05fcabad7ffa581ea0
-SHA1 (patch-ab) = 5ae2725551a1137d2b1306189ede0d52fad3ae5c
-SHA1 (patch-ac) = 5fb372f9a1c7f47773c3434daf1e059672d8de24
-SHA1 (patch-ad) = dd01c97c6a660b096a61690376a8159fd7850bbb
-SHA1 (patch-ae) = ce77e07f7de9d0efaa5d68e6a97fd4815626925d
-SHA1 (patch-af) = 28f77b55e463474f9796ce3f257c785a9755456b
-SHA1 (patch-ag) = 6849e39901f08ff402d9a43363c799cae3c6f44e
-SHA1 (patch-ah) = ac6faf3a4e2cb632d931653f736b08ac3d3f2c03
+SHA1 (gammu-1.26.0.tar.bz2) = 884e9393473cb3020fde27b1bbef869b48e60ea9
+RMD160 (gammu-1.26.0.tar.bz2) = 618e6f8d23902f06303bb6bdd3ee8a2b435ca88d
+Size (gammu-1.26.0.tar.bz2) = 2114328 bytes
diff --git a/comms/gammu/patches/patch-aa b/comms/gammu/patches/patch-aa
deleted file mode 100644
index d952616483d..00000000000
--- a/comms/gammu/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
-
-use "BSD" not "FreeBSD" for Bluetooth support.
-
-We add a check for the sdp_open() in libbluetooth as this is indicative
-of the capability to use the new service discovery API.
-
---- CMakeLists.txt.orig	2009-04-15 14:39:54.000000000 +0100
-+++ CMakeLists.txt	2009-05-22 09:46:03.000000000 +0100
-@@ -270,12 +271,12 @@
-             set(BLUETOOTH_SEARCH TRUE)
-             message(STATUS "Using BlueZ stack")
-         endif (BLUEZ_FOUND)
--        find_package (FBSDBluetooth)
--        if (FBSD_BLUE_FOUND)
-+        find_package (BSDBluetooth)
-+        if (BSD_BLUE_FOUND)
-             set(BLUETOOTH_FOUND ON)
--            set(BLUETOOTH_SEARCH FALSE)
--            message(STATUS "Using FreeBSD Bluetooth stack")
--        endif (FBSD_BLUE_FOUND)
-+	    check_library_exists(bluetooth sdp_open "" BLUETOOTH_SEARCH)
-+            message(STATUS "Using BSD Bluetooth stack")
-+        endif (BSD_BLUE_FOUND)
-         find_package (OSXBluetooth)
-         if (OSX_BLUE_FOUND)
-             set(BLUETOOTH_FOUND ON)
-@@ -360,11 +361,11 @@
-     endif (NOT "${BLUEZ_LIBRARIES}" STREQUAL "")
- endif (BLUEZ_FOUND)
- 
--if (FBSD_BLUE_FOUND)
--    if (NOT "${FBSD_BLUE_LIBRARIES}" STREQUAL "")
--        set (GAMMU_LIBS "${GAMMU_LIBS} -l${FBSD_BLUE_LIBRARIES}")
--    endif (NOT "${FBSD_BLUE_LIBRARIES}" STREQUAL "")
--endif (FBSD_BLUE_FOUND)
-+if (BSD_BLUE_FOUND)
-+    if (NOT "${BSD_BLUE_LIBRARIES}" STREQUAL "")
-+        set (GAMMU_LIBS "${GAMMU_LIBS} -l${BSD_BLUE_LIBRARIES}")
-+    endif (NOT "${BSD_BLUE_LIBRARIES}" STREQUAL "")
-+endif (BSD_BLUE_FOUND)
- 
- if (ICONV_FOUND)
-     if (NOT "${ICONV_LIBRARIES}" STREQUAL "")
diff --git a/comms/gammu/patches/patch-ab b/comms/gammu/patches/patch-ab
deleted file mode 100644
index aff4c73dc5a..00000000000
--- a/comms/gammu/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
-
-use "BSD" not "FreeBSD" for Bluetooth support.
-
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ cmake/FindBSDBluetooth.cmake	2009-05-22 09:48:26.000000000 +0100
-@@ -0,0 +1,35 @@
-+# - Finds Bluetooth library on BSD
-+# This module defines
-+#  BSD_BLUE_INCLUDE_DIR, where to find bluetooth.h
-+#  BSD_BLUE_LIBRARIES, the libraries needed to use BSD Bluetooth.
-+#  BSD_BLUE_FOUND, If false, do not try to use BSD Bluetooth.
-+#
-+# Copyright (c) 2007, Michal Cihar, <michal@cihar.com>
-+#
-+# vim: expandtab sw=4 ts=4 sts=4:
-+
-+if (NOT DEFINED BSD_BLUE_FOUND)
-+    if (NOT CROSS_MINGW)
-+        find_path(BSD_BLUE_INCLUDE_DIR NAMES bluetooth.h
-+           PATHS
-+           /usr/include
-+           /usr/local/include
-+        )
-+
-+        find_library(BSD_BLUE_LIBRARIES NAMES bluetooth
-+           PATHS
-+           /usr/lib
-+           /usr/local/lib
-+        )
-+
-+        if(BSD_BLUE_INCLUDE_DIR AND BSD_BLUE_LIBRARIES)
-+           set(BSD_BLUE_FOUND TRUE CACHE INTERNAL "BSD Bluetooth found")
-+           message(STATUS "Found BSD Bluetooth: ${BSD_BLUE_INCLUDE_DIR}, ${BSD_BLUE_LIBRARIES}")
-+        else(BSD_BLUE_INCLUDE_DIR AND BSD_BLUE_LIBRARIES)
-+           set(BSD_BLUE_FOUND FALSE CACHE INTERNAL "BSD Bluetooth found")
-+           message(STATUS "BSD Bluetooth not found.")
-+        endif(BSD_BLUE_INCLUDE_DIR AND BSD_BLUE_LIBRARIES)
-+
-+        mark_as_advanced(BSD_BLUE_INCLUDE_DIR BSD_BLUE_LIBRARIES)
-+    endif (NOT CROSS_MINGW)
-+endif (NOT DEFINED BSD_BLUE_FOUND)
diff --git a/comms/gammu/patches/patch-ac b/comms/gammu/patches/patch-ac
deleted file mode 100644
index b6a592eadde..00000000000
--- a/comms/gammu/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
-
-use "BSD" not "FreeBSD" for Bluetooth support.
-
---- cmake/templates/gammu-config.h.cmake.orig	2009-03-17 15:01:11.000000000 +0000
-+++ cmake/templates/gammu-config.h.cmake	2009-05-22 09:49:28.000000000 +0100
-@@ -322,8 +322,8 @@
- /* Do we have libusb-1.0 ? */
- #cmakedefine LIBUSB_FOUND
- 
--/* Will be used FreeBSD Bluetooth stack ? */
--#cmakedefine FBSD_BLUE_FOUND
-+/* Will be used BSD Bluetooth stack ? */
-+#cmakedefine BSD_BLUE_FOUND
- 
- /* Will be used OSX Bluetooth stack ? */
- #cmakedefine OSX_BLUE_FOUND
diff --git a/comms/gammu/patches/patch-ad b/comms/gammu/patches/patch-ad
deleted file mode 100644
index 4f7391ee8a1..00000000000
--- a/comms/gammu/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/05/25 12:50:01 wiz Exp $
-
-use "BSD" not "FreeBSD" for Bluetooth support.
-
---- libgammu/CMakeLists.txt.orig	2009-03-18 09:16:38.000000000 +0000
-+++ libgammu/CMakeLists.txt	2009-05-22 09:46:23.000000000 +0100
-@@ -76,9 +76,9 @@
- if (LIBUSB_FOUND)
-     list (APPEND LIBRARY_SRC device/usb/usb.c)
- endif (LIBUSB_FOUND)
--if (FBSD_BLUE_FOUND)
--    list (APPEND LIBRARY_SRC device/bluetoth/blue_fbsd.c)
--endif (FBSD_BLUE_FOUND)
-+if (BSD_BLUE_FOUND)
-+    list (APPEND LIBRARY_SRC device/bluetoth/blue_bsd.c)
-+endif (BSD_BLUE_FOUND)
- if (OSX_BLUE_FOUND)
-     list (APPEND LIBRARY_SRC device/bluetoth/blue_osx.c)
- endif (OSX_BLUE_FOUND)
-@@ -126,10 +126,10 @@
-     include_directories (${LIBUSB_INCLUDE_DIR})
- endif (LIBUSB_FOUND)
- 
--if (FBSD_BLUE_FOUND)
--    target_link_libraries (libGammu ${FBSD_BLUE_LIBRARIES})
--    include_directories (${FBSD_BLUE_INCLUDE_DIR})
--endif (FBSD_BLUE_FOUND)
-+if (BSD_BLUE_FOUND)
-+    target_link_libraries (libGammu ${BSD_BLUE_LIBRARIES})
-+    include_directories (${BSD_BLUE_INCLUDE_DIR})
-+endif (BSD_BLUE_FOUND)
- 
- if (OSX_BLUE_FOUND)
-     target_link_libraries (libGammu ${OSX_BLUE_LIBS})
diff --git a/comms/gammu/patches/patch-ae b/comms/gammu/patches/patch-ae
deleted file mode 100644
index cc56a4088cd..00000000000
--- a/comms/gammu/patches/patch-ae
+++ /dev/null
@@ -1,259 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/05/25 12:50:01 wiz Exp $
-
-Replace "FreeBSD" Bluetooth support with "BSD".
-This should cover NetBSD, FreeBSD, OpenBSD and DragonflyBSD at least.
-
-The BLUETOOTH_RF_SEARCHING option will only work on systems that have
-the later Service Discovery API in libbluetooth.
-
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ libgammu/device/bluetoth/blue_bsd.c	2009-05-22 09:43:12.000000000 +0100
-@@ -0,0 +1,248 @@
-+/*-
-+ * Copyright (c) 2009 Iain Hibbert
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "../../gsmstate.h"
-+
-+#ifdef GSM_ENABLE_BLUETOOTHDEVICE
-+#ifdef BSD_BLUE_FOUND
-+
-+#include <sys/socket.h>
-+#include <sys/time.h>
-+
-+#include <bluetooth.h>
-+#include <errno.h>
-+#include <netdb.h>
-+#include <sdp.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "../../gsmcomon.h"
-+#include "../devfunc.h"
-+#include "bluetoth.h"
-+
-+/*
-+ * Handle FreeBSD compatibility
-+ */
-+#ifndef BTPROTO_RFCOMM
-+#define BTPROTO_RFCOMM	BLUETOOTH_PROTO_RFCOMM
-+#define BDADDR_ANY	NG_HCI_BDADDR_ANY
-+#define sockaddr_bt	sockaddr_rfcomm
-+#define	bt_len		rfcomm_len
-+#define	bt_family	rfcomm_family
-+#define bt_channel	rfcomm_channel
-+#define bt_bdaddr	rfcomm_bdaddr
-+#endif
-+
-+static GSM_Error bluetooth_open(GSM_StateMachine *s, bdaddr_t *bdaddr, int channel)
-+{
-+	GSM_Device_BlueToothData	*d = &s->Device.Data.BlueTooth;
-+	struct sockaddr_bt 		sa;
-+	int 				fd;
-+
-+	memset(&sa, 0, sizeof(sa));
-+	sa.bt_len = sizeof(sa);
-+	sa.bt_family = AF_BLUETOOTH;
-+
-+	smprintf(s, "Connecting to RF channel %i\n", channel);
-+
-+	fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-+	if (fd < 0) {
-+		smprintf(s, "Can't create socket\n");
-+		return ERR_DEVICENODRIVER;
-+	}
-+
-+	bdaddr_copy(&sa.bt_bdaddr, BDADDR_ANY);
-+
-+	if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
-+		smprintf(s, "Can't bind socket: %s\n", strerror(errno));
-+		close(fd);
-+		return ERR_DEVICEOPENERROR;
-+	}
-+
-+	sa.bt_channel = channel;
-+	bdaddr_copy(&sa.bt_bdaddr, bdaddr);
-+
-+	if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
-+		smprintf(s, "Can't connect to %s: %s\n", bt_ntoa(bdaddr, NULL), strerror(errno));
-+		close(fd);
-+		return ERR_DEVICEOPENERROR;
-+	}
-+
-+	d->hPhone = fd;
-+    	return ERR_NONE;
-+}
-+
-+GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
-+{
-+	bdaddr_t	bdaddr;
-+	struct hostent *he = NULL;
-+
-+	if (!bt_aton(device, &bdaddr)) {
-+		if ((he = bt_gethostbyname(device)) == NULL) {
-+			smprintf(s, "%s: %s\n", device, hstrerror(h_errno));
-+			return ERR_UNKNOWN;
-+		}
-+
-+		bdaddr_copy(&bdaddr, (bdaddr_t *)he->h_addr);
-+	}
-+
-+	return bluetooth_open(s, &bdaddr, port);
-+}
-+
-+#ifdef BLUETOOTH_RF_SEARCHING
-+
-+static int bluetooth_channel(sdp_data_t *value)
-+{
-+	sdp_data_t	pdl, seq;
-+	uintmax_t	channel;
-+
-+	sdp_get_alt(value, value);	/* strip any alt container */
-+
-+	while (sdp_get_seq(value, &pdl)) {
-+		if (sdp_get_seq(&pdl, &seq)
-+		    && sdp_match_uuid16(&seq, SDP_UUID_PROTOCOL_L2CAP)
-+		    && sdp_get_seq(&pdl, &seq)
-+		    && sdp_match_uuid16(&seq, SDP_UUID_PROTOCOL_RFCOMM)
-+		    && sdp_get_uint(&seq, &channel)
-+		    && channel >= 1 && channel <= 30)
-+			return channel;
-+	}
-+
-+	return -1;
-+}
-+
-+static char *bluetooth_service(sdp_data_t *value)
-+{
-+	char		*str;
-+	size_t		len;
-+
-+	if (!sdp_get_str(value, &str, &len))
-+		return NULL;
-+
-+	return strndup(str, len);
-+}
-+
-+static GSM_Error bluetooth_search(GSM_StateMachine *s, bdaddr_t *bdaddr)
-+{
-+	sdp_data_t	rec, rsp, ssp, value;
-+	uint8_t		buf[3];
-+	uint16_t	attr;
-+	sdp_session_t	ss;
-+	int		ch, channel, sc, score;
-+	char		*sv;
-+
-+	ss = sdp_open(NULL, bdaddr);
-+	if (ss == NULL) {
-+		smprintf(s, "SDP Connection failed: %s\n", strerror(errno));
-+		return ERR_TIMEOUT;
-+	}
-+
-+	ssp.next = buf;
-+	ssp.end = buf + sizeof(buf);
-+	sdp_put_uuid16(&ssp, SDP_UUID_PROTOCOL_RFCOMM);
-+	ssp.end = ssp.next;
-+	ssp.next = buf;
-+
-+	if (!sdp_service_search_attribute(ss, &ssp, NULL, &rsp)) {
-+		smprintf(s, "SDP Service Search Attribute failed: %s\n", strerror(errno));
-+		sdp_close(ss);
-+		return ERR_UNKNOWN;
-+	}
-+
-+	channel = -1;
-+	score = 0;
-+
-+	while (sdp_get_seq(&rsp, &rec)) {
-+		ch = -1;
-+		sv = NULL;
-+
-+		while (sdp_get_attr(&rec, &attr, &value)) {
-+			switch (attr) {
-+			case SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST:
-+				ch = bluetooth_channel(&value);
-+				break;
-+
-+			case SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID + SDP_ATTR_SERVICE_NAME_OFFSET:
-+				sv = bluetooth_service(&value);
-+				break;
-+
-+			default:
-+				break;
-+			}
-+		}
-+
-+		if (ch != -1) {
-+			smprintf(s, "   Channel %i", ch);
-+			if (sv != NULL) {
-+				sc = bluetooth_checkservicename(s, sv);
-+				smprintf(s, " - \"%s\" (score=%d)", sv, sc);
-+				if (sc > score) {
-+					score = sc;
-+					channel = ch;
-+				}
-+			}
-+			smprintf(s, "\n");
-+		}
-+
-+		free(sv);
-+	}
-+
-+	sdp_close(ss);
-+
-+	if (channel == -1) {
-+		smprintf(s, "No suitable service found!\n");
-+		return ERR_NOTSUPPORTED;
-+	}
-+
-+	return bluetooth_open(s, bdaddr, channel);
-+}
-+
-+GSM_Error bluetooth_findchannel(GSM_StateMachine *s)
-+{
-+	char		*device = s->CurrentConfig->Device;
-+	bdaddr_t	bdaddr;
-+	struct hostent *he = NULL;
-+
-+	if (!bt_aton(device, &bdaddr)) {
-+		if ((he = bt_gethostbyname(device)) == NULL) {
-+			smprintf(s, "%s: %s\n", device, hstrerror(h_errno));
-+			return ERR_UNKNOWN;
-+		}
-+
-+		bdaddr_copy(&bdaddr, (bdaddr_t *)he->h_addr);
-+	}
-+
-+	return bluetooth_search(s, &bdaddr);
-+}
-+
-+#endif
-+#endif
-+#endif
-+
-+/* How should editor hadle tabs in this file? Add editor commands here.
-+ * vim: noexpandtab sw=8 ts=8 sts=8:
-+ */
diff --git a/comms/gammu/patches/patch-af b/comms/gammu/patches/patch-af
deleted file mode 100644
index b5f99aa44c7..00000000000
--- a/comms/gammu/patches/patch-af
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/05/25 12:50:01 wiz Exp $
-
-use "BSD" instead of "FreeBSD" for Bluetooth support.
-
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ libgammu/device/bluetoth/blue_bsd.h	2009-05-22 09:43:12.000000000 +0100
-@@ -0,0 +1,1 @@
-+	/* empty file */
diff --git a/comms/gammu/patches/patch-ag b/comms/gammu/patches/patch-ag
deleted file mode 100644
index 1adffd3b9b9..00000000000
--- a/comms/gammu/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/05/25 12:50:01 wiz Exp $
-
-use "BSD" instead of "FreeBSD" for Bluetooth support.
-
---- libgammu/device/bluetoth/bluetoth.c.orig	2009-02-12 14:19:01.000000000 +0000
-+++ libgammu/device/bluetoth/bluetoth.c	2009-05-22 09:44:29.000000000 +0100
-@@ -21,8 +21,8 @@
- #ifdef BLUEZ_FOUND
- #  include "bluez.h"
- #endif
--#ifdef FBSD_BLUE_FOUND
--#  include "blue_fbsd.h"
-+#ifdef BSD_BLUE_FOUND
-+#  include "blue_bsd.h"
- #endif
- #ifdef OSX_BLUE_FOUND
- #  include "blue_osx.h"
diff --git a/comms/gammu/patches/patch-ah b/comms/gammu/patches/patch-ah
deleted file mode 100644
index 6511f4640b7..00000000000
--- a/comms/gammu/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/08/26 22:09:48 wiz Exp $
-
-https://bugs.cihar.com/view.php?id=981
-
---- libgammu/phone/at/atgen.c.orig	2009-07-09 07:15:17.000000000 +0000
-+++ libgammu/phone/at/atgen.c
-@@ -2205,12 +2205,11 @@ GSM_Error ATGEN_PrivSetDateTime(GSM_Stat
- 	if (error == ERR_UNKNOWN) error = ERR_NOTSUPPORTED;
- 
- 	if (set_timezone && (
--		(error == ERR_INVALIDDATA
--		&& s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_CMEError
-+		s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_CMEError
-+		&& ((error == ERR_INVALIDDATA
- 		&& s->Phone.Data.Priv.ATGEN.ErrorCode == 24) ||
- 		(error == ERR_INVALIDLOCATION
--		&& s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_CMEError
--		&& s->Phone.Data.Priv.ATGEN.ErrorCode == 21)
-+		&& s->Phone.Data.Priv.ATGEN.ErrorCode == 21))
- 		)) {
- 		/*
- 		 * Some firmwares of Ericsson R320s don't like the timezone part,