summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
Diffstat (limited to 'comms')
-rw-r--r--comms/gammu/Makefile4
-rw-r--r--comms/gammu/Makefile.common4
-rw-r--r--comms/gammu/distinfo12
-rw-r--r--comms/gammu/patches/patch-ah22
-rw-r--r--comms/gammu/patches/patch-ai14
-rw-r--r--comms/gammu/patches/patch-aj44
-rw-r--r--comms/gammu/patches/patch-ak14
7 files changed, 31 insertions, 83 deletions
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 3abca8f62b8..d7a017e6daa 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/06/02 10:23:58 hasso Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/26 22:09:48 wiz Exp $
#
.include "Makefile.common"
COMMENT= Command line utility and library to work with mobile phones
-PKGREVISION= 1
# cmake tests for it; unclear for what it would be used
#BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
@@ -24,6 +23,7 @@ CMAKE_ARGS+= -DWITH_Postgres:BOOL=OFF
CMAKE_ARGS+= -DWITH_LibDBI:BOOL=OFF
# avoid installing bash completion scripts
CMAKE_ARGS+= -DBASH_BIN:FILEPATH=
+#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run msgfmt
diff --git a/comms/gammu/Makefile.common b/comms/gammu/Makefile.common
index f806942d296..7bc3aba95ab 100644
--- a/comms/gammu/Makefile.common
+++ b/comms/gammu/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2009/06/06 22:49:45 zafer Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/08/26 22:09:48 wiz Exp $
#
# used by comms/gammu/Makefile
# used by comms/py-gammu/Makefile
-DISTNAME= gammu-1.24.0
+DISTNAME= gammu-1.25.0
CATEGORIES= comms
MASTER_SITES= http://dl.cihar.com/gammu/releases/ \
http://mirror.clickcreations.com/gammu/releases/ \
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index df4172325d5..019c76bf962 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/05/26 21:34:36 wiz Exp $
+$NetBSD: distinfo,v 1.4 2009/08/26 22:09:48 wiz Exp $
-SHA1 (gammu-1.24.0.tar.bz2) = 9c4fc7474c33d3a40e6bf5a2efb7acbbf9b62dc5
-RMD160 (gammu-1.24.0.tar.bz2) = d525fa09dbcdba87cde6730edc5b55f0f412bd31
-Size (gammu-1.24.0.tar.bz2) = 1817681 bytes
+SHA1 (gammu-1.25.0.tar.bz2) = 379f62217f8f26df2119c9b3204bfc126e3d2161
+RMD160 (gammu-1.25.0.tar.bz2) = 034c2a202b3a425025f13a882dfbae428d91b631
+Size (gammu-1.25.0.tar.bz2) = 1838498 bytes
SHA1 (patch-aa) = 9e573f48c957152c7893ef05fcabad7ffa581ea0
SHA1 (patch-ab) = 5ae2725551a1137d2b1306189ede0d52fad3ae5c
SHA1 (patch-ac) = 5fb372f9a1c7f47773c3434daf1e059672d8de24
@@ -10,6 +10,4 @@ SHA1 (patch-ad) = dd01c97c6a660b096a61690376a8159fd7850bbb
SHA1 (patch-ae) = ce77e07f7de9d0efaa5d68e6a97fd4815626925d
SHA1 (patch-af) = 28f77b55e463474f9796ce3f257c785a9755456b
SHA1 (patch-ag) = 6849e39901f08ff402d9a43363c799cae3c6f44e
-SHA1 (patch-ai) = 1d3be730d1db223f5a1698e50ecb06ae7e4eec3e
-SHA1 (patch-aj) = db99dc9026ae8c70cf68e353f8fbd6ef8e4d20a7
-SHA1 (patch-ak) = a68617664e6c826ce8ffd0222ea6f695fc62b74d
+SHA1 (patch-ah) = ac6faf3a4e2cb632d931653f736b08ac3d3f2c03
diff --git a/comms/gammu/patches/patch-ah b/comms/gammu/patches/patch-ah
new file mode 100644
index 00000000000..6511f4640b7
--- /dev/null
+++ b/comms/gammu/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2009/08/26 22:09:48 wiz Exp $
+
+https://bugs.cihar.com/view.php?id=981
+
+--- libgammu/phone/at/atgen.c.orig 2009-07-09 07:15:17.000000000 +0000
++++ libgammu/phone/at/atgen.c
+@@ -2205,12 +2205,11 @@ GSM_Error ATGEN_PrivSetDateTime(GSM_Stat
+ if (error == ERR_UNKNOWN) error = ERR_NOTSUPPORTED;
+
+ if (set_timezone && (
+- (error == ERR_INVALIDDATA
+- && s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_CMEError
++ s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_CMEError
++ && ((error == ERR_INVALIDDATA
+ && s->Phone.Data.Priv.ATGEN.ErrorCode == 24) ||
+ (error == ERR_INVALIDLOCATION
+- && s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_CMEError
+- && s->Phone.Data.Priv.ATGEN.ErrorCode == 21)
++ && s->Phone.Data.Priv.ATGEN.ErrorCode == 21))
+ )) {
+ /*
+ * Some firmwares of Ericsson R320s don't like the timezone part,
diff --git a/comms/gammu/patches/patch-ai b/comms/gammu/patches/patch-ai
deleted file mode 100644
index e43e02e8667..00000000000
--- a/comms/gammu/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
-
-https://bugs.cihar.com/view.php?id=909
-
---- cmake/GammuTuneFlags.cmake.orig 2009-05-22 09:57:08.000000000 +0000
-+++ cmake/GammuTuneFlags.cmake
-@@ -0,0 +1,7 @@
-+macro (GAMMU_TUNE_SHARED _target)
-+ if(CMAKE_COMPILER_IS_GNUCC AND NOT (CMAKE_COMPILER_IS_MINGW OR
-+ CMAKE_COMPILER_IS_CYGWIN OR CMAKE_COMPILER_IS_GNUCXX))
-+ set_target_properties (${_target} PROPERTIES COMPILE_FLAGS -fPIC)
-+ endif(CMAKE_COMPILER_IS_GNUCC AND NOT (CMAKE_COMPILER_IS_MINGW OR
-+ CMAKE_COMPILER_IS_CYGWIN OR CMAKE_COMPILER_IS_GNUCXX))
-+endmacro (GAMMU_TUNE_SHARED)
diff --git a/comms/gammu/patches/patch-aj b/comms/gammu/patches/patch-aj
deleted file mode 100644
index 243efda9d89..00000000000
--- a/comms/gammu/patches/patch-aj
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
-
-https://bugs.cihar.com/view.php?id=909
-
---- helper/CMakeLists.txt.orig 2009-02-12 14:05:40.000000000 +0000
-+++ helper/CMakeLists.txt
-@@ -5,24 +5,30 @@
- project (gammu-helper C)
-
- include(GammuTuneCompiler)
-+include(GammuTuneFlags)
-
- include_directories (
- "${Gammu_BINARY_DIR}/include"
- )
-
- add_library(string STATIC string.c)
-+GAMMU_TUNE_SHARED(string)
-
- add_library (printing STATIC printing.c)
-+GAMMU_TUNE_SHARED(printing)
-
- add_library (memorydisplay STATIC memory-display.c)
-+GAMMU_TUNE_SHARED(memorydisplay)
- target_link_libraries (memorydisplay libGammu)
-
- add_library (messagecmdline STATIC message-cmdline.c)
-+GAMMU_TUNE_SHARED(messagecmdline)
- target_link_libraries (messagecmdline libGammu)
- target_link_libraries (messagecmdline printing)
- target_link_libraries (messagecmdline string)
-
- add_library (messagedisplay STATIC message-display.c)
-+GAMMU_TUNE_SHARED(messagedisplay)
- target_link_libraries (messagedisplay libGammu)
- target_link_libraries (messagedisplay memorydisplay)
-
-@@ -39,5 +45,6 @@ endif(WIN32 AND NOT CMAKE_COMPILER_IS_MI
-
- if (NOT HAVE_STRPTIME)
- add_library(strptime STATIC strptime.c)
-+ GAMMU_TUNE_SHARED(strptime)
- target_link_libraries (strptime string)
- endif (NOT HAVE_STRPTIME)
diff --git a/comms/gammu/patches/patch-ak b/comms/gammu/patches/patch-ak
deleted file mode 100644
index 69c90faa5ad..00000000000
--- a/comms/gammu/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2009/05/26 21:34:36 wiz Exp $
-
-https://bugs.cihar.com/view.php?id=916
-
---- python/setup.py.orig 2009-05-25 21:28:01.000000000 +0200
-+++ python/setup.py
-@@ -282,6 +282,7 @@ gammumodule = Extension('gammu._gammu',
- 'gammu/src/convertors/call.c',
- 'gammu/src/convertors/wap.c',
- 'gammu/src/gammu.c',
-+ 'gammu/src/smsd.c',
- ])
-
- setup (name = 'python-gammu',
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 14:50:01 +0000