Index: head/comms/gammu/Makefile =================================================================== --- head/comms/gammu/Makefile (revision 426003) +++ head/comms/gammu/Makefile (revision 426004) @@ -1,48 +1,48 @@ # Created by: Kirill Bezzubets # $FreeBSD$ PORTNAME= gammu -PORTVERSION= 1.37.3 +PORTVERSION= 1.37.91 CATEGORIES= comms MASTER_SITES= http://dl.cihar.com/gammu/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= GNU All Mobile Management Utilities LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl #RUN_DEPENDS= cdialog:devel/cdialog CONFLICTS= gammu-devel-[1-9]* gammu-python-[1-9]* CMAKE_ARGS= -DINSTALL_LIBDATA_DIR:PATH=${PREFIX}/libdata USES= cmake:outsource gettext iconv pkgconfig shebangfix tar:xz SHEBANG_FILES= utils/jadmaker utils/gammu-config bash_CMD= /bin/sh USE_GNOME= glib20 USE_LDCONFIG= yes PLIST_SUB+= VERSION=${PORTVERSION} PORTDOCS= * OPTIONS_DEFINE= BASH DBI DOCS PGSQL MYSQL ODBC OPTIONS_DEFAULT= BASH OPTIONS_SUB= yes BASH_BUILD_DEPENDS= bash:shells/bash BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS} BASH_CMAKE_OFF= -DINSTALL_BASH_COMPLETION:BOOL=OFF DBI_DESC= Database support via LibDBI DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CMAKE_OFF= -DWITH_LibDBI:BOOL=OFF PGSQL_USES= pgsql PGSQL_CMAKE_OFF= -DWITH_Postgres:BOOL=OFF MYSQL_USE= mysql=yes MYSQL_CMAKE_OFF= -DWITH_MySQL:BOOL=OFF ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_CMAKE_OFF= -DWITH_ODBC:BOOL=OFF .include Index: head/comms/gammu/distinfo =================================================================== --- head/comms/gammu/distinfo (revision 426003) +++ head/comms/gammu/distinfo (revision 426004) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464169663 -SHA256 (gammu-1.37.3.tar.xz) = 63fcb78e94e1c8cff199cada3f64c694f49c1e9fe2c3f17495dc01a5e8e03a84 -SIZE (gammu-1.37.3.tar.xz) = 1665088 +TIMESTAMP = 1478878437 +SHA256 (gammu-1.37.91.tar.xz) = fb353ed465b1ae408485e55c97f3a9e910af2c271b03a5bf3aab61bb4225fe00 +SIZE (gammu-1.37.91.tar.xz) = 1675144 Index: head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c =================================================================== --- head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c (revision 426003) +++ head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c (nonexistent) @@ -1,66 +0,0 @@ ---- 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 - #include - #include -@@ -31,11 +33,7 @@ - #include - #include - #include --#include --#include --#include --#include --#include -+#include - - #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)); Property changes on: head/comms/gammu/files/patch-libgammu_device_bluetoth_bluez.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/gammu/files/patch-libgammu_device_devfunc.c =================================================================== --- head/comms/gammu/files/patch-libgammu_device_devfunc.c (revision 426003) +++ head/comms/gammu/files/patch-libgammu_device_devfunc.c (nonexistent) @@ -1,11 +0,0 @@ ---- libgammu/device/devfunc.c.orig 2015-12-08 10:38:12 UTC -+++ libgammu/device/devfunc.c -@@ -15,6 +15,8 @@ - #include - #include - #include -+#include -+#include - #ifdef WIN32 - # include - # include Property changes on: head/comms/gammu/files/patch-libgammu_device_devfunc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c =================================================================== --- head/comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c (nonexistent) +++ head/comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c (revision 426004) @@ -0,0 +1,11 @@ +--- libgammu/device/bluetooth/blue_bsd.c.orig 2016-11-12 10:13:02.619065000 +0800 ++++ libgammu/device/bluetooth/blue_bsd.c 2016-11-12 10:13:27.768173000 +0800 +@@ -10,6 +10,8 @@ + #ifdef GSM_ENABLE_BLUETOOTHDEVICE + #ifdef BSD_BLUE_FOUND + ++#define L2CAP_SOCKET_CHECKED 1 ++ + #include + #include + Property changes on: head/comms/gammu/files/patch-libgammu__device__bluetooth__blue_bsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/gammu/pkg-plist =================================================================== --- head/comms/gammu/pkg-plist (revision 426003) +++ head/comms/gammu/pkg-plist (revision 426004) @@ -1,131 +1,131 @@ bin/gammu bin/gammu-config bin/gammu-detect bin/gammu-smsd bin/gammu-smsd-inject bin/gammu-smsd-monitor bin/jadmaker %%BASH%%etc/bash_completion.d/gammu include/gammu/gammu.h include/gammu/gammu-backup.h include/gammu/gammu-bitmap.h include/gammu/gammu-calendar.h include/gammu/gammu-call.h include/gammu/gammu-callback.h include/gammu/gammu-category.h include/gammu/gammu-config.h include/gammu/gammu-datetime.h include/gammu/gammu-debug.h include/gammu/gammu-error.h include/gammu/gammu-file.h include/gammu/gammu-info.h include/gammu/gammu-inifile.h include/gammu/gammu-keys.h include/gammu/gammu-limits.h include/gammu/gammu-memory.h include/gammu/gammu-message.h include/gammu/gammu-misc.h include/gammu/gammu-nokia.h include/gammu/gammu-ringtone.h include/gammu/gammu-security.h include/gammu/gammu-settings.h include/gammu/gammu-smsd.h include/gammu/gammu-statemachine.h include/gammu/gammu-types.h include/gammu/gammu-unicode.h include/gammu/gammu-wap.h lib/libGammu.so -lib/libGammu.so.7 -lib/libGammu.so.7.%%VERSION%% +lib/libGammu.so.8 +lib/libGammu.so.8.%%VERSION%% lib/libgsmsd.so -lib/libgsmsd.so.7 -lib/libgsmsd.so.7.%%VERSION%% +lib/libgsmsd.so.8 +lib/libgsmsd.so.8.%%VERSION%% libdata/pkgconfig/gammu.pc libdata/pkgconfig/gammu-smsd.pc man/man1/gammu.1.gz man/man1/gammu-config.1.gz man/man1/gammu-detect.1.gz man/man1/gammu-smsd-inject.1.gz man/man1/gammu-smsd-monitor.1.gz man/man1/gammu-smsd.1.gz man/man1/jadmaker.1.gz man/man5/gammu-backup.5.gz man/man5/gammu-smsbackup.5.gz man/man5/gammu-smsdrc.5.gz man/man5/gammurc.5.gz man/man7/gammu-smsd-dbi.7.gz man/man7/gammu-smsd-files.7.gz man/man7/gammu-smsd-mysql.7.gz man/man7/gammu-smsd-null.7.gz man/man7/gammu-smsd-odbc.7.gz 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 %%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 share/locale/cs/LC_MESSAGES/libgammu.mo share/locale/da/LC_MESSAGES/gammu.mo share/locale/da/LC_MESSAGES/libgammu.mo 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 share/locale/et/LC_MESSAGES/libgammu.mo share/locale/fi/LC_MESSAGES/gammu.mo share/locale/fi/LC_MESSAGES/libgammu.mo share/locale/fr/LC_MESSAGES/gammu.mo share/locale/fr/LC_MESSAGES/libgammu.mo share/locale/gl/LC_MESSAGES/gammu.mo share/locale/gl/LC_MESSAGES/libgammu.mo share/locale/he/LC_MESSAGES/gammu.mo share/locale/he/LC_MESSAGES/libgammu.mo share/locale/hu/LC_MESSAGES/gammu.mo share/locale/hu/LC_MESSAGES/libgammu.mo share/locale/id/LC_MESSAGES/gammu.mo share/locale/id/LC_MESSAGES/libgammu.mo share/locale/it/LC_MESSAGES/gammu.mo share/locale/it/LC_MESSAGES/libgammu.mo share/locale/ko/LC_MESSAGES/gammu.mo share/locale/ko/LC_MESSAGES/libgammu.mo share/locale/nl/LC_MESSAGES/gammu.mo share/locale/nl/LC_MESSAGES/libgammu.mo 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 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/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 share/locale/zh_TW/LC_MESSAGES/libgammu.mo