Update comms/gammu to gammu-1.36.4.

ok wiz@.

pkgsrc changes:
 * Now comms/gammu depends on devel/libusb1 (instead of devel/libusb)
 * Get rid of Makefile.common: it is no more needed now that comms/py-gammu is
   distribuited also upstream as a separate package.

Changes:
20150814 - 1.36.4

[-] * Use advisory locking to prevent two Gammu instances share one device.
[!] * Include child process stdout and stderr in SMSD logs to ease debugging.
[-] * Fix string quoting with ODBC driver.
[+] * Added RunOnSent option to SMSD.
[+] * Store message reference in outbox in files SMSD.
[-] * Improved C API documentation in manual.

20150707 - 1.36.3

[-] * Updated list of GSM country codes and networks.
[-] * Fixed bash completition install path (Ville Skyttä).
[-] * Better logging of delivery report failures in SMSD.
[-] * Improved support for Huawei E3372.

20150615 - 1.36.2

[-] * Fixed compilation using MSVC.
[-] * Fix siemenssatnetmon (Daniel Glöckner).
[-] * Documentation improvements.
[-] * Fixed smsd startup with non existing folders.
[-] * Fixed possible stack overflows on Windows.

20150520 - 1.36.1

[-] * Compatibility with libdbi from git.
[-] * Fix siemenssatnetmon (Daniel Glöckner).
[-] * Fixed reconnecting to SQL server.
[+] * Don't split a surrogate pair between message segments (David Brown).

20150413 - 1.36.0

[!] * The python-gammu module is now shipped separately.
[!] * Removed usage of __TIME__ and __DATE__ macros in codebase.
[-] * Fixed encoding of special chars to iCalendar format.
[-] * Fixed decoding of priority from vTODO.
[-] * Avoid infinite loops with ignored messages.
[-] * Improved stability of checking phone SMS memory.
[-] * Fixed parsing of some backup files.

20150302 - 1.35.0

[-] * Fixed encoding of UTF-8 for higher code points.
[-] * Improved provided udev rules.
[-] * Fixed possible lock while getting network status in SMSD.
[-] * Various localization updates.

20141230 - 1.34.0

[+] * Add phone power ON/OFF function.
[!] * Removed deprecated Python modules gammu.Data and gammu.Worker.
[+] * Store network name and code in SMSD tables.
[-] * Fixed build with recent clang compiler.
[-] * Fixed several possible issues found by Coverity scan.
[-] * Fixed possible crash on SMSD startup.
[-] * Fixed decoding unicode SMS messages.
[-] * Added identification for several Nokia phones.
[-] * Fixed compilation issues on various platforms.
[-] * SMSD now honors loglevel for all logging targets.
[+] * SMSD can automatically hangup incoming calls.
[-] * Correctly detect Network errors.

7 files changed, 35 insertions, 52 deletions

diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index d12e3094d13..979b0c4572a 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2015/08/01 15:40:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.14 2015/08/17 16:42:53 leot Exp $
 #
 
-.include "Makefile.common"
-
-PKGREVISION=	1
+DISTNAME=	gammu-1.36.4
+CATEGORIES=	comms
+MASTER_SITES=	http://dl.cihar.com/gammu/releases/
+EXTRACT_SUFX=	.tar.bz2
 
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://wammu.eu/gammu/
 COMMENT=	Command line utility and library to work with mobile phones
+LICENSE=	gnu-gpl-v2
 
 # cmake tests for it; unclear for what it would be used
 #BUILD_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
@@ -15,8 +19,6 @@ DEPENDS+=	dialog-[0-9]*:../../misc/dialog
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=	-DINSTALL_MAN_DIR:STRING=${PKGMANDIR}
-# see py-gammu:
-CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=OFF
 # make sure some optional dependencies are not found:
 CMAKE_ARGS+=	-DWITH_MySQL:BOOL=OFF
 CMAKE_ARGS+=	-DWITH_Postgres:BOOL=OFF
@@ -26,8 +28,8 @@ CMAKE_ARGS+=	-DBASH_BIN:FILEPATH=
 #CMAKE_ARGS+=	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
 # silence warning
-CMAKE_ARGS+=    -Wno-dev
-CMAKE_ARGS+=    -DINSTALL_DOC=ON
+CMAKE_ARGS+=	-Wno-dev
+CMAKE_ARGS+=	-DINSTALL_DOC=ON
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash:run msgfmt
@@ -38,11 +40,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 
 LDFLAGS.SunOS+=	-lintl
 
-# Remove garbage under PaxHeaders.* directory
-post-install:
-	(cd ${DESTDIR}${PREFIX}/share/doc/gammu/manual; ${RM} -r */PaxHeaders*)
-
 .include "../../databases/unixodbc/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/gammu/Makefile.common b/comms/gammu/Makefile.common
deleted file mode 100644
index 2a24026a05f..00000000000
--- a/comms/gammu/Makefile.common
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.common,v 1.9 2014/11/23 09:46:49 mef Exp $
-#
-# used by comms/gammu/Makefile
-# used by comms/py-gammu/Makefile
-
-DISTNAME=	gammu-1.33.0
-CATEGORIES=	comms
-MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
-		http://dl.cihar.com.nyud.net/gammu/releases/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://wammu.eu/gammu/
-LICENSE=	gnu-gpl-v2
diff --git a/comms/gammu/PLIST b/comms/gammu/PLIST
index b17c51bbfe6..8deacc89cd5 100644
--- a/comms/gammu/PLIST
+++ b/comms/gammu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/11/23 09:46:49 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/08/17 16:42:53 leot Exp $
 bin/gammu
 bin/gammu-config
 bin/gammu-smsd
