(pkgsrc)

 - Add two CMAKE_ARGS (silence and) to maintain the similar PLIST leve
    # silence warning
    CMAKE_ARGS+=    -Wno-dev
    CMAKE_ARGS+=    -DINSTALL_DOC=ON
 - Add post-install: target to Remove PaxHeader garbage
 - Add comment on patch

(upstream) Update 1.26.1 to 1.33.0

5 files changed, 164 insertions, 60 deletions

diff --git a/comms/gammu/Makefile.common b/comms/gammu/Makefile.common
index b1a550048f6..2a24026a05f 100644
--- a/comms/gammu/Makefile.common
+++ b/comms/gammu/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2010/11/13 21:08:54 shattered Exp $
+# $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.26.1
+DISTNAME=	gammu-1.33.0
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/
diff --git a/comms/gammu/PLIST b/comms/gammu/PLIST
index 6749036af9f..b17c51bbfe6 100644
--- a/comms/gammu/PLIST
+++ b/comms/gammu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/04 23:19:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/11/23 09:46:49 mef Exp $
 bin/gammu
 bin/gammu-config
 bin/gammu-smsd
@@ -41,63 +41,40 @@ lib/libgsmsd.so.7
 lib/libgsmsd.so.7.${PKGVERSION}
 lib/pkgconfig/gammu-smsd.pc
 lib/pkgconfig/gammu.pc
-man/cs/man1/gammu-config.1
-man/cs/man1/gammu-smsd-inject.1
-man/cs/man1/gammu-smsd-monitor.1
-man/cs/man1/gammu-smsd.1
-man/cs/man1/gammu.1
-man/cs/man1/jadmaker.1
-man/cs/man5/gammu-smsdrc.5
-man/cs/man5/gammurc.5
-man/cs/man7/gammu-smsd-dbi.7
-man/cs/man7/gammu-smsd-files.7
-man/cs/man7/gammu-smsd-mysql.7
-man/cs/man7/gammu-smsd-pgsql.7
-man/cs/man7/gammu-smsd-tables.7
 man/man1/gammu-config.1
+man/man1/gammu-detect.1
 man/man1/gammu-smsd-inject.1
 man/man1/gammu-smsd-monitor.1
 man/man1/gammu-smsd.1
 man/man1/gammu.1
 man/man1/jadmaker.1
+man/man5/gammu-backup.5
+man/man5/gammu-smsbackup.5
 man/man5/gammu-smsdrc.5
 man/man5/gammurc.5
 man/man7/gammu-smsd-dbi.7
 man/man7/gammu-smsd-files.7
 man/man7/gammu-smsd-mysql.7
+man/man7/gammu-smsd-null.7
+man/man7/gammu-smsd-odbc.7
 man/man7/gammu-smsd-pgsql.7
+man/man7/gammu-smsd-run.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/SUPPORTERS
-share/doc/gammu/devel/Gammu.htm
-share/doc/gammu/devel/PORTING
-share/doc/gammu/devel/develop.txt
-share/doc/gammu/devel/examples/Makefile
-share/doc/gammu/devel/examples/phone-info.c
-share/doc/gammu/devel/examples/sms-send.c
-share/doc/gammu/devel/gammu_hints.txt
-share/doc/gammu/devel/protocol/TDMA_5120.txt
-share/doc/gammu/devel/protocol/carkit.txt
-share/doc/gammu/devel/protocol/n6110.txt
-share/doc/gammu/devel/protocol/n6510.txt
-share/doc/gammu/devel/protocol/n7110.txt
-share/doc/gammu/devel/protocol/nokia.txt
-share/doc/gammu/devel/protocol/readme
-share/doc/gammu/devel/sms/charset.txt
-share/doc/gammu/devel/sms/convert.txt
-share/doc/gammu/devel/sms/readme
-share/doc/gammu/devel/sounds/readme
-share/doc/gammu/devel/sounds/ring2.txt
+share/doc/gammu/examples/Makefile
 share/doc/gammu/examples/config/gammurc
 share/doc/gammu/examples/config/smsdrc
