Tue Jul 31 13:13:46 2018 UTC ()
gammu: Fix build on SunOS.


(jperkin)
diff -r1.30 -r1.31 pkgsrc/comms/gammu/Makefile
diff -r1.17 -r1.18 pkgsrc/comms/gammu/distinfo
diff -r0 -r1.1 pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c
diff -r0 -r1.1 pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c
cvs diff -r1.30 -r1.31 pkgsrc/comms/gammu/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/gammu/Makefile 2018/05/16 08:23:29 1.30
+++ pkgsrc/comms/gammu/Makefile 2018/07/31 13:13:46 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2018/05/16 08:23:29 leot Exp $ 1# $NetBSD: Makefile,v 1.31 2018/07/31 13:13:46 jperkin Exp $
2# 2#
3 3
4DISTNAME= gammu-1.39.0 4DISTNAME= gammu-1.39.0
5CATEGORIES= comms 5CATEGORIES= comms
6MASTER_SITES= http://dl.cihar.com/gammu/releases/ 6MASTER_SITES= http://dl.cihar.com/gammu/releases/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wammu.eu/gammu/ 10HOMEPAGE= https://wammu.eu/gammu/
11COMMENT= Command line utility and library to work with mobile phones 11COMMENT= Command line utility and library to work with mobile phones
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14# cmake tests for it; unclear for what it would be used 14# cmake tests for it; unclear for what it would be used
@@ -26,26 +26,28 @@ CMAKE_ARGS+= -DWITH_LibDBI:BOOL=OFF @@ -26,26 +26,28 @@ CMAKE_ARGS+= -DWITH_LibDBI:BOOL=OFF
26CMAKE_ARGS+= -DWITH_Glib:BOOL=OFF 26CMAKE_ARGS+= -DWITH_Glib:BOOL=OFF
27# avoid installing bash completion scripts 27# avoid installing bash completion scripts
28CMAKE_ARGS+= -DBASH_BIN:FILEPATH= 28CMAKE_ARGS+= -DBASH_BIN:FILEPATH=
29#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON 29#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
30 30
31# silence warning 31# silence warning
32CMAKE_ARGS+= -Wno-dev 32CMAKE_ARGS+= -Wno-dev
33CMAKE_ARGS+= -DINSTALL_DOC=ON 33CMAKE_ARGS+= -DINSTALL_DOC=ON
34 34
35USE_LANGUAGES= c c++ 35USE_LANGUAGES= c c++
36USE_TOOLS+= bash:run msgfmt 36USE_TOOLS+= bash:run msgfmt
37REPLACE_BASH= utils/gammu-config utils/jadmaker 37REPLACE_BASH= utils/gammu-config utils/jadmaker
38 38
 39CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int32_t=uint32_t
 40
39# needed because of https://bugs.cihar.com/view.php?id=908 41# needed because of https://bugs.cihar.com/view.php?id=908
40BUILDLINK_TRANSFORM+= rm:-Werror 42BUILDLINK_TRANSFORM+= rm:-Werror
41 43
42SUBST_CLASSES+= cmakelists 44SUBST_CLASSES+= cmakelists
43SUBST_STAGE.cmakelists= pre-configure 45SUBST_STAGE.cmakelists= pre-configure
44SUBST_MESSAGE.cmakelists= Fixing CMakeLists.txt 46SUBST_MESSAGE.cmakelists= Fixing CMakeLists.txt
45SUBST_FILES.cmakelists= CMakeLists.txt 47SUBST_FILES.cmakelists= CMakeLists.txt
46SUBST_SED.cmakelists= -e 's/LIB_SUFFIX "64"/LIB_SUFFIX ""/' 48SUBST_SED.cmakelists= -e 's/LIB_SUFFIX "64"/LIB_SUFFIX ""/'
47 49
48LDFLAGS.SunOS+= -lintl 50LDFLAGS.SunOS+= -lintl
49 51
50.include "../../databases/unixodbc/buildlink3.mk" 52.include "../../databases/unixodbc/buildlink3.mk"
51.include "../../devel/libusb1/buildlink3.mk" 53.include "../../devel/libusb1/buildlink3.mk"
cvs diff -r1.17 -r1.18 pkgsrc/comms/gammu/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/gammu/distinfo 2018/05/16 08:23:29 1.17
+++ pkgsrc/comms/gammu/distinfo 2018/07/31 13:13:46 1.18
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.17 2018/05/16 08:23:29 leot Exp $ 1$NetBSD: distinfo,v 1.18 2018/07/31 13:13:46 jperkin Exp $
2 2
3SHA1 (gammu-1.39.0.tar.bz2) = fed18466f714358a9a5a04b0c421bd2e6757f6e4 3SHA1 (gammu-1.39.0.tar.bz2) = fed18466f714358a9a5a04b0c421bd2e6757f6e4
4RMD160 (gammu-1.39.0.tar.bz2) = fad2d1cd03fbdce0ee35f374a6834a9ab92c2c47 4RMD160 (gammu-1.39.0.tar.bz2) = fad2d1cd03fbdce0ee35f374a6834a9ab92c2c47
5SHA512 (gammu-1.39.0.tar.bz2) = ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797 5SHA512 (gammu-1.39.0.tar.bz2) = ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797
6Size (gammu-1.39.0.tar.bz2) = 2151226 bytes 6Size (gammu-1.39.0.tar.bz2) = 2151226 bytes
7SHA1 (patch-contrib_smscgi_sms__cgi.c) = 39598119eae4fd27d6d1844ca4a846fc79b126c1 7SHA1 (patch-contrib_smscgi_sms__cgi.c) = 39598119eae4fd27d6d1844ca4a846fc79b126c1
8SHA1 (patch-libgammu_phone_at_at-sms.c) = fb9dd703f822f20efa35303b15faba482e39538c 8SHA1 (patch-libgammu_phone_at_at-sms.c) = fb9dd703f822f20efa35303b15faba482e39538c
 9SHA1 (patch-smsd_services_pgsql.c) = 35d30183851c6d6b14e0450b59a56c858889e701
 10SHA1 (patch-smsd_services_sql.c) = 62a2c113f18d767360a598284ac1083b9abb1f29
File Added: pkgsrc/comms/gammu/patches/patch-smsd_services_pgsql.c
$NetBSD: patch-smsd_services_pgsql.c,v 1.1 2018/07/31 13:13:46 jperkin Exp $

Set _XOPEN_SOURCE correctly.

--- smsd/services/pgsql.c.orig	2018-01-05 10:14:14.000000000 +0000
+++ smsd/services/pgsql.c
@@ -1,7 +1,9 @@
 /* (c) 2006 by Andrea Riciputi */
 /* Copyright (c) 2009 - 2018 Michal Cihar <michal@cihar.com> */
 
+#if !defined(__sun)
 #define _XOPEN_SOURCE
+#endif
 #define _BSD_SOURCE
 #define _DEFAULT_SOURCE
 #include <time.h>
File Added: pkgsrc/comms/gammu/patches/patch-smsd_services_sql.c
$NetBSD: patch-smsd_services_sql.c,v 1.1 2018/07/31 13:13:46 jperkin Exp $

Set _XOPEN_SOURCE correctly.

--- smsd/services/sql.c.orig	2018-01-05 10:14:14.000000000 +0000
+++ smsd/services/sql.c
@@ -9,7 +9,9 @@
  * Licensed under GNU GPL version 2 or later
  */
 
+#if !defined(__sun)
 #define _XOPEN_SOURCE
+#endif
 #define _BSD_SOURCE
 #define _DEFAULT_SOURCE
 #include <time.h>