From 53f1c4874829e9eb0c317825ccc9839952ec07d7 Mon Sep 17 00:00:00 2001 From: kirby Date: Wed, 6 Nov 2019 02:44:12 +0000 Subject: [PATCH] update to gammu-1.41.0 --- comms/gammu/Makefile | 6 +++--- comms/gammu/distinfo | 4 ++-- comms/gammu/patches/patch-CMakeLists_txt | 8 ++++---- comms/gammu/patches/patch-tests_atgen_CMakeLists_txt | 4 ++-- comms/gammu/patches/patch-utils_gammu-config | 9 --------- comms/gammu/pkg/PLIST | 4 ++-- 6 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 comms/gammu/patches/patch-utils_gammu-config diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile index b966e5376e7..76587953f01 100644 --- a/comms/gammu/Makefile +++ b/comms/gammu/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.13 2019/07/12 20:43:46 sthen Exp $ +# $OpenBSD: Makefile,v 1.14 2019/11/06 02:44:12 kirby Exp $ COMMENT = Gnu All Mobile Management Utilities -DISTNAME = gammu-1.40.0 +DISTNAME = gammu-1.41.0 SHARED_LIBS += Gammu 1.0 # 8.1 SHARED_LIBS += gsmsd 1.0 # 8.1 @@ -48,7 +48,7 @@ RUN_DEPENDS += databases/libdbi-drivers,-sqlite3 CONFIGURE_ARGS += -DMYSQL_BACKEND=ON LIB_DEPENDS += databases/mariadb RUN_DEPENDS += databases/libdbi-drivers -WANTLIB += mysqlclient +WANTLIB += mariadb .endif .if ${FLAVOR:Mpgsql} diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo index 05b9a1c9690..e83c7b05ba6 100644 --- a/comms/gammu/distinfo +++ b/comms/gammu/distinfo @@ -1,2 +1,2 @@ -SHA256 (gammu-1.40.0.tar.gz) = 3qngeS0VB2cLJP6PTi6fAGA3usTWzw39qRKcY860LyY= -SIZE (gammu-1.40.0.tar.gz) = 3076919 +SHA256 (gammu-1.41.0.tar.gz) = Ifc/PyVQ4YrYhnhdkTW61MkOalmltkiHfwULTMPS9S0= +SIZE (gammu-1.41.0.tar.gz) = 3097881 diff --git a/comms/gammu/patches/patch-CMakeLists_txt b/comms/gammu/patches/patch-CMakeLists_txt index 4eafb7c725f..baa6f5b989c 100644 --- a/comms/gammu/patches/patch-CMakeLists_txt +++ b/comms/gammu/patches/patch-CMakeLists_txt @@ -1,4 +1,4 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.4 2018/01/08 07:50:46 kirby Exp $ +$OpenBSD: patch-CMakeLists_txt,v 1.5 2019/11/06 02:44:12 kirby Exp $ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt @@ -12,7 +12,7 @@ Index: CMakeLists.txt option (LARGE_FILES "Support for large files" ON) if (LARGE_FILES) add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64) -@@ -116,7 +119,6 @@ endif (ENABLE_GETOPT) +@@ -118,7 +121,6 @@ endif (ENABLE_GETOPT) check_symbol_exists (daemon "unistd.h" HAVE_DAEMON_UNISTD) check_symbol_exists (daemon "stdlib.h" HAVE_DAEMON_STDLIB) check_symbol_exists (kill "signal.h" HAVE_KILL) @@ -20,7 +20,7 @@ Index: CMakeLists.txt check_symbol_exists (getpwnam "pwd.h" HAVE_GETPWNAM) check_symbol_exists (getgrnam "grp.h" HAVE_GETGRNAM) check_symbol_exists (getpwuid "pwd.h" HAVE_GETPWUID) -@@ -180,9 +182,12 @@ endif() +@@ -182,9 +184,12 @@ endif() find_package (Threads) # Packages in sources @@ -36,7 +36,7 @@ Index: CMakeLists.txt macro_optional_find_package (LibDBI) macro_optional_find_package (Libintl) macro_optional_find_package (Iconv) -@@ -471,7 +476,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_MINGW +@@ -473,7 +478,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_MINGW MACRO_TUNE_COMPILER("-Wno-pointer-sign") MACRO_TUNE_COMPILER("-Wwrite-strings") diff --git a/comms/gammu/patches/patch-tests_atgen_CMakeLists_txt b/comms/gammu/patches/patch-tests_atgen_CMakeLists_txt index 8422f2c447a..2a30959b17c 100644 --- a/comms/gammu/patches/patch-tests_atgen_CMakeLists_txt +++ b/comms/gammu/patches/patch-tests_atgen_CMakeLists_txt @@ -1,9 +1,9 @@ -$OpenBSD: patch-tests_atgen_CMakeLists_txt,v 1.1 2019/02/02 15:25:29 kirby Exp $ +$OpenBSD: patch-tests_atgen_CMakeLists_txt,v 1.2 2019/11/06 02:44:12 kirby Exp $ Index: tests/atgen/CMakeLists.txt --- tests/atgen/CMakeLists.txt.orig +++ tests/atgen/CMakeLists.txt -@@ -1,6 +1,8 @@ +@@ -3,6 +3,8 @@ project(atgen-tests C) add_library(atgen-tests STATIC test_helper.c) target_link_libraries(atgen-tests libGammu) diff --git a/comms/gammu/patches/patch-utils_gammu-config b/comms/gammu/patches/patch-utils_gammu-config deleted file mode 100644 index f5fe9cc44c2..00000000000 --- a/comms/gammu/patches/patch-utils_gammu-config +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-utils_gammu-config,v 1.1.1.1 2016/11/25 11:51:46 kirby Exp $ ---- utils/gammu-config.orig Thu May 24 22:04:53 2012 -+++ utils/gammu-config Thu May 24 22:05:11 2012 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # Gammu configuration generator - # Copyright (C) 2003 - 2009 Michal Cihar - # vim: expandtab sw=4 ts=4 sts=4: diff --git a/comms/gammu/pkg/PLIST b/comms/gammu/pkg/PLIST index 3cdefdb0c4e..10d6e660f8f 100644 --- a/comms/gammu/pkg/PLIST +++ b/comms/gammu/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2018/01/08 07:50:46 kirby Exp $ +@comment $OpenBSD: PLIST,v 1.4 2019/11/06 02:44:12 kirby Exp $ @bin bin/gammu bin/gammu-config @bin bin/gammu-detect @@ -101,7 +101,7 @@ 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/ -share/doc/gammu/examples/sql/mysql-strict.sql +share/doc/gammu/examples/sql/mysql-legacy.sql share/doc/gammu/examples/sql/mysql.sql share/doc/gammu/examples/sql/pgsql.sql share/doc/gammu/examples/sql/sqlite.sql