View | Details | Raw Unified | Return to bug 222790 | Differences between
and this patch

Collapse All | Expand All

(-)comms/telldus-core/Makefile (-3 / +10 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	telldus-core
4
PORTNAME=	telldus-core
5
PORTVERSION=	2.1.2
5
PORTVERSION=	2.1.2
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	comms
7
CATEGORIES=	comms
8
MASTER_SITES=	http://download.telldus.se/TellStick/Software/telldus-core/
8
MASTER_SITES=	http://download.telldus.se/TellStick/Software/telldus-core/
9
9
Lines 20-30 Link Here
20
BROKEN_powerpc64=	Does not build: error: strlen was not declared in this scope
20
BROKEN_powerpc64=	Does not build: error: strlen was not declared in this scope
21
BROKEN_sparc64=		Does not build: error: strlen was not declared in this scope
21
BROKEN_sparc64=		Does not build: error: strlen was not declared in this scope
22
22
23
USES= 		cmake compiler:c++11-lang iconv:wchar_t
23
USE_LDCONFIG=	yes
24
USES=		cmake compiler:c++11-lang iconv:wchar_t
24
25
25
CMAKE_ARGS+=-DGENERATE_MAN=TRUE
26
CMAKE_ARGS+=-DGENERATE_MAN=TRUE
26
# Note: these are internal defines and shall NOT contain ${STAGEDIR}
27
# Note: these are internal defines and shall NOT contain ${STAGEDIR}
27
CMAKE_ARGS+=-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
28
CMAKE_ARGS+=-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
29
# Using global /var, otherwise testport complains "Warning: port uses /usr/local/var instead of /var"
28
CMAKE_ARGS+=-DSTATE_INSTALL_DIR="/var/telldus"
30
CMAKE_ARGS+=-DSTATE_INSTALL_DIR="/var/telldus"
29
31
30
MAKE_JOBS_UNSAFE=	yes
32
MAKE_JOBS_UNSAFE=	yes
Lines 33-38 Link Here
33
USER=		nobody
35
USER=		nobody
34
GROUP=		dialer
36
GROUP=		dialer
35
37
38
SUB_FILES=	pkg-message
39
36
.include <bsd.port.pre.mk>
40
.include <bsd.port.pre.mk>
37
41
38
post-patch:
42
post-patch:
Lines 44-49 Link Here
44
post-install:
48
post-install:
45
	cd ${STAGEDIR}${PREFIX}/etc && \
49
	cd ${STAGEDIR}${PREFIX}/etc && \
46
		 ${MV} tellstick.conf tellstick.conf.sample
50
		 ${MV} tellstick.conf tellstick.conf.sample
47
	${RM} ${STAGEDIR}/var/telldus/telldus-core.conf
51
	# This file is actually empty but allows us to simply use @sample to 
52
	# make sure it stays between upgrades if modified
53
	cd ${STAGEDIR}/var/telldus && \
54
		 ${MV} telldus-core.conf telldus-core.conf.sample
48
55
49
.include <bsd.port.post.mk>
56
.include <bsd.port.post.mk>
(-)comms/telldus-core/files/patch-CMakeLists.txt (-15 / +13 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt
1
--- CMakeLists.txt.orig	2014-04-01 13:52:01 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -42,8 +42,18 @@ ENDIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
3
@@ -37,8 +37,18 @@ ENDIF (CMAKE_SYSTEM_NAME MATCHES "FreeBS
4
 SET(BUILD_TDTOOL	TRUE				CACHE BOOL "Build tdtool")
4
 SET(BUILD_TDTOOL	TRUE				CACHE BOOL "Build tdtool")
5
 SET(BUILD_TDADMIN	${TDADMIN_DEFAULT}	CACHE BOOL "Build tdadmin")
5
 SET(BUILD_TDADMIN	${TDADMIN_DEFAULT}	CACHE BOOL "Build tdadmin")
6
 
6
 
Lines 19-25 Link Here
19
 ADD_SUBDIRECTORY(common)
19
 ADD_SUBDIRECTORY(common)
20
 ADD_SUBDIRECTORY(service)
20
 ADD_SUBDIRECTORY(service)
21
 ADD_SUBDIRECTORY(client)
21
 ADD_SUBDIRECTORY(client)
22
@@ -61,20 +71,23 @@ ENDIF(BUILD_TDADMIN)
22
@@ -56,20 +66,23 @@ ENDIF(BUILD_TDADMIN)
23
 ENABLE_TESTING()
23
 ENABLE_TESTING()
24
 ADD_SUBDIRECTORY(tests)
24
 ADD_SUBDIRECTORY(tests)
25
 
25
 
Lines 27-38 Link Here
27
-
27
-
28
-IF(DOXYGEN_FOUND)
28
-IF(DOXYGEN_FOUND)
29
-	SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
29
-	SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
30
-
30
+IF (GENERATE_DOXYGEN)
31
+	FIND_PACKAGE(Doxygen)
32
+	IF(DOXYGEN_FOUND)
33
+		SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
34
 
31
-	CONFIGURE_FILE(
35
-	CONFIGURE_FILE(
32
-		"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
36
-		"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
33
-		${DOXY_CONFIG} @ONLY
37
-		${DOXY_CONFIG} @ONLY
34
-	)
38
-	)
35
-
39
+		CONFIGURE_FILE(
40
+			"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
41
+			${DOXY_CONFIG} @ONLY
42
+		)
43
 
36
-	ADD_CUSTOM_TARGET(docs
44
-	ADD_CUSTOM_TARGET(docs
37
-		${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
45
-		${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
38
-		DEPENDS ${DOXY_CONFIG}
46
-		DEPENDS ${DOXY_CONFIG}
Lines 40-55 Link Here
40
-		COMMENT "Generating doxygen documentation" VERBATIM
48
-		COMMENT "Generating doxygen documentation" VERBATIM
41
-	)
49
-	)
42
-ENDIF()
50
-ENDIF()
43
+IF (GENERATE_DOXYGEN)
44
+	FIND_PACKAGE(Doxygen)
45
+	IF(DOXYGEN_FOUND)
46
+		SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
47
+
48
+		CONFIGURE_FILE(
49
+			"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
50
+			${DOXY_CONFIG} @ONLY
51
+		)
52
+
53
+		ADD_CUSTOM_TARGET(docs
51
+		ADD_CUSTOM_TARGET(docs
54
+			${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
52
+			${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
55
+			DEPENDS ${DOXY_CONFIG}
53
+			DEPENDS ${DOXY_CONFIG}
(-)comms/telldus-core/files/patch-common-Socket_unix.cpp (-2 / +2 lines)
Lines 1-4 Link Here
1
--- common/Socket_unix.cpp
1
--- common/Socket_unix.cpp.orig	2014-03-31 10:30:09 UTC
2
+++ common/Socket_unix.cpp
2
+++ common/Socket_unix.cpp
3
@@ -18,7 +18,7 @@
3
@@ -18,7 +18,7 @@
4
 #include "common/Strings.h"
4
 #include "common/Strings.h"
Lines 9-15 Link Here
9
 	#define SOCK_CLOEXEC 0
9
 	#define SOCK_CLOEXEC 0
10
 #endif
10
 #endif
11
 
11
 
12
@@ -130,8 +130,10 @@ std::wstring Socket::read(int timeout) {
12
@@ -128,8 +128,10 @@ std::wstring Socket::read(int timeout) {
13
 
13
 
14
 void Socket::stopReadWait() {
14
 void Socket::stopReadWait() {
15
 	TelldusCore::MutexLocker locker(&d->mutex);
15
 	TelldusCore::MutexLocker locker(&d->mutex);
(-)comms/telldus-core/files/patch-common-Thread.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- common/Thread.h
1
--- common/Thread.h.orig	2014-03-31 10:30:09 UTC
2
+++ common/Thread.h
2
+++ common/Thread.h
3
@@ -13,6 +13,9 @@
3
@@ -13,6 +13,9 @@
4
 #define TELLDUS_CORE_COMMON_THREAD_H_
4
 #define TELLDUS_CORE_COMMON_THREAD_H_
(-)comms/telldus-core/files/patch-service-CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- service/CMakeLists.txt
1
--- service/CMakeLists.txt.orig	2014-03-31 10:30:09 UTC
2
+++ service/CMakeLists.txt
2
+++ service/CMakeLists.txt
3
@@ -249,7 +249,7 @@ IF (UNIX)
3
@@ -249,7 +249,7 @@ IF (UNIX)
4
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
4
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
(-)comms/telldus-core/files/patch-service-ConnectionListener_unix.cpp (-1 / +1 lines)
Lines 1-4 Link Here
1
--- service/ConnectionListener_unix.cpp
1
--- service/ConnectionListener_unix.cpp.orig	2014-03-31 10:30:09 UTC
2
+++ service/ConnectionListener_unix.cpp
2
+++ service/ConnectionListener_unix.cpp
3
@@ -17,7 +17,7 @@
3
@@ -17,7 +17,7 @@
4
 #include "service/ConnectionListener.h"
4
 #include "service/ConnectionListener.h"
(-)comms/telldus-core/files/patch-service-EventUpdateManager.cpp (-1 / +1 lines)
Lines 1-4 Link Here
1
--- service/EventUpdateManager.cpp
1
--- service/EventUpdateManager.cpp.orig	2014-03-31 10:30:09 UTC
2
+++ service/EventUpdateManager.cpp
2
+++ service/EventUpdateManager.cpp
3
@@ -33,6 +33,10 @@
3
@@ -33,6 +33,10 @@
4
 #include "service/ConnectionListener.h"
4
 #include "service/ConnectionListener.h"
(-)comms/telldus-core/files/patch-service-ProtocolNexa.cpp (-2 / +2 lines)
Lines 1-5 Link Here
1
--- service/ProtocolNexa.cpp.orig	2014-03-31 12:30:09.000000000 +0200
1
--- service/ProtocolNexa.cpp.orig	2014-03-31 10:30:09 UTC
2
+++ service/ProtocolNexa.cpp	2016-04-04 13:32:35.124699000 +0200
2
+++ service/ProtocolNexa.cpp
3
@@ -56,7 +56,7 @@ std::string ProtocolNexa::getStringForMe
3
@@ -56,7 +56,7 @@ std::string ProtocolNexa::getStringForMe
4
 			// We also return the last packet so Device::doAction() doesn't
4
 			// We also return the last packet so Device::doAction() doesn't
5
 			// report TELLSTICK_ERROR_METHOD_NOT_SUPPORTED
5
 			// report TELLSTICK_ERROR_METHOD_NOT_SUPPORTED
(-)comms/telldus-core/files/patch-service-Sensor.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- service/Sensor.h
1
--- service/Sensor.h.orig	2014-03-31 10:30:09 UTC
2
+++ service/Sensor.h
2
+++ service/Sensor.h
3
@@ -8,6 +8,9 @@
3
@@ -8,6 +8,9 @@
4
 #define TELLDUS_CORE_SERVICE_SENSOR_H_
4
 #define TELLDUS_CORE_SERVICE_SENSOR_H_
(-)comms/telldus-core/files/patch-service-SettingsConfuse.cpp (-4 / +4 lines)
Lines 1-4 Link Here
1
--- service/SettingsConfuse.cpp
1
--- service/SettingsConfuse.cpp.orig	2014-03-31 10:30:09 UTC
2
+++ service/SettingsConfuse.cpp
2
+++ service/SettingsConfuse.cpp
3
@@ -17,6 +17,8 @@
3
@@ -17,6 +17,8 @@
4
 
4
 
Lines 9-15 Link Here
9
 	cfg_t *cfg;
9
 	cfg_t *cfg;
10
 	cfg_t *var_cfg;
10
 	cfg_t *var_cfg;
11
 };
11
 };
12
@@ -42,10 +44,10 @@
12
@@ -42,10 +44,10 @@ Settings::Settings(void) {
13
 */
13
 */
14
 Settings::~Settings(void) {
14
 Settings::~Settings(void) {
15
 	TelldusCore::MutexLocker locker(&mutex);
15
 	TelldusCore::MutexLocker locker(&mutex);
Lines 22-28 Link Here
22
 		cfg_free(d->var_cfg);
22
 		cfg_free(d->var_cfg);
23
 	}
23
 	}
24
 	delete d;
24
 	delete d;
25
@@ -56,7 +58,7 @@
25
@@ -56,7 +58,7 @@ Settings::~Settings(void) {
26
 */
26
 */
27
 std::wstring Settings::getSetting(const std::wstring &strName) const {
27
 std::wstring Settings::getSetting(const std::wstring &strName) const {
28
 	TelldusCore::MutexLocker locker(&mutex);
28
 	TelldusCore::MutexLocker locker(&mutex);
Lines 31-37 Link Here
31
 		std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str()));
31
 		std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str()));
32
 		return TelldusCore::charToWstring(setting.c_str());
32
 		return TelldusCore::charToWstring(setting.c_str());
33
 	}
33
 	}
34
@@ -68,7 +70,7 @@
34
@@ -68,7 +70,7 @@ std::wstring Settings::getSetting(const 
35
 */
35
 */
36
 int Settings::getNumberOfNodes(Node node) const {
36
 int Settings::getNumberOfNodes(Node node) const {
37
 	TelldusCore::MutexLocker locker(&mutex);
37
 	TelldusCore::MutexLocker locker(&mutex);
(-)comms/telldus-core/files/patch-service-tellstick.conf (-2 / +2 lines)
Lines 1-5 Link Here
1
--- service/tellstick.conf	2014-04-08 20:53:25.374751487 +0200
1
--- service/tellstick.conf.orig	2014-03-31 10:30:09 UTC
2
+++ service/tellstick.conf	2014-04-08 20:53:36.055838124 +0200
2
+++ service/tellstick.conf
3
@@ -1,5 +1,5 @@
3
@@ -1,5 +1,5 @@
4
 user = "nobody"
4
 user = "nobody"
5
-group = "plugdev"
5
-group = "plugdev"
(-)comms/telldus-core/files/patch-tdadmin-CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- tdadmin/CMakeLists.txt
1
--- tdadmin/CMakeLists.txt.orig	2014-03-31 10:30:09 UTC
2
+++ tdadmin/CMakeLists.txt
2
+++ tdadmin/CMakeLists.txt
3
@@ -52,13 +52,13 @@ IF (UNIX)
3
@@ -52,13 +52,13 @@ IF (UNIX)
4
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
4
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
(-)comms/telldus-core/files/patch-tdadmin-freebsd-devd-tellstick.conf (-11 / +16 lines)
Lines 1-15 Link Here
1
--- tdadmin/freebsd-devd-tellstick.conf	2014-04-06 22:40:11.000000000 +0200
1
--- tdadmin/freebsd-devd-tellstick.conf.orig	2017-10-04 21:02:37 UTC
2
+++ tdadmin/freebsd-devd-tellstick.conf	2014-04-06 20:37:50.501751596 +0200
2
+++ tdadmin/freebsd-devd-tellstick.conf
3
@@ -0,0 +1,12 @@
3
@@ -0,0 +1,17 @@
4
+attach 10 {
4
+notify 10 {
5
+	device-name "uftdi[0-9]+";
5
+	match "system" "USB";
6
+	match "subsystem" "DEVICE";
7
+	match "type" "ATTACH";
6
+	match "vendor" "0x1781";
8
+	match "vendor" "0x1781";
7
+	match "product" "0x0c30";
9
+	match "product" "0x0c30";
8
+
10
+	action "chgrp dialer /dev/$cdev; chmod 660 /dev/$cdev; @CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller connect";
9
+	action "chgrp dialer /dev/ugen$port.$devaddr; chmod 660 /dev/ugen$port.$devaddr;
10
+		@CMAKE_INSTALL_PREFIX@/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller connect";
11
+};
11
+};
12
+
12
+
13
+
13
+notify 10 {
14
+# Haven't managed to handle detach/disconnect events, seems they do not provide any information
14
+	match "system" "USB";
15
+# at all so cannot distinguish different uftdi devices.
15
+	match "subsystem" "DEVICE";
16
+	match "type" "DETACH";
17
+	match "vendor" "0x1781";
18
+	match "product" "0x0c30";
19
+	action "/usr/local/sbin/tdadmin --pid $product --vid $vendor --serial $sernum controller disconnect";
20
+};
(-)comms/telldus-core/files/patch-tdtool-CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- tdtool/CMakeLists.txt
1
--- tdtool/CMakeLists.txt.orig	2014-03-31 10:30:09 UTC
2
+++ tdtool/CMakeLists.txt
2
+++ tdtool/CMakeLists.txt
3
@@ -49,7 +49,7 @@ IF (UNIX)
3
@@ -49,7 +49,7 @@ IF (UNIX)
4
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
4
 			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
(-)comms/telldus-core/files/pkg-message.in (+20 lines)
Line 0 Link Here
1
2
======
3
NOTICE
4
======
5
6
A devd rule has been installed to automatically notify telldusd
7
when a new device has been detected.
8
9
Please restart devd to activate this:
10
11
	/etc/rc.d/devd restart
12
13
Edit %%PREFIX%%/etc/tellstick.conf to configure some devices,
14
and enable telldusd in rc.conf.
15
16
Then start telldusd.
17
18
When starting for the first time, you might need to unplug/plugin the device
19
to allow devd to fix the permissions on the /dev/ugenX.X device.
20
(-)comms/telldus-core/pkg-message (-20 lines)
Lines 1-20 Link Here
1
2
======
3
NOTICE
4
======
5
6
A devd rule has been installed to automatically notify telldusd
7
when a new device has been detected.
8
9
Please restart devd to activate this:
10
11
	/etc/rc.d/devd restart
12
13
Edit /usr/local/etc/tellstick.conf to configure some devices,
14
and enable telldusd in rc.conf.
15
16
Then start telldusd.
17
18
When starting for the first time, you might need to unplug/plugin the device
19
to allow devd to fix the permissions on the /dev/ugenX.X device.
20
(-)comms/telldus-core/pkg-plist (-5 / +5 lines)
Lines 1-13 Link Here
1
bin/tdtool
1
@owner nobody
2
@group dialer
2
@group dialer
3
@mode 664
3
@mode 664
4
@exec mkdir -p /var/telldus && chown nobody:dialer /var/telldus
4
@dir /var/telldus
5
@exec [ -f /var/telldus/telldus-core.conf ] || touch /var/telldus/telldus-core.conf && chown nobody:dialer %D/var/telldus/telldus-core.conf
5
@sample /var/telldus/telldus-core.conf.sample
6
@unexec if [ ! -s /var/telldus/telldus-core.conf ]; then rm -vf /var/telldus/telldus-core.conf; fi
6
@owner
7
@unexec rmdir /var/telldus >/dev/null 2>&1 || :
8
@sample etc/tellstick.conf.sample
7
@sample etc/tellstick.conf.sample
9
@group
8
@group
10
@mode
9
@mode
10
bin/tdtool
11
etc/devd/tellstick.conf
11
etc/devd/tellstick.conf
12
include/telldus-core.h
12
include/telldus-core.h
13
lib/libtelldus-core.so
13
lib/libtelldus-core.so

Return to bug 222790