From nobody Sun Nov 26 12:20:37 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdSVG0MTrz50kQs; Sun, 26 Nov 2023 12:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdSVF4tg7z3Pq4; Sun, 26 Nov 2023 12:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701001237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9BP+CGNXqDOLvM0QEwNEkySbDKwG2aBRdRfbXO0RBho=; b=jKxpA7Ef9ECvVi5BhuLSXhobegFpyFkscrIefw7JOAsDBb2UsVx0LS2B21/ytDMCkNhR1q ivbvubuhvP+HDt9cTwVZgsy7uH8qpT7ae8tSSEmswSEkPTZKC+EGOYwFiJ/4MDkvojEBko SAoPw7sJm70VqD12R9u9nBaj/ksNAYRv2hhmouLlsdDzXQ14/pf6OVTyTEagR4zFNQklYb ZyfNhridGDaTIu5B47xy6SvghPpGUzrLRAo6SLYUpNIuSRYZ1nMQQhsNYJtFq7nrR37kBC zASLh4cDZ6Tx52G8OnGC1uGH2eG38dZsbS09fZffCig3sRkZopvMxF+j8hSwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701001237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9BP+CGNXqDOLvM0QEwNEkySbDKwG2aBRdRfbXO0RBho=; b=TGvLtoue+Wnx94YCv9uVEt0wjx8M4qlzhZ29/LlD9V3OnHc6du1ZzSRN1WiryJ0j2Dm2QV V79rd7siCeL0/XKtQxM86P3fBNotzyqV6/6sQp11VzRA6AcQfFguNi+Re800mDIhABG1oG aT0mfl5/9AlXu4c8T0Yc1WB3ZSzwJBORVWHdIMDU2nfSZSZwif6Px7tDxL5vlO8zv3XRAU 1Rho4WtcNJTteDPugBB/uzY4k3nXMx4CwM7/buS5wtzu6pcA467H5m/DcyuaSlfNFHaJL0 1D20NaNKOClZK+iDiCsMpIVNV8h6iYLAh4yTzuZiWGwoU0dN6uYK9L6pfFboXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701001237; a=rsa-sha256; cv=none; b=cKQsNVy9nloXTuA1CRbQdSrL0cnCRUanS0H4exe8FJgQBXqIFYrIFtk29okLiCc2yClhFB IuzU9DUg8v/hPdKDLAMODY6+REP4WTctsBmDvKp1Vynn1juB8561vn06ID2zxgOfoG7BDl KpGazjLEg4Z9ZyqB5dwvE+0oU/6BGUSzO+C0JS9dc4kzuNcoW6MwTnOpLBG03Lja5vpVGU /dJZWptC8gLAEP+2NT2Bj7L1CPv0LTWxhSaLxpleZb3Mu5JgFFSuN+/QKqgzJxpZk1SrWp qJ6Y1LAbYYE9NNBKAw4Q0L2AcUkGQXUl+rvW/NPfSJWHxNYcrqTZ1WH7/rurQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdSVF3y5NzvMX; Sun, 26 Nov 2023 12:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQCKbjv055466; Sun, 26 Nov 2023 12:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQCKbFB055463; Sun, 26 Nov 2023 12:20:37 GMT (envelope-from git) Date: Sun, 26 Nov 2023 12:20:37 GMT Message-Id: <202311261220.3AQCKbFB055463@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 55660d2e5466 - main - comms/telldus-core: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55660d2e5466486b38bd437a94f5ce5d089a1e2f Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=55660d2e5466486b38bd437a94f5ce5d089a1e2f commit 55660d2e5466486b38bd437a94f5ce5d089a1e2f Author: Rene Ladan AuthorDate: 2023-11-26 12:20:16 +0000 Commit: Rene Ladan CommitDate: 2023-11-26 12:20:16 +0000 comms/telldus-core: Remove expired port 2023-11-30 comms/telldus-core: BROKEN for more than a year --- MOVED | 1 + comms/Makefile | 1 - comms/telldus-core/Makefile | 56 -------------------- comms/telldus-core/distinfo | 2 - comms/telldus-core/files/patch-CMakeLists.txt | 60 ---------------------- .../files/patch-common-Socket_unix.cpp | 31 ----------- comms/telldus-core/files/patch-common-Strings.cpp | 26 ---------- comms/telldus-core/files/patch-common-Thread.h | 12 ----- .../files/patch-service-CMakeLists.txt | 11 ---- .../patch-service-ConnectionListener_unix.cpp | 16 ------ .../files/patch-service-EventUpdateManager.cpp | 13 ----- .../files/patch-service-ProtocolNexa.cpp | 11 ---- comms/telldus-core/files/patch-service-Sensor.h | 12 ----- .../files/patch-service-SettingsConfuse.cpp | 42 --------------- .../files/patch-service-tellstick.conf | 9 ---- .../files/patch-tdadmin-CMakeLists.txt | 34 ------------ .../patch-tdadmin-freebsd-devd-tellstick.conf | 39 -------------- .../telldus-core/files/patch-tdtool-CMakeLists.txt | 11 ---- comms/telldus-core/files/pkg-message.in | 24 --------- comms/telldus-core/files/telldusd.in | 28 ---------- comms/telldus-core/pkg-descr | 7 --- comms/telldus-core/pkg-plist | 20 -------- 22 files changed, 1 insertion(+), 465 deletions(-) diff --git a/MOVED b/MOVED index 99b134606093..597791b03629 100644 --- a/MOVED +++ b/MOVED @@ -8090,3 +8090,4 @@ www/dfileserver||2023-11-22|Has expired: Obsolete, consider using www/darkhttpd devel/sdts++||2023-11-22|Has expired: Last upstream release was in 2003 and both MASTER_SITES and WWW are unreachable databases/postgis30||2023-11-22|Removed math/gri||2023-11-26|Has expired: Last upstream release was in 2012 and gnuplot generates better results +comms/telldus-core||2023-11-26|Has expired: BROKEN for more than a year diff --git a/comms/Makefile b/comms/Makefile index 0f82cb081fb3..18493b165bfc 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -193,7 +193,6 @@ SUBDIR += svxlink SUBDIR += syncterm SUBDIR += tcpser - SUBDIR += telldus-core SUBDIR += thebridge SUBDIR += tilp2 SUBDIR += tio diff --git a/comms/telldus-core/Makefile b/comms/telldus-core/Makefile deleted file mode 100644 index 03cf45d82673..000000000000 --- a/comms/telldus-core/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -PORTNAME= telldus-core -PORTVERSION= 2.1.2 -PORTREVISION= 8 -CATEGORIES= comms -MASTER_SITES= http://download.telldus.com/TellStick/Software/telldus-core/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Tellstick Telldus daemon + library -WWW= https://developer.telldus.com/wiki/TellStickInstallationSource - -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= BROKEN for more than a year -EXPIRATION_DATE= 2023-11-30 -BROKEN= does not build: 'tr1/memory' file not found - -BUILD_DEPENDS= help2man:misc/help2man -LIB_DEPENDS= libftdi.so:devel/libftdi \ - libconfuse.so:devel/libconfuse \ - libargp.so:devel/argp-standalone - -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} -CMAKE_ARGS+= -DSYSCONF_INSTALL_DIR="${PREFIX}/etc" -# Using global /var, otherwise testport complains "Warning: port uses /usr/local/var instead of /var" -CMAKE_ARGS+= -DSTATE_INSTALL_DIR="/var/telldus" -CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} -CXXFLAGS_clang= -Wno-c++11-narrowing - -MAKE_JOBS_UNSAFE= yes - -USE_RC_SUBR= telldusd - -SUB_FILES= pkg-message - -.include - -post-patch: -# remove tr1 if using libc++ -.if ${COMPILER_FEATURES:Mlibc++} - @${REINPLACE_CMD} -e 's|tr1::||' ${WRKSRC}/common/Event.h -.endif - -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 - # make sure it stays between upgrades if modified - cd ${STAGEDIR}/var/telldus && \ - ${MV} telldus-core.conf telldus-core.conf.sample - -.include diff --git a/comms/telldus-core/distinfo b/comms/telldus-core/distinfo deleted file mode 100644 index ede8d2be8e16..000000000000 --- a/comms/telldus-core/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (telldus-core-2.1.2.tar.gz) = a20f6c74814afc23312d2c93ebbb37fdea9deaaee05ae7b6a6275e11e4662014 -SIZE (telldus-core-2.1.2.tar.gz) = 169850 diff --git a/comms/telldus-core/files/patch-CMakeLists.txt b/comms/telldus-core/files/patch-CMakeLists.txt deleted file mode 100644 index 876378460f13..000000000000 --- a/comms/telldus-core/files/patch-CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -37,8 +37,18 @@ ENDIF (CMAKE_SYSTEM_NAME MATCHES "FreeBS - SET(BUILD_TDTOOL TRUE CACHE BOOL "Build tdtool") - SET(BUILD_TDADMIN ${TDADMIN_DEFAULT} CACHE BOOL "Build tdadmin") - -+SET(GENERATE_DOXYGEN FALSE CACHE BOOL "Enable generation of doxygen") - SET(GENERATE_MAN FALSE CACHE BOOL "Enable generation of man-files") - -+ -+IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ SET(MAN_DIR_DEFAULT "man") -+ELSE() -+ SET(MAN_DIR_DEFAULT "share/man") -+ENDIF() -+SET(MAN_DIR ${MAN_DIR_DEFAULT} CACHE PATH "The directory where man pages are located (related to ${CMAKE_INSTALL_PREFIX})") -+ -+ - ADD_SUBDIRECTORY(common) - ADD_SUBDIRECTORY(service) - ADD_SUBDIRECTORY(client) -@@ -56,20 +66,23 @@ ENDIF(BUILD_TDADMIN) - ENABLE_TESTING() - ADD_SUBDIRECTORY(tests) - --FIND_PACKAGE(Doxygen) -- --IF(DOXYGEN_FOUND) -- SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) -+IF (GENERATE_DOXYGEN) -+ FIND_PACKAGE(Doxygen) -+ IF(DOXYGEN_FOUND) -+ SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) - -- CONFIGURE_FILE( -- "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" -- ${DOXY_CONFIG} @ONLY -- ) -+ CONFIGURE_FILE( -+ "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" -+ ${DOXY_CONFIG} @ONLY -+ ) - -- ADD_CUSTOM_TARGET(docs -- ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG} -- DEPENDS ${DOXY_CONFIG} -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMENT "Generating doxygen documentation" VERBATIM -- ) --ENDIF() -+ ADD_CUSTOM_TARGET(docs -+ ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG} -+ DEPENDS ${DOXY_CONFIG} -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+ COMMENT "Generating doxygen documentation" VERBATIM -+ ) -+ ELSE() -+ MESSAGE("Warn: doxygen not found, wont build") -+ ENDIF() -+ENDIF(GENERATE_DOXYGEN) diff --git a/comms/telldus-core/files/patch-common-Socket_unix.cpp b/comms/telldus-core/files/patch-common-Socket_unix.cpp deleted file mode 100644 index 71fd748e224d..000000000000 --- a/comms/telldus-core/files/patch-common-Socket_unix.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- common/Socket_unix.cpp.orig 2014-03-31 10:30:09 UTC -+++ common/Socket_unix.cpp -@@ -12,13 +12,14 @@ - #include - #include - #include -+#include - - #include "common/Socket.h" - #include "common/Mutex.h" - #include "common/Strings.h" - - #define BUFSIZE 512 --#if defined(_MACOSX) && !defined(SOCK_CLOEXEC) -+#if (defined(_MACOSX) || defined (__FreeBSD__)) && !defined(SOCK_CLOEXEC) - #define SOCK_CLOEXEC 0 - #endif - -@@ -128,8 +129,10 @@ std::wstring Socket::read(int timeout) { - - void Socket::stopReadWait() { - TelldusCore::MutexLocker locker(&d->mutex); -- d->connected = false; -- // TODO(stefan): somehow signal the socket here? -+ if(d->connected && d->socket != -1) { -+ d->connected = false; -+ shutdown(d->socket, SHUT_RDWR); -+ } - } - - void Socket::write(const std::wstring &msg) { diff --git a/comms/telldus-core/files/patch-common-Strings.cpp b/comms/telldus-core/files/patch-common-Strings.cpp deleted file mode 100644 index 2f3c686c4083..000000000000 --- a/comms/telldus-core/files/patch-common-Strings.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- common/Strings.cpp.orig 2014-03-31 10:30:09 UTC -+++ common/Strings.cpp -@@ -61,11 +61,7 @@ std::wstring TelldusCore::charToWstring( - char *outString = reinterpret_cast(new wchar_t[utf8Length+1]); - memset(outString, 0, sizeof(wchar_t)*(utf8Length+1)); - --#ifdef _FREEBSD -- const char *inPointer = inString; --#else - char *inPointer = inString; --#endif - char *outPointer = outString; - - iconv_t convDesc = iconv_open(WCHAR_T_ENCODING, "UTF-8"); -@@ -206,11 +202,7 @@ std::string TelldusCore::wideToString(co - char *outString = new char[outbytesLeft]; - memset(outString, 0, sizeof(*outString)*(outbytesLeft)); - --#ifdef _FREEBSD -- const char *inPointer = inString; --#else - char *inPointer = inString; --#endif - char *outPointer = outString; - - iconv_t convDesc = iconv_open("UTF-8", WCHAR_T_ENCODING); diff --git a/comms/telldus-core/files/patch-common-Thread.h b/comms/telldus-core/files/patch-common-Thread.h deleted file mode 100644 index 98aeb4d0676a..000000000000 --- a/comms/telldus-core/files/patch-common-Thread.h +++ /dev/null @@ -1,12 +0,0 @@ ---- common/Thread.h -+++ common/Thread.h -@@ -13,6 +13,9 @@ - #define TELLDUS_CORE_COMMON_THREAD_H_ - - #include -+#ifdef __FreeBSD__ -+#include -+#endif - #include "common/Mutex.h" - - namespace TelldusCore { diff --git a/comms/telldus-core/files/patch-service-CMakeLists.txt b/comms/telldus-core/files/patch-service-CMakeLists.txt deleted file mode 100644 index 1e3352191d2c..000000000000 --- a/comms/telldus-core/files/patch-service-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- service/CMakeLists.txt -+++ service/CMakeLists.txt -@@ -249,7 +249,7 @@ IF (UNIX) - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating man file telldusd.1" - ) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/telldusd.1 DESTINATION share/man/man1) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/telldusd.1 DESTINATION ${MAN_DIR}/man1) - ENDIF (GENERATE_MAN) - ENDIF (UNIX) - diff --git a/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp b/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp deleted file mode 100644 index d0041c08c507..000000000000 --- a/comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- service/ConnectionListener_unix.cpp.orig 2014-03-31 10:30:09 UTC -+++ service/ConnectionListener_unix.cpp -@@ -13,11 +13,12 @@ - #include - #include - #include -+#include - - #include "service/ConnectionListener.h" - #include "common/Socket.h" - --#if defined(_MACOSX) && !defined(SOCK_CLOEXEC) -+#if (defined(_MACOSX) || defined (__FreeBSD__)) && !defined(SOCK_CLOEXEC) - #define SOCK_CLOEXEC 0 - #endif - diff --git a/comms/telldus-core/files/patch-service-EventUpdateManager.cpp b/comms/telldus-core/files/patch-service-EventUpdateManager.cpp deleted file mode 100644 index 1c84f10bd57b..000000000000 --- a/comms/telldus-core/files/patch-service-EventUpdateManager.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- service/EventUpdateManager.cpp -+++ service/EventUpdateManager.cpp -@@ -33,6 +33,10 @@ - #include "service/ConnectionListener.h" - #include "service/Log.h" - -+#ifdef __FreeBSD__ -+extern char **environ; -+#endif -+ - typedef std::list SocketList; - typedef std::list StringList; - diff --git a/comms/telldus-core/files/patch-service-ProtocolNexa.cpp b/comms/telldus-core/files/patch-service-ProtocolNexa.cpp deleted file mode 100644 index c95e2f0cdbd3..000000000000 --- a/comms/telldus-core/files/patch-service-ProtocolNexa.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- service/ProtocolNexa.cpp.orig 2014-03-31 12:30:09.000000000 +0200 -+++ service/ProtocolNexa.cpp 2016-04-04 13:32:35.124699000 +0200 -@@ -56,7 +56,7 @@ std::string ProtocolNexa::getStringForMe - // We also return the last packet so Device::doAction() doesn't - // report TELLSTICK_ERROR_METHOD_NOT_SUPPORTED - -- str.insert(0, 1, 2); // Repeat two times -+ str.insert(0, 1, '\x2'); // Repeat two times - str.insert(0, 1, 'R'); - for (int i = 0; i < 5; ++i) { - controller->send(str); diff --git a/comms/telldus-core/files/patch-service-Sensor.h b/comms/telldus-core/files/patch-service-Sensor.h deleted file mode 100644 index e550e7f1b20e..000000000000 --- a/comms/telldus-core/files/patch-service-Sensor.h +++ /dev/null @@ -1,12 +0,0 @@ ---- service/Sensor.h -+++ service/Sensor.h -@@ -8,6 +8,9 @@ - #define TELLDUS_CORE_SERVICE_SENSOR_H_ - - #include -+#ifdef __FreeBSD__ -+#include -+#endif - #include "common/Mutex.h" - - class Sensor : public TelldusCore::Mutex { diff --git a/comms/telldus-core/files/patch-service-SettingsConfuse.cpp b/comms/telldus-core/files/patch-service-SettingsConfuse.cpp deleted file mode 100644 index ca847a6d467b..000000000000 --- a/comms/telldus-core/files/patch-service-SettingsConfuse.cpp +++ /dev/null @@ -1,42 +0,0 @@ ---- service/SettingsConfuse.cpp -+++ service/SettingsConfuse.cpp -@@ -17,6 +17,8 @@ - - class Settings::PrivateData { - public: -+ PrivateData() -+ : cfg(NULL), var_cfg(NULL) {} - cfg_t *cfg; - cfg_t *var_cfg; - }; -@@ -42,10 +44,10 @@ Settings::Settings(void) { - */ - Settings::~Settings(void) { - TelldusCore::MutexLocker locker(&mutex); -- if (d->cfg > 0) { -+ if (d->cfg != 0) { - cfg_free(d->cfg); - } -- if (d->var_cfg > 0) { -+ if (d->var_cfg != 0) { - cfg_free(d->var_cfg); - } - delete d; -@@ -56,7 +58,7 @@ Settings::~Settings(void) { - */ - std::wstring Settings::getSetting(const std::wstring &strName) const { - TelldusCore::MutexLocker locker(&mutex); -- if (d->cfg > 0) { -+ if (d->cfg != 0) { - std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str())); - return TelldusCore::charToWstring(setting.c_str()); - } -@@ -68,7 +70,7 @@ std::wstring Settings::getSetting(const - */ - int Settings::getNumberOfNodes(Node node) const { - TelldusCore::MutexLocker locker(&mutex); -- if (d->cfg > 0) { -+ if (d->cfg != 0) { - if (node == Device) { - return cfg_size(d->cfg, "device"); - } else if (node == Controller) { diff --git a/comms/telldus-core/files/patch-service-tellstick.conf b/comms/telldus-core/files/patch-service-tellstick.conf deleted file mode 100644 index 544fc59bde49..000000000000 --- a/comms/telldus-core/files/patch-service-tellstick.conf +++ /dev/null @@ -1,9 +0,0 @@ ---- service/tellstick.conf 2014-04-08 20:53:25.374751487 +0200 -+++ service/tellstick.conf 2014-04-08 20:53:36.055838124 +0200 -@@ -1,5 +1,5 @@ - user = "nobody" --group = "plugdev" -+group = "dialer" - ignoreControllerConfirmation = "false" - device { - id = 1 diff --git a/comms/telldus-core/files/patch-tdadmin-CMakeLists.txt b/comms/telldus-core/files/patch-tdadmin-CMakeLists.txt deleted file mode 100644 index 86455ae2b6f9..000000000000 --- a/comms/telldus-core/files/patch-tdadmin-CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ ---- tdadmin/CMakeLists.txt -+++ tdadmin/CMakeLists.txt -@@ -52,13 +52,13 @@ IF (UNIX) - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating man file tdadmin.1" - ) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdadmin.1 DESTINATION share/man/man1) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdadmin.1 DESTINATION ${MAN_DIR}/man1) - ENDIF (GENERATE_MAN) - ENDIF (UNIX) - - INSTALL(TARGETS tdadmin RUNTIME DESTINATION sbin) - --IF (UNIX AND NOT APPLE) -+IF (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - SET(UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "The directory where udev store its rules" ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/05-tellstick.rules -@@ -76,4 +76,14 @@ IF (UNIX AND NOT APPLE) - INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/parsed/udev.sh - DESTINATION share/telldus-core/helpers/ - ) --ENDIF (UNIX AND NOT APPLE) -+ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ SET(UDEV_RULES_DIR "/usr/local/etc/devd/" CACHE PATH "The directory where devd store its rules" ) -+ CONFIGURE_FILE( -+ ${CMAKE_CURRENT_SOURCE_DIR}/freebsd-devd-tellstick.conf -+ ${CMAKE_BINARY_DIR}/parsed/tellstick.conf -+ @ONLY -+ ) -+ INSTALL(FILES ${CMAKE_BINARY_DIR}/parsed/tellstick.conf -+ DESTINATION ${UDEV_RULES_DIR} -+ ) -+ENDIF () diff --git a/comms/telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf b/comms/telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf deleted file mode 100644 index 7e75e2db7d1a..000000000000 --- a/comms/telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf +++ /dev/null @@ -1,39 +0,0 @@ ---- tdadmin/freebsd-devd-tellstick.conf 2014-04-06 22:40:11.000000000 +0200 -+++ tdadmin/freebsd-devd-tellstick.conf 2014-04-06 20:37:50.501751596 +0200 -@@ -0,0 +1,36 @@ -+# Original Tellstick -+notify 10 { -+ match "system" "USB"; -+ match "subsystem" "DEVICE"; -+ match "type" "ATTACH"; -+ match "vendor" "0x1781"; -+ match "product" "0x0c30"; -+ action "chgrp dialer /dev/$cdev; chmod 660 /dev/$cdev; @CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller connect"; -+}; -+ -+notify 10 { -+ match "system" "USB"; -+ match "subsystem" "DEVICE"; -+ match "type" "DETACH"; -+ match "vendor" "0x1781"; -+ match "product" "0x0c30"; -+ action "@CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller disconnect"; -+}; -+# Tellstick Duo -+notify 10 { -+ match "system" "USB"; -+ match "subsystem" "DEVICE"; -+ match "type" "ATTACH"; -+ match "vendor" "0x1781"; -+ match "product" "0x0c31"; -+ action "chgrp dialer /dev/$cdev; chmod 660 /dev/$cdev; @CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller connect"; -+}; -+ -+notify 10 { -+ match "system" "USB"; -+ match "subsystem" "DEVICE"; -+ match "type" "DETACH"; -+ match "vendor" "0x1781"; -+ match "product" "0x0c31"; -+ action "@CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller disconnect"; -+}; diff --git a/comms/telldus-core/files/patch-tdtool-CMakeLists.txt b/comms/telldus-core/files/patch-tdtool-CMakeLists.txt deleted file mode 100644 index 6aa40c276ee5..000000000000 --- a/comms/telldus-core/files/patch-tdtool-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- tdtool/CMakeLists.txt -+++ tdtool/CMakeLists.txt -@@ -49,7 +49,7 @@ IF (UNIX) - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating man file tdtool.1" - ) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdtool.1 DESTINATION share/man/man1) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdtool.1 DESTINATION ${MAN_DIR}/man1) - ENDIF (GENERATE_MAN) - ENDIF (UNIX) - diff --git a/comms/telldus-core/files/pkg-message.in b/comms/telldus-core/files/pkg-message.in deleted file mode 100644 index c1dc1ecda5a9..000000000000 --- a/comms/telldus-core/files/pkg-message.in +++ /dev/null @@ -1,24 +0,0 @@ -[ -{ type: install - message: <