@@ -63,7 +63,7 @@ man/man7/gammu-smsd-sql.7
 man/man7/gammu-smsd-tables.7
 share/doc/gammu/COPYING
 share/doc/gammu/ChangeLog
-share/doc/gammu/README
+share/doc/gammu/README.rst
 share/doc/gammu/examples/Makefile
 share/doc/gammu/examples/config/gammurc
 share/doc/gammu/examples/config/smsdrc
@@ -92,9 +92,6 @@ share/doc/gammu/examples/smsd.c
 share/doc/gammu/examples/sql/mysql.sql
 share/doc/gammu/examples/sql/pgsql.sql
 share/doc/gammu/examples/sql/sqlite.sql
-share/doc/gammu/manual/PaxHeaders.12815/contents.rst
-share/doc/gammu/manual/PaxHeaders.12815/glossary.rst
-share/doc/gammu/manual/PaxHeaders.12815/index.rst
 share/doc/gammu/manual/c/api.rst
 share/doc/gammu/manual/c/backup.rst
 share/doc/gammu/manual/c/bitmap.rst
@@ -216,6 +213,8 @@ share/locale/ar/LC_MESSAGES/gammu.mo
 share/locale/ar/LC_MESSAGES/libgammu.mo
 share/locale/bg/LC_MESSAGES/gammu.mo
 share/locale/bg/LC_MESSAGES/libgammu.mo
+share/locale/bn/LC_MESSAGES/gammu.mo
+share/locale/bn/LC_MESSAGES/libgammu.mo
 share/locale/ca/LC_MESSAGES/gammu.mo
 share/locale/ca/LC_MESSAGES/libgammu.mo
 share/locale/cs/LC_MESSAGES/gammu.mo
diff --git a/comms/gammu/buildlink3.mk b/comms/gammu/buildlink3.mk
index 686205291e7..d73d0eb0981 100644
--- a/comms/gammu/buildlink3.mk
+++ b/comms/gammu/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/05/26 21:31:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/08/17 16:42:53 leot Exp $
 
 BUILDLINK_TREE+=	gammu
 
 .if !defined(GAMMU_BUILDLINK3_MK)
 GAMMU_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gammu+=	gammu>=1.24.0
+BUILDLINK_API_DEPENDS.gammu+=	gammu>=1.34.0
 BUILDLINK_PKGSRCDIR.gammu?=	../../comms/gammu
 
 .endif	# GAMMU_BUILDLINK3_MK
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 7052ef1736f..6bf633182cf 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2014/11/23 09:46:49 mef Exp $
+$NetBSD: distinfo,v 1.10 2015/08/17 16:42:53 leot Exp $
 
-SHA1 (gammu-1.33.0.tar.bz2) = b7ee28e7398ea578290588d94d69c295491ff86a
-RMD160 (gammu-1.33.0.tar.bz2) = c84ac1acdc9d019576447e14414de99366794942
-Size (gammu-1.33.0.tar.bz2) = 6535262 bytes
-SHA1 (patch-contrib_smscgi_sms__cgi.c) = 32316e2c4e8cfcbb850c1f2551c424a8922494e6
-SHA1 (patch-libgammu_phone_at_at-sms.c) = 05e834b5da6cebeb16d867df7059b7c715b5b676
+SHA1 (gammu-1.36.4.tar.bz2) = 118a7f9670d42b4cdc19833c9df09cc50bd54e5a
+RMD160 (gammu-1.36.4.tar.bz2) = cf609af4c4e2148bebe5d3dbeaea412163dfa754
+Size (gammu-1.36.4.tar.bz2) = 2091893 bytes
+SHA1 (patch-contrib_smscgi_sms__cgi.c) = 39598119eae4fd27d6d1844ca4a846fc79b126c1
+SHA1 (patch-libgammu_phone_at_at-sms.c) = fb9dd703f822f20efa35303b15faba482e39538c
diff --git a/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c b/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
index afba3a93fe1..479da4fe85e 100644
--- a/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
+++ b/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.2 2014/11/23 09:46:49 mef Exp $
+$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.3 2015/08/17 16:42:53 leot Exp $
 
 Fix build on SunOS.
 
---- contrib/smscgi/sms_cgi.c.orig	2009-09-08 09:57:12.000000000 +0200
-+++ contrib/smscgi/sms_cgi.c	2012-01-25 19:47:48.177845692 +0100
-@@ -26,6 +26,10 @@
- #include <signal.h>
- #include <sys/wait.h>
- 
+--- contrib/smscgi/sms_cgi.c.orig	2015-08-14 12:32:29.000000000 +0000
++++ contrib/smscgi/sms_cgi.c
+@@ -28,6 +28,10 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++ 
 +#ifdef __sun
 +#include <alloca.h>
 +#endif
-+
+ 
  #include "sms_cgi.h"
  
- /* Some systems let waitpid(2) tell callers about stopped children. */
diff --git a/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c b/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
index 49e1230c9ae..c5dc957c01d 100644
--- a/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
+++ b/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.2 2014/11/23 09:46:50 mef Exp $
+$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.3 2015/08/17 16:42:53 leot Exp $
 
 Don't use strcharnul from the helper library, it doesn't end up as PIC
 when compiled with Clang.
 
---- libgammu/phone/at/at-sms.c~	2014-11-23 18:13:31.000000000 +0900
-+++ libgammu/phone/at/at-sms.c	2014-11-23 18:15:42.000000000 +0900
+--- libgammu/phone/at/at-sms.c.orig	2015-08-14 12:32:29.000000000 +0000
++++ libgammu/phone/at/at-sms.c
 @@ -112,6 +112,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
  		if (pos_start != NULL) {
  			/* Detect which memories we can use for saving */