Upgrade to 1.36.8.

8 files changed, 26 insertions, 46 deletions

diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 283255b1d48b..912a2e7ac1c3 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gammu
-PORTVERSION=	1.33.0
-PORTREVISION=	1
+PORTVERSION=	1.36.8
 CATEGORIES=	comms
 MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
 		http://dl.cihar.com.nyud.net/gammu/releases/
@@ -26,6 +25,7 @@ SHEBANG_FILES=	utils/jadmaker utils/gammu-config
 bash_CMD=	/bin/sh
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 PORTDOCS=	*
 
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 6f2c74ea19c6..d69bf39d0885 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gammu-1.33.0.tar.gz) = f058f13662c7ab7b74113c29eca44e57591ba31550ac22bf624a4bb3326d9a3d
-SIZE (gammu-1.33.0.tar.gz) = 8489842
+SHA256 (gammu-1.36.8.tar.gz) = d393b5e6abf17484685fe1534c6af4709b9858bba595cdb0af9be002c3bd2b39
+SIZE (gammu-1.36.8.tar.gz) = 2973996
diff --git a/comms/gammu/files/extra-patch-contrib_CMakeLists.txt b/comms/gammu/files/extra-patch-contrib_CMakeLists.txt
index 4e61c160a2b0..327f38da58bf 100644
--- a/comms/gammu/files/extra-patch-contrib_CMakeLists.txt
+++ b/comms/gammu/files/extra-patch-contrib_CMakeLists.txt
@@ -1,6 +1,6 @@
---- contrib/CMakeLists.txt.orig	2011-07-30 22:17:01.433135057 +0400
-+++ contrib/CMakeLists.txt	2011-07-30 22:17:27.233149981 +0400
-@@ -10,7 +10,7 @@
+--- contrib/CMakeLists.txt.orig	2015-12-08 10:38:11 UTC
++++ contrib/CMakeLists.txt
+@@ -10,7 +10,7 @@ option(INSTALL_MEDIA "Install sample med
  option(INSTALL_PHP_EXAMPLES "Install PHP example scripts" ON)
  
  if (BASH_BIN)
diff --git a/comms/gammu/files/patch-CMakeLists.txt b/comms/gammu/files/patch-CMakeLists.txt
index 2bcf8649f6ea..f4a9305afaa4 100644
--- a/comms/gammu/files/patch-CMakeLists.txt
+++ b/comms/gammu/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2011-12-21 17:25:37.000000000 +0400
-+++ CMakeLists.txt	2011-12-23 14:57:04.447118270 +0400
-@@ -120,7 +120,7 @@
+--- CMakeLists.txt.orig	2015-12-08 10:38:11 UTC
++++ CMakeLists.txt
+@@ -116,7 +116,7 @@ check_symbol_exists (getpwnam "pwd.h" HA
  check_symbol_exists (getgrnam "grp.h" HAVE_GETGRNAM)
  check_symbol_exists (getpwuid "pwd.h" HAVE_GETPWUID)
  check_symbol_exists (getuid "unistd.h" HAVE_GETUID)
@@ -9,7 +9,7 @@
  check_symbol_exists (setuid "unistd.h" HAVE_SETUID)
  check_symbol_exists (setgid "unistd.h" HAVE_SETGID)
  check_symbol_exists (SIGHUP "signal.h" HAVE_SIGHUP)
-@@ -656,7 +656,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
+@@ -590,7 +590,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
  set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
  mark_as_advanced (INSTALL_DOC_DIR)
  
diff --git a/comms/gammu/files/patch-bluetooth b/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c
index 9ba26499c15a..ae17d6cd568b 100644
--- a/comms/gammu/files/patch-bluetooth
+++ b/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c
@@ -1,5 +1,5 @@
---- libgammu/device/bluetoth/bluez.c.orig	2011-12-21 17:25:37.000000000 +0400
-+++ libgammu/device/bluetoth/bluez.c	2011-12-23 15:05:14.498122134 +0400
+--- libgammu/device/bluetoth/bluez.c.orig	2015-12-08 10:38:12 UTC
++++ libgammu/device/bluetoth/bluez.c
 @@ -23,6 +23,8 @@
  #ifdef GSM_ENABLE_BLUETOOTHDEVICE
  #ifdef BLUEZ_FOUND
diff --git a/comms/gammu/files/patch-common.device.devfunc.c b/comms/gammu/files/patch-libgammu_device_devfunc.c
index 9de9b4827fe5..8d99010a7049 100644
--- a/comms/gammu/files/patch-common.device.devfunc.c
+++ b/comms/gammu/files/patch-libgammu_device_devfunc.c
@@ -1,5 +1,5 @@
---- libgammu/device/devfunc.c.orig	2010-07-12 15:51:05.000000000 +0400
-+++ libgammu/device/devfunc.c	2011-01-28 13:21:17.938543134 +0300
+--- libgammu/device/devfunc.c.orig	2015-12-08 10:38:12 UTC
++++ libgammu/device/devfunc.c
 @@ -15,6 +15,8 @@
  #include <string.h>
  #include <fcntl.h>
diff --git a/comms/gammu/files/patch-common.service.gsmmisc.c b/comms/gammu/files/patch-libgammu_service_gsmmisc.c
index 2654e3a8ba91..93e3a4d10008 100644
--- a/comms/gammu/files/patch-common.service.gsmmisc.c
+++ b/comms/gammu/files/patch-libgammu_service_gsmmisc.c
@@ -1,5 +1,5 @@
---- libgammu/service/gsmmisc.c.orig	2010-07-12 15:51:05.000000000 +0400
-+++ libgammu/service/gsmmisc.c	2011-01-28 13:21:17.940543932 +0300
+--- libgammu/service/gsmmisc.c.orig	2015-12-08 10:38:12 UTC
++++ libgammu/service/gsmmisc.c
 @@ -5,6 +5,7 @@
  #include <string.h>
  #include <stdlib.h>
diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist
index 97f48f83a461..fb1704dc5aec 100644
--- a/comms/gammu/pkg-plist
+++ b/comms/gammu/pkg-plist
@@ -33,14 +33,14 @@ include/gammu/gammu-types.h
 include/gammu/gammu-unicode.h
 include/gammu/gammu-wap.h
 include/gammu/gammu.h
-libdata/pkgconfig/gammu.pc
-libdata/pkgconfig/gammu-smsd.pc
 lib/libGammu.so
 lib/libGammu.so.7
-lib/libGammu.so.7.1.33.0
+lib/libGammu.so.7.%%VERSION%%
 lib/libgsmsd.so
 lib/libgsmsd.so.7
-lib/libgsmsd.so.7.1.33.0
+lib/libgsmsd.so.7.%%VERSION%%
+libdata/pkgconfig/gammu.pc
+libdata/pkgconfig/gammu-smsd.pc
 man/man1/gammu-config.1.gz
 man/man1/gammu-detect.1.gz
 man/man1/gammu-smsd-inject.1.gz
@@ -61,15 +61,17 @@ man/man7/gammu-smsd-pgsql.7.gz
 man/man7/gammu-smsd-run.7.gz
 man/man7/gammu-smsd-sql.7.gz
 man/man7/gammu-smsd-tables.7.gz
-share/gammu/gammu-s60-remote.sis
-share/gammu/gnapplet.ini
-share/gammu/gnapplet.sis
+%%DATADIR%%/gammu-s60-remote.sis
+%%DATADIR%%/gnapplet.ini
+%%DATADIR%%/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/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
@@ -126,25 +128,3 @@ share/locale/zh_CN/LC_MESSAGES/gammu.mo
 share/locale/zh_CN/LC_MESSAGES/libgammu.mo
 share/locale/zh_TW/LC_MESSAGES/gammu.mo
 share/locale/zh_TW/LC_MESSAGES/libgammu.mo
-%%PYTHON_SITELIBDIR%%/gammu/__init__.py
-%%PYTHON_SITELIBDIR%%/gammu/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gammu/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gammu/_gammu.so
-%%PYTHON_SITELIBDIR%%/gammu/Data.py
-%%PYTHON_SITELIBDIR%%/gammu/Data.pyc
-%%PYTHON_SITELIBDIR%%/gammu/Data.pyo
-%%PYTHON_SITELIBDIR%%/gammu/Worker.py
-%%PYTHON_SITELIBDIR%%/gammu/Worker.pyc
-%%PYTHON_SITELIBDIR%%/gammu/Worker.pyo
-%%PYTHON_SITELIBDIR%%/gammu/data.py
-%%PYTHON_SITELIBDIR%%/gammu/data.pyc
-%%PYTHON_SITELIBDIR%%/gammu/data.pyo
-%%PYTHON_SITELIBDIR%%/gammu/exception.py
-%%PYTHON_SITELIBDIR%%/gammu/exception.pyc
-%%PYTHON_SITELIBDIR%%/gammu/exception.pyo
-%%PYTHON_SITELIBDIR%%/gammu/smsd.py
-%%PYTHON_SITELIBDIR%%/gammu/smsd.pyc
-%%PYTHON_SITELIBDIR%%/gammu/smsd.pyo
-%%PYTHON_SITELIBDIR%%/gammu/worker.py
-%%PYTHON_SITELIBDIR%%/gammu/worker.pyc
-%%PYTHON_SITELIBDIR%%/gammu/worker.pyo