svn commit: r483473 - in head/comms/telldus-core: . files

[Mark Linimon]

Author: linimon
Date: Tue Oct 30 11:49:32 2018
New Revision: 483473
URL: https://svnweb.freebsd.org/changeset/ports/483473

Log:
  Fix build on gcc-based architectures.
  
  PR:		232560
  Submitted by:	Piotr Kubaj

Modified:
  head/comms/telldus-core/Makefile
  head/comms/telldus-core/files/patch-common-Socket_unix.cpp
  head/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp

Modified: head/comms/telldus-core/Makefile
==============================================================================
--- head/comms/telldus-core/Makefile	Tue Oct 30 11:46:22 2018	(r483472)
+++ head/comms/telldus-core/Makefile	Tue Oct 30 11:49:32 2018	(r483473)
@@ -17,11 +17,8 @@ LIB_DEPENDS=	libftdi.so:devel/libftdi \
 		libconfuse.so:devel/libconfuse \
 		libargp.so:devel/argp-standalone
 
-BROKEN_powerpc64=	Does not build: error: strlen was not declared in this scope
-BROKEN_sparc64=		Does not build: error: strlen was not declared in this scope
-
-USE_LDCONFIG=	yes
 USES=		cmake compiler:c++11-lang iconv:wchar_t
+USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=-DGENERATE_MAN=TRUE
 # Note: these are internal defines and shall NOT contain ${STAGEDIR}
@@ -50,7 +47,7 @@ post-patch:
 post-install:
 	cd ${STAGEDIR}${PREFIX}/etc && \
 		${MV} tellstick.conf tellstick.conf.sample
-	# This file is actually empty but allows us to simply use @sample to 
+	# This file is actually empty but allows us to simply use @sample to
 	# make sure it stays between upgrades if modified
 	cd ${STAGEDIR}/var/telldus && \
 		${MV} telldus-core.conf telldus-core.conf.sample

Modified: head/comms/telldus-core/files/patch-common-Socket_unix.cpp
==============================================================================
--- head/comms/telldus-core/files/patch-common-Socket_unix.cpp	Tue Oct 30 11:46:22 2018	(r483472)
+++ head/comms/telldus-core/files/patch-common-Socket_unix.cpp	Tue Oct 30 11:49:32 2018	(r483473)
@@ -1,6 +1,13 @@
---- common/Socket_unix.cpp
+--- common/Socket_unix.cpp.orig	2014-03-31 10:30:09 UTC
 +++ common/Socket_unix.cpp
-@@ -18,7 +18,7 @@
+@@ -12,13 +12,14 @@
+ #include <fcntl.h>
+ #include <math.h>
+ #include <string>
++#include <cstring>
+ 
+ #include "common/Socket.h"
+ #include "common/Mutex.h"
  #include "common/Strings.h"
  
  #define BUFSIZE 512
@@ -9,7 +16,7 @@
  	#define SOCK_CLOEXEC 0
  #endif
  
-@@ -128,8 +128,10 @@ std::wstring Socket::read(int timeout) {
+@@ -128,8 +129,10 @@ std::wstring Socket::read(int timeout) {
  
  void Socket::stopReadWait() {
  	TelldusCore::MutexLocker locker(&d->mutex);

Modified: head/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp
==============================================================================
--- head/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp	Tue Oct 30 11:46:22 2018	(r483472)
+++ head/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp	Tue Oct 30 11:49:32 2018	(r483473)
@@ -1,6 +1,11 @@
---- service/ConnectionListener_unix.cpp
+--- service/ConnectionListener_unix.cpp.orig	2014-03-31 10:30:09 UTC
 +++ service/ConnectionListener_unix.cpp
-@@ -17,7 +17,7 @@
+@@ -13,11 +13,12 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string>
++#include <cstring>
+ 
  #include "service/ConnectionListener.h"
  #include "common/Socket.h"