+share/doc/gammu/examples/custom-config.c
+share/doc/gammu/examples/long-sms.c
 share/doc/gammu/examples/media/aliens.nlm
 share/doc/gammu/examples/media/axelf.txt
+share/doc/gammu/examples/phone-info.c
 share/doc/gammu/examples/php/class_gammu/README
-share/doc/gammu/examples/php/class_gammu/class.gammu_nix_win32_v2.php
+share/doc/gammu/examples/php/class_gammu/class.gammu.php
 share/doc/gammu/examples/php/class_gammu/class.sms.gammu.php
-share/doc/gammu/examples/php/class_gammu/example_gammu_text.php
 share/doc/gammu/examples/php/smsd-mysql-admin/admin.php
 share/doc/gammu/examples/php/smsd-mysql-intergammu/config.php
 share/doc/gammu/examples/php/smsd-mysql-intergammu/funcoes/func.gammu.php
@@ -109,19 +86,134 @@ share/doc/gammu/examples/php/smsd-mysql-intergammu/proclast.sql
 share/doc/gammu/examples/php/smsd-mysql-linked/linked.php
 share/doc/gammu/examples/php/smsd-mysql-linked/linked.sql
 share/doc/gammu/examples/php/smsd-mysql-list/sms.php
+share/doc/gammu/examples/sms-read.c
+share/doc/gammu/examples/sms-send.c
+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/gammu.html
-share/doc/gammu/gammu.it.txt
-share/doc/gammu/readme.html
-share/doc/gammu/readme.it.txt
-share/doc/gammu/replace.txt
-share/doc/gammu/symbian/gnapplet.ini
-share/doc/gammu/symbian/gnapplet.sis
-share/doc/gammu/symbian/readme.txt
+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
+share/doc/gammu/manual/c/calendar.rst
+share/doc/gammu/manual/c/call.rst
+share/doc/gammu/manual/c/callback.rst
+share/doc/gammu/manual/c/category.rst
+share/doc/gammu/manual/c/datetime.rst
+share/doc/gammu/manual/c/debug.rst
+share/doc/gammu/manual/c/error.rst
+share/doc/gammu/manual/c/examples.rst
+share/doc/gammu/manual/c/file.rst
+share/doc/gammu/manual/c/hints.rst
+share/doc/gammu/manual/c/index.rst
+share/doc/gammu/manual/c/info.rst
+share/doc/gammu/manual/c/inifile.rst
+share/doc/gammu/manual/c/keys.rst
+share/doc/gammu/manual/c/limits.rst
+share/doc/gammu/manual/c/memory.rst
+share/doc/gammu/manual/c/message.rst
+share/doc/gammu/manual/c/misc.rst
+share/doc/gammu/manual/c/nokia.rst
+share/doc/gammu/manual/c/porting.rst
+share/doc/gammu/manual/c/ringtone.rst
+share/doc/gammu/manual/c/security.rst
+share/doc/gammu/manual/c/settings.rst
+share/doc/gammu/manual/c/smsd.rst
+share/doc/gammu/manual/c/statemachine.rst
+share/doc/gammu/manual/c/types.rst
+share/doc/gammu/manual/c/unicode.rst
+share/doc/gammu/manual/c/wap.rst
+share/doc/gammu/manual/config/index.rst
+share/doc/gammu/manual/contents.rst
+share/doc/gammu/manual/faq/config.rst
+share/doc/gammu/manual/faq/general.rst
+share/doc/gammu/manual/faq/index.rst
+share/doc/gammu/manual/faq/phone.rst
+share/doc/gammu/manual/faq/python.rst
+share/doc/gammu/manual/faq/smsd.rst
+share/doc/gammu/manual/formats/backup.rst
+share/doc/gammu/manual/formats/index.rst
+share/doc/gammu/manual/formats/ini.rst
+share/doc/gammu/manual/formats/smsbackup.rst
+share/doc/gammu/manual/gammu/index.rst
+share/doc/gammu/manual/glossary.rst
+share/doc/gammu/manual/index.rst
+share/doc/gammu/manual/internal/index.rst
+share/doc/gammu/manual/internal/new-phone.rst
+share/doc/gammu/manual/internal/reply.rst
+share/doc/gammu/manual/internal/state-machine.rst
+share/doc/gammu/manual/project/about.rst
+share/doc/gammu/manual/project/coding-style.rst
+share/doc/gammu/manual/project/contributing.rst
+share/doc/gammu/manual/project/directories.rst
+share/doc/gammu/manual/project/documentation.rst
+share/doc/gammu/manual/project/index.rst
+share/doc/gammu/manual/project/install.rst
+share/doc/gammu/manual/project/localization.rst
+share/doc/gammu/manual/project/motivation.rst
+share/doc/gammu/manual/project/roadmap.rst
+share/doc/gammu/manual/project/testing.rst
+share/doc/gammu/manual/project/versioning.rst
+share/doc/gammu/manual/protocol/carkit.rst
+share/doc/gammu/manual/protocol/discovering.rst
+share/doc/gammu/manual/protocol/gnapplet.rst
+share/doc/gammu/manual/protocol/index.rst
+share/doc/gammu/manual/protocol/m-obex.rst
+share/doc/gammu/manual/protocol/mtk.rst
+share/doc/gammu/manual/protocol/n6110.rst
+share/doc/gammu/manual/protocol/n6510.rst
+share/doc/gammu/manual/protocol/n7110.rst
+share/doc/gammu/manual/protocol/nokia-s40-sms.rst
+share/doc/gammu/manual/protocol/nokia.rst
+share/doc/gammu/manual/protocol/s60.rst
+share/doc/gammu/manual/protocol/samsung-gt.rst
+share/doc/gammu/manual/protocol/samsung.rst
+share/doc/gammu/manual/protocol/sonim.rst
+share/doc/gammu/manual/protocol/tdma_5120.rst
+share/doc/gammu/manual/python/data.rst
+share/doc/gammu/manual/python/examples.rst
+share/doc/gammu/manual/python/exceptions.rst
+share/doc/gammu/manual/python/gammu.rst
+share/doc/gammu/manual/python/index.rst
+share/doc/gammu/manual/python/objects.rst
+share/doc/gammu/manual/python/smsd.rst
+share/doc/gammu/manual/python/worker.rst
+share/doc/gammu/manual/smsd/backends.rst
+share/doc/gammu/manual/smsd/code.rst
+share/doc/gammu/manual/smsd/config.rst
+share/doc/gammu/manual/smsd/dbi.rst
+share/doc/gammu/manual/smsd/files.rst
+share/doc/gammu/manual/smsd/index.rst
+share/doc/gammu/manual/smsd/inject.rst
+share/doc/gammu/manual/smsd/manual.rst
+share/doc/gammu/manual/smsd/monitor.rst
+share/doc/gammu/manual/smsd/mysql.rst
+share/doc/gammu/manual/smsd/null.rst
+share/doc/gammu/manual/smsd/odbc.rst
+share/doc/gammu/manual/smsd/overview.rst
+share/doc/gammu/manual/smsd/pgsql.rst
+share/doc/gammu/manual/smsd/run.rst
+share/doc/gammu/manual/smsd/smsd.rst
+share/doc/gammu/manual/smsd/sql.rst
+share/doc/gammu/manual/smsd/tables.rst
+share/doc/gammu/manual/smsd/usage.rst
+share/doc/gammu/manual/testing/dummy-driver.rst
+share/doc/gammu/manual/testing/index.rst
+share/doc/gammu/manual/testing/testsuite.rst
+share/doc/gammu/manual/utils/gammu-config.rst
+share/doc/gammu/manual/utils/gammu-detect.rst
+share/doc/gammu/manual/utils/index.rst
+share/doc/gammu/manual/utils/jadmaker.rst
+share/gammu/gammu-s60-remote.sis
+share/gammu/gnapplet.ini
+share/gammu/gnapplet.sis
 share/locale/af/LC_MESSAGES/gammu.mo
 share/locale/af/LC_MESSAGES/libgammu.mo
+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/ca/LC_MESSAGES/gammu.mo
@@ -134,6 +226,8 @@ share/locale/de/LC_MESSAGES/gammu.mo
 share/locale/de/LC_MESSAGES/libgammu.mo
 share/locale/el/LC_MESSAGES/gammu.mo
 share/locale/el/LC_MESSAGES/libgammu.mo
+share/locale/en_GB/LC_MESSAGES/gammu.mo
+share/locale/en_GB/LC_MESSAGES/libgammu.mo
 share/locale/es/LC_MESSAGES/gammu.mo
 share/locale/es/LC_MESSAGES/libgammu.mo
 share/locale/et/LC_MESSAGES/gammu.mo
@@ -160,6 +254,8 @@ share/locale/pl/LC_MESSAGES/gammu.mo
 share/locale/pl/LC_MESSAGES/libgammu.mo
 share/locale/pt_BR/LC_MESSAGES/gammu.mo
 share/locale/pt_BR/LC_MESSAGES/libgammu.mo
+share/locale/ro/LC_MESSAGES/gammu.mo
+share/locale/ro/LC_MESSAGES/libgammu.mo
 share/locale/ru/LC_MESSAGES/gammu.mo
 share/locale/ru/LC_MESSAGES/libgammu.mo
 share/locale/sk/LC_MESSAGES/gammu.mo
@@ -168,6 +264,10 @@ 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/tr/LC_MESSAGES/gammu.mo
+share/locale/tr/LC_MESSAGES/libgammu.mo
+share/locale/uk/LC_MESSAGES/gammu.mo
+share/locale/uk/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 265f8fbcf32..7052ef1736f 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2012/07/09 19:17:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2014/11/23 09:46:49 mef Exp $
 
-SHA1 (gammu-1.26.1.tar.bz2) = 122886f29c566f72020e91da119e1e04f7bfbec6
-RMD160 (gammu-1.26.1.tar.bz2) = a913ac6c999f81ab4fda7c1656232484033ac540
-Size (gammu-1.26.1.tar.bz2) = 2113622 bytes
-SHA1 (patch-contrib_smscgi_sms__cgi.c) = c7f40671374294ce90f17541b15529ee4ee649aa
-SHA1 (patch-libgammu_phone_at_at-sms.c) = 0ffef60f4f8ab1677d807ef50f766a5141870e0f
+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
diff --git a/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c b/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
index 0af4693a8c6..afba3a93fe1 100644
--- a/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
+++ b/comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.1 2012/02/16 17:13:03 hans Exp $
+$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.2 2014/11/23 09:46:49 mef 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
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 822b63e6544..49e1230c9ae 100644
--- a/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
+++ b/comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
@@ -1,15 +1,17 @@
-$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.1 2012/07/09 19:17:52 joerg Exp $
+$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.2 2014/11/23 09:46:50 mef Exp $
 
---- libgammu/phone/at/at-sms.c.orig	2012-07-06 11:57:04.000000000 +0000
-+++ libgammu/phone/at/at-sms.c
-@@ -83,7 +83,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
- 		}
+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
+@@ -112,6 +112,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
  		if (pos_start != NULL) {
  			/* Detect which memories we can use for saving */
--			pos_end = strchrnul(pos_start + 1, ')');
+ 			pos_end = strchrnul(pos_start + 1, ')');
 +			pos_end = strchr(pos_start + 1, ')');
 +			if (pos_end == NULL)
 +				pos_end = pos_start + strlen(pos_start);
  			pos_tmp = strstr(pos_start, "\"SM\"");
+ 
  			if (pos_tmp != NULL && pos_tmp < pos_end) {
- 				s->Phone.Data.Priv.ATGEN.SIMSaveSMS = AT_AVAILABLE;