community/domoticz: upgrade to 3.4834 and move to community

6 files changed, 130 insertions, 79 deletions

diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD
new file mode 100644
index 0000000000..5cae8adda2
--- /dev/null
+++ b/community/domoticz/APKBUILD
@@ -0,0 +1,70 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer:
+pkgname=domoticz
+pkgver=3.4834
+pkgrel=0
+pkgdesc="Open source Home Automation System"
+url="http://www.domoticz.com/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev=""
+makedepends="$depends_dev cmake openssl-dev zlib-dev curl-dev boost-dev
+        sqlite-dev lua5.2-dev mosquitto-dev libusb-compat-dev openzwave-dev"
+install="$pkgname.pre-install"
+subpackages=""
+source="domoticz-$pkgver.tar.gz::https://github.com/domoticz/domoticz/archive/$pkgver.tar.gz
+	domoticz.confd
+	domoticz.initd
+	ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch
+	"
+
+builddir="$srcdir/domoticz-$pkgver"
+
+build() {
+        cd "$builddir"
+        cmake \
+                -DBUILD_SHARED_LIBS=True \
+                -DUSE_STATIC_LIBSTDCXX=OFF \
+                -DOpenZWave=/usr/lib/libopenzwave.so \
+                -DUSE_STATIC_OPENZWAVE=OFF \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INSTALL_PREFIX=/var/lib/domoticz \
+                -DUSE_BUILTIN_LUA=OFF \
+                -DUSE_BUILTIN_MQTT=OFF \
+                -DUSE_BUILTIN_SQLITE=OFF \
+                || return 1
+        make || return 1
+}
+
+package() {
+        cd "$builddir"
+        make DESTDIR="$pkgdir" install || return 1
+        mkdir -p "$pkgdir"/usr/bin \
+                "$pkgdir"/usr/share/$pkgname || return 1
+        mv "$pkgdir"/var/lib/domoticz/domoticz \
+                "$pkgdir"/usr/bin/ || return 1
+        mv "$pkgdir"/var/lib/domoticz/www \
+                "$pkgdir"/usr/share/$pkgname/ || return 1
+        mv "$pkgdir"/var/lib/domoticz/Config \
+                "$pkgdir"/usr/share/$pkgname/ || return 1
+        rm -f "$pkgdir"/var/lib/domoticz/updatedomo
+        chown -R $pkgname "$pkgdir"/var/lib/domoticz || return 1
+        install -D -m755 "$srcdir"/$pkgname.initd \
+                "$pkgdir"/etc/init.d/$pkgname || return 1
+        install -D -m644 "$srcdir"/$pkgname.confd \
+                "$pkgdir"/etc/conf.d/$pkgname || return 1
+}
+
+md5sums="fc3c396eadca9a8b622f69d86351ac37  domoticz-3.4834.tar.gz
+e5ecebdcc238af91a89081a115530175  domoticz.confd
+c7a183cf8d3df2d0dd14380d13694847  domoticz.initd
+791bb99d93063a97e64026a27df1fbb9  ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch"
+sha256sums="02b4cdde8e376258aeae3d5621edf8bb6b3563c34282e50194db343fcec9c0f5  domoticz-3.4834.tar.gz
+155e9c33c5a99bb32e925c834b2530451640a8a58e39aa63e358401711d67ff3  domoticz.confd
+4701360626f3951102e8b827031d2099f241a003123bc9114237ba67b24e2845  domoticz.initd
+9ca9368d20eb5f177e1b3deccba224ee5e743fb22af0ecf0585d1da815c15572  ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch"
+sha512sums="3527075c905d47a8774fe60f9b717665c47937f3bf0b9ec0ab2351e3215230d0e4e28b0fd1d1f921b849884a20c57ca0e8600019fb4c4fa82b8d3a3839098f95  domoticz-3.4834.tar.gz
+724440da335f1e22c8dc181df62dac9ad2bcca98b39bff059de4be5901a93a0a8cb6864d92262092041d796ee7d3933f62cf337316d35a800bbb44f84a1709e0  domoticz.confd
+3ddbd3848cce2247a52e4673307a078717d75cb3fea2937d9f2442d94dccd0efc63120f1b0324c7091ae158cd0ec4fd36334af43bb887d45ff4a93e6a96e9bd2  domoticz.initd
+b6bdc0f578728ed25edb80c9117c1744c4ce1945eeea3ed9618937a6e81c6c3712e8de33769c71a3767a7cf9314973cf9265d3e1d4dfd8907f2b0c0bcf382671  ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch"
diff --git a/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch b/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch
new file mode 100644
index 0000000000..6787482bb1
--- /dev/null
+++ b/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch
@@ -0,0 +1,60 @@
+From ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70 Mon Sep 17 00:00:00 2001
+From: irimi <irimi@gmx.de>
+Date: Mon, 7 Mar 2016 20:28:21 +0100
+Subject: [PATCH] ensure correct git repository path
+
+---
+ CMakeLists.txt | 2 +-
+ getgit.cmake   | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d3113f4..8532ab4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,7 +152,7 @@ FIND_PROGRAM(GIT_EXECUTABLE git
+   DOC "git command line client")
+ 
+ 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)
+diff --git a/getgit.cmake b/getgit.cmake
+index 8d6821f..39af19b 100644
+--- a/getgit.cmake
++++ b/getgit.cmake
+@@ -8,28 +8,28 @@ if(NOT GIT_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)
+ 
+ MACRO(Gitversion_CHECK_DIRTY dir variable)
+-  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} diff-index -m --name-only HEAD
++  EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD
+     WORKING_DIRECTORY ${dir}
+     OUTPUT_VARIABLE ${variable}
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/testing/domoticz/domoticz.confd b/community/domoticz/domoticz.confd
index cad15cabe6..cad15cabe6 100644
--- a/testing/domoticz/domoticz.confd
+++ b/community/domoticz/domoticz.confd
diff --git a/testing/domoticz/domoticz.initd b/community/domoticz/domoticz.initd
index 139e3345fd..139e3345fd 100644
--- a/testing/domoticz/domoticz.initd
+++ b/community/domoticz/domoticz.initd
diff --git a/testing/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index a94a5fb50b..a94a5fb50b 100644
--- a/testing/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
diff --git a/testing/domoticz/APKBUILD b/testing/domoticz/APKBUILD
deleted file mode 100644
index d2623315bf..0000000000
--- a/testing/domoticz/APKBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=domoticz
-pkgver=0_git20160214
-pkgrel=5
-pkgdesc="Open source Home Automation System"
-url="http://www.domoticz.com/"
-arch="x86_64 x64"
-license="GPL"
-depends=""
-depends_dev=""
-pkgusers="$pkgname"
-pkggroups="$pkgname"
-makedepends="cmake $depends_dev openssl-dev zlib-dev curl-dev boost-dev
-	sqlite-dev lua5.2-dev mosquitto-dev libusb-compat-dev openzwave-dev"
-install="$pkgname.pre-install"
-subpackages=""
-giturl="https://github.com/domoticz/domoticz.git"
-disturl="dev.alpinelinux.org:/archive/$pkgname"
-source="http://dev.alpinelinux.org/archive/domoticz/domoticz-$pkgver.tar.gz
-	$pkgname.initd
-	$pkgname.confd
-	"
-
-_builddir="$srcdir/domoticz-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	cmake \
-		-DBUILD_SHARED_LIBS=True \
-		-DUSE_STATIC_LIBSTDCXX=OFF \
-		-DOpenZWave=/usr/lib/libopenzwave.so \
-		-DUSE_STATIC_OPENZWAVE=OFF \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/var/lib/domoticz \
-		-DUSE_BUILTIN_LUA=OFF \
-		-DUSE_BUILTIN_MQTT=OFF \
-		-DUSE_BUILTIN_SQLITE=OFF \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	mkdir -p "$pkgdir"/usr/bin \
-		"$pkgdir"/usr/share/$pkgname || return 1
-	mv "$pkgdir"/var/lib/domoticz/domoticz \
-		"$pkgdir"/usr/bin/ || return 1
-	mv "$pkgdir"/var/lib/domoticz/www \
-		"$pkgdir"/usr/share/$pkgname/ || return 1
-        mv "$pkgdir"/var/lib/domoticz/Config \
-		"$pkgdir"/usr/share/$pkgname/ || return 1
-	rm -f "$pkgdir"/var/lib/domoticz/updatedomo
-	chown -R $pkgname "$pkgdir"/var/lib/domoticz || return 1
-        install -D -m755 "$srcdir"/$pkgname.initd \
-                "$pkgdir"/etc/init.d/$pkgname || return 1
-        install -D -m644 "$srcdir"/$pkgname.confd \
-                "$pkgdir"/etc/conf.d/$pkgname || return 1
-}
-md5sums="efd24da757ee95b721744b39eb114fd8  domoticz-0_git20160214.tar.gz
-c7a183cf8d3df2d0dd14380d13694847  domoticz.initd
-e5ecebdcc238af91a89081a115530175  domoticz.confd"
-sha256sums="b170a4e91f456032b175e59bba043922c650254978c321f0fed29eb7e5878fff  domoticz-0_git20160214.tar.gz
-4701360626f3951102e8b827031d2099f241a003123bc9114237ba67b24e2845  domoticz.initd
-155e9c33c5a99bb32e925c834b2530451640a8a58e39aa63e358401711d67ff3  domoticz.confd"
-sha512sums="fa1cf347961435710ded56e08e9335526ec124c044bfaf308858b2e7cfd1c77ec6361f60a6c7992d2c02cd04168b3bda46ade1921c0656d5f40c1265688c68eb  domoticz-0_git20160214.tar.gz
-3ddbd3848cce2247a52e4673307a078717d75cb3fea2937d9f2442d94dccd0efc63120f1b0324c7091ae158cd0ec4fd36334af43bb887d45ff4a93e6a96e9bd2  domoticz.initd
-724440da335f1e22c8dc181df62dac9ad2bcca98b39bff059de4be5901a93a0a8cb6864d92262092041d796ee7d3933f62cf337316d35a800bbb44f84a1709e0  domoticz.confd"