Update to 3.5877

 * Add OPTIONS to toggle between ports ad bundled versions of various libs
 * Drop GH_TAGNAME since we're using a release version
 * Various changes to mollify portlint:
     - Regenerated files/patch-* using 'make makepatch'
 * Add USES=ssl

PR:		215439
Submitted by:	kiwi@oav.net (maintainer)

1 files changed, 50 insertions, 46 deletions

diff --git a/www/domoticz/files/patch-getgit.cmake b/www/domoticz/files/patch-getgit.cmake
index 1918b85c1811..f1a73fee9147 100644
--- a/www/domoticz/files/patch-getgit.cmake
+++ b/www/domoticz/files/patch-getgit.cmake
@@ -1,66 +1,70 @@
---- getgit.cmake.old	2015-12-15 12:12:10.000000000 +0100
-+++ getgit.cmake	2015-12-16 13:04:15.081839000 +0100
-@@ -1,34 +1,35 @@
- # the git.cmake module is part of the standard distribution
+--- getgit.cmake.orig	2016-11-10 15:44:33 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} rev-list HEAD --count
+-  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} rev-parse --short HEAD
+-  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} show -s --format=%ct
+-  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)
 -
--Gitversion_GET_REVISION(. ProjectRevision)
--Gitversion_GET_HASH(. ProjectHash)
--Gitversion_GET_DATE(. ProjectDate)
-+#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} rev-list HEAD --count
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_REVISION)
-+#
-+#MACRO(Gitversion_GET_HASH dir variable)
-+#  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_HASH)
-+#
-+#MACRO(Gitversion_GET_DATE dir variable)
-+#  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
-+#    OUTPUT_VARIABLE ${variable}
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_DATE)
-+#
-+#Gitversion_GET_REVISION(. ProjectRevision)
-+#Gitversion_GET_HASH(. ProjectHash)
-+#Gitversion_GET_DATE(. ProjectDate)
- 
- # write a file with the APPVERSION define
--MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
--file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
-+#MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
-+#file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
-+file(WRITE appversion.h.txt "#define APPVERSION XXXDOMOTICZXXX\n#define APPHASH \"XXXHASHXXX\"\n#define APPDATE XXXTIMEXXX\n")
- # copy the file to the final header only if the version changes
- # reduces needless rebuilds
- 
+-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")