Index: head/www/domoticz/files/patch-CMakeLists.txt =================================================================== --- head/www/domoticz/files/patch-CMakeLists.txt (revision 463614) +++ head/www/domoticz/files/patch-CMakeLists.txt (revision 463615) @@ -1,48 +1,48 @@ ---- CMakeLists.txt.orig 2017-06-07 08:41:02.000000000 +0200 -+++ CMakeLists.txt 2017-06-08 09:55:44.434914000 +0200 -@@ -241,7 +241,7 @@ +--- CMakeLists.txt.orig 2017-07-30 10:19:41 UTC ++++ CMakeLists.txt +@@ -241,7 +241,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDMACRO() -FIND_PROGRAM(GIT_EXECUTABLE git +FIND_PROGRAM(GIT_EXECUTABLE NOgitNO DOC "git command line client") -@@ -680,7 +680,7 @@ +@@ -680,7 +680,7 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "domoticz") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${domoticz}-dev") SET(CPACK_PACKAGING_INSTALL_PREFIX "/") -SET(CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}") +SET(CPACK_PACKAGE_DEFAULT_LOCATION "/usr/local/${CPACK_PACKAGE_NAME}") SET(CPACK_PACKAGE_EXECUTABLES "domoticz;Home Automation System (Domotica).") #set(CPACK_DEB_COMPONENT_INSTALL TRUE) -@@ -689,18 +689,17 @@ +@@ -689,18 +689,17 @@ SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR INCLUDE(CPack) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + set(CMAKE_INSTALL_PREFIX "/usr/local/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ) +install(TARGETS domoticz DESTINATION "/usr/local/domoticz") +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION "/usr/local/domoticz") +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION "/usr/local/domoticz") +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION "/usr/local/domoticz") +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION "/usr/local/domoticz") +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION "/usr/local/domoticz" USE_SOURCE_PERMISSIONS) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION "/usr/local/domoticz") +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION "/usr/local/domoticz") INCLUDE(TestBigEndian) Index: head/www/domoticz/files/patch-getgit.cmake =================================================================== --- head/www/domoticz/files/patch-getgit.cmake (revision 463614) +++ head/www/domoticz/files/patch-getgit.cmake (revision 463615) @@ -1,70 +1,70 @@ ---- getgit.cmake.orig 2016-04-01 15:27:18.517929000 +0200 -+++ getgit.cmake 2016-04-01 15:27:52.572836000 +0200 +--- getgit.cmake.orig 2017-07-30 10:19:41 UTC ++++ getgit.cmake @@ -1,66 +1,7 @@ # this macro gets called as a custom build step by running make # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller -# the git.cmake module is part of the standard distribution -find_package(Git) -if(NOT GIT_FOUND) - MESSAGE(FATAL_ERROR "Git not found!.") -endif() - -MACRO(Gitversion_GET_REVISION dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${variable} - OUTPUT_STRIP_TRAILING_WHITESPACE) -ENDMACRO(Gitversion_GET_REVISION) - -MACRO(Gitversion_GET_HASH dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${variable} - OUTPUT_STRIP_TRAILING_WHITESPACE) -ENDMACRO(Gitversion_GET_HASH) - -MACRO(Gitversion_GET_DATE dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${variable} - OUTPUT_STRIP_TRAILING_WHITESPACE) -ENDMACRO(Gitversion_GET_DATE) - -MACRO(Gitversion_CHECK_DIRTY dir variable) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD - WORKING_DIRECTORY ${dir} - OUTPUT_VARIABLE ${variable} - OUTPUT_STRIP_TRAILING_WHITESPACE) -ENDMACRO(Gitversion_CHECK_DIRTY) - -Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision) -IF(NOT ProjectRevision) - MESSAGE(STATUS "Failed to get ProjectRevision from git, set it to 0") - set (ProjectRevision 0) -ELSE(NOT ProjectRevision) - MATH(EXPR ProjectRevision "${ProjectRevision}+2107") -ENDIF(NOT ProjectRevision) -Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash) -IF(NOT ProjectHash) - MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0") - set (ProjectHash 0) -ENDIF(NOT ProjectHash) -Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate) -IF(NOT ProjectDate) - MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0") - set (ProjectDate 0) -ENDIF(NOT ProjectDate) -Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty) -IF(ProjectDirty) - MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash") - set (ProjectHash "${ProjectHash}-modified") -ENDIF(ProjectDirty) - -# write a file with the APPVERSION define -file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n") - +set (ProjectDate 0) # if ProjectDate is 0, create appversion.h.txt from a copy of appversion.default IF(NOT ProjectDate AND EXISTS ${SOURCE_DIR}/appversion.default) MESSAGE(STATUS "ProjectDate is 0 and appversion.default exists, copy it")