Date: Thu, 10 Dec 2015 07:09:46 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403443 - in head/comms/gammu: . files Message-ID: <201512100709.tBA79kiF002272@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Thu Dec 10 07:09:45 2015 New Revision: 403443 URL: https://svnweb.freebsd.org/changeset/ports/403443 Log: Upgrade to 1.36.8. Added: head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c (contents, props changed) head/comms/gammu/files/patch-libgammu_device_devfunc.c (contents, props changed) head/comms/gammu/files/patch-libgammu_service_gsmmisc.c (contents, props changed) Deleted: head/comms/gammu/files/patch-bluetooth head/comms/gammu/files/patch-common.device.devfunc.c head/comms/gammu/files/patch-common.service.gsmmisc.c Modified: head/comms/gammu/Makefile head/comms/gammu/distinfo head/comms/gammu/files/extra-patch-contrib_CMakeLists.txt head/comms/gammu/files/patch-CMakeLists.txt head/comms/gammu/pkg-plist Modified: head/comms/gammu/Makefile ============================================================================== --- head/comms/gammu/Makefile Thu Dec 10 06:44:55 2015 (r403442) +++ head/comms/gammu/Makefile Thu Dec 10 07:09:45 2015 (r403443) @@ -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/gamm bash_CMD= /bin/sh USE_GNOME= glib20 USE_LDCONFIG= yes +PLIST_SUB+= VERSION=${PORTVERSION} PORTDOCS= * Modified: head/comms/gammu/distinfo ============================================================================== --- head/comms/gammu/distinfo Thu Dec 10 06:44:55 2015 (r403442) +++ head/comms/gammu/distinfo Thu Dec 10 07:09:45 2015 (r403443) @@ -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 Modified: head/comms/gammu/files/extra-patch-contrib_CMakeLists.txt ============================================================================== --- head/comms/gammu/files/extra-patch-contrib_CMakeLists.txt Thu Dec 10 06:44:55 2015 (r403442) +++ head/comms/gammu/files/extra-patch-contrib_CMakeLists.txt Thu Dec 10 07:09:45 2015 (r403443) @@ -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) Modified: head/comms/gammu/files/patch-CMakeLists.txt ============================================================================== --- head/comms/gammu/files/patch-CMakeLists.txt Thu Dec 10 06:44:55 2015 (r403442) +++ head/comms/gammu/files/patch-CMakeLists.txt Thu Dec 10 07:09:45 2015 (r403443) @@ -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) Added: head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c Thu Dec 10 07:09:45 2015 (r403443) @@ -0,0 +1,66 @@ +--- 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 + ++#define BDADDR_ANY NG_HCI_BDADDR_ANY ++ + #include <stdlib.h> + #include <stdio.h> + #include <fcntl.h> +@@ -31,11 +33,7 @@ + #include <sys/socket.h> + #include <sys/time.h> + #include <unistd.h> +-#include <bluetooth/bluetooth.h> +-#include <bluetooth/rfcomm.h> +-#include <bluetooth/sdp.h> +-#include <bluetooth/sdp_lib.h> +-#include <bluetooth/hci_lib.h> ++#include <bluetooth.h> + + #include "../../gsmcomon.h" + #include "../devfunc.h" +@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac + /* Some phones need time till they are accessible after SDP browsing */ + for (tries = 0; tries < 5; tries++) { + GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth; +- struct sockaddr_rc laddr, raddr; ++ struct sockaddr_rfcomm laddr, raddr; + bdaddr_t bdaddr; + int fd; + +@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac + + smprintf(s, "Connecting to RF channel %i\n", port); + +- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); ++ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM); + if (fd < 0) { + smprintf(s, "Can't create socket\n"); + continue; + } + +- bacpy(&laddr.rc_bdaddr, BDADDR_ANY); +- laddr.rc_family = AF_BLUETOOTH; +- laddr.rc_channel = 0; ++ bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY); ++ laddr.rfcomm_family = AF_BLUETOOTH; ++ laddr.rfcomm_channel = 0; + + if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) { + smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno)); +@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac + } + + str2ba(device, &bdaddr); +- bacpy(&raddr.rc_bdaddr, &bdaddr); +- raddr.rc_family = AF_BLUETOOTH; +- raddr.rc_channel = port; ++ bacpy(&raddr.rfcomm_bdaddr, &bdaddr); ++ raddr.rfcomm_family = AF_BLUETOOTH; ++ raddr.rfcomm_channel = port; + + if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) { + smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno)); Added: head/comms/gammu/files/patch-libgammu_device_devfunc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gammu/files/patch-libgammu_device_devfunc.c Thu Dec 10 07:09:45 2015 (r403443) @@ -0,0 +1,11 @@ +--- 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> + #include <stdlib.h> ++#include <sys/stat.h> ++#include <sys/socket.h> + #ifdef WIN32 + # include <winsock2.h> + # include <io.h> Added: head/comms/gammu/files/patch-libgammu_service_gsmmisc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gammu/files/patch-libgammu_service_gsmmisc.c Thu Dec 10 07:09:45 2015 (r403443) @@ -0,0 +1,10 @@ +--- 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> + #include <sys/stat.h> ++#include <sys/socket.h> + + #include <gammu-keys.h> + #include <gammu-debug.h> Modified: head/comms/gammu/pkg-plist ============================================================================== --- head/comms/gammu/pkg-plist Thu Dec 10 06:44:55 2015 (r403442) +++ head/comms/gammu/pkg-plist Thu Dec 10 07:09:45 2015 (r403443) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512100709.tBA79kiF002272>