testing/tvheadend: upgrade to 3.2_beta2

5 files changed, 22 insertions, 19 deletions

diff --git a/testing/tvheadend/APKBUILD b/testing/tvheadend/APKBUILD
index d1b965edb8..636e37b81e 100644
--- a/testing/tvheadend/APKBUILD
+++ b/testing/tvheadend/APKBUILD
@@ -1,7 +1,8 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=tvheadend
-pkgver=3.00
+pkgver=3.2_beta2
+_tag=aa27c42
 pkgrel=0
 pkgdesc="TV Streaming server for linux"
 url="http://www.lonelycoder.com/hts/tvheadend_overview.html"
@@ -10,13 +11,13 @@ license="GPL3"
 depends=""
 depends_dev="openssl-dev wget bash findutils"
 makedepends="$depends_dev"
-install="$pkgname.pre-install $pkgname.post-deinstall"
-subpackages=""
-source="saveas-https://github.com/tvheadend/tvheadend/tarball/3.0/$pkgname-$pkgver.tar.gz
+install="$pkgname.pre-install"
+subpackages="$pkgname-doc"
+source="saveas-https://github.com/tvheadend/tvheadend/tarball/3.2beta2/$pkgname-$pkgver.tar.gz
 tvheadend.initd
 tvheadend.confd
 "
-_builddir="$srcdir/tvheadend-tvheadend-1175cea"
+_builddir="$srcdir/$pkgname-$pkgname-$_tag"
 
 prepare() {
         local i
@@ -30,18 +31,23 @@ prepare() {
 build() {
         cd "$_builddir"
         ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --mandir=/usr/share/man \
+                --infodir=/usr/share/info \
+                --localstatedir=/var \
 		--release \
-		--disable-avahi
+                --disable-avahi \
+                || return 1
         make || return 1
 }
 package() {
         cd "$_builddir"
-	#sed -i 's/\-T//g' support/posix.mk
 	make DESTDIR="$pkgdir" install || return 1
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname || return 1
 	install -m755 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname || return 1
+	mkdir -p "$pkgdir/etc/tvheadend" || return 1
 }
 
-md5sums="48201e389057704c7af3d5191c4d71ba  tvheadend-3.00.tar.gz
-4d6324b1b87890faf846ad95c2f3483c  tvheadend.initd
-74749f3527418ddfd5671d5d5ad4dca4  tvheadend.confd"
+md5sums="29c5e2a823f6596f3b864a7d8d01706d  tvheadend-3.2_beta2.tar.gz
+5df86b0859fc457c634a41a6ced3f118  tvheadend.initd
+17cf7dfaf27706409a004c246c1a2c3c  tvheadend.confd"
diff --git a/testing/tvheadend/tvheadend.confd b/testing/tvheadend/tvheadend.confd
index a912932aea..32dfe2526c 100644
--- a/testing/tvheadend/tvheadend.confd
+++ b/testing/tvheadend/tvheadend.confd
@@ -1,2 +1,3 @@
 TVHBIN="/usr/bin/tvheadend" 
-TVHUSER="tvheadend" 
+TVHUSER="tvheadend"
+TVHCONF="/etc/tvheadend"
diff --git a/testing/tvheadend/tvheadend.initd b/testing/tvheadend/tvheadend.initd
index 6a50b9f3f2..c244dd63ff 100644
--- a/testing/tvheadend/tvheadend.initd
+++ b/testing/tvheadend/tvheadend.initd
@@ -7,7 +7,8 @@ start() {
         ebegin "Starting tvheadend" 
         start-stop-daemon --start \
                 --user ${TVHUSER} \
-                --exec ${TVHBIN} -- -C -f
+                --exec ${TVHBIN} -- -C -f -c \
+		${TVHCONF}
         eend $?
 }
 
diff --git a/testing/tvheadend/tvheadend.post-deinstall b/testing/tvheadend/tvheadend.post-deinstall
deleted file mode 100644
index b80984d6f0..0000000000
--- a/testing/tvheadend/tvheadend.post-deinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-deluser hts 2>/dev/null
-exit 0
diff --git a/testing/tvheadend/tvheadend.pre-install b/testing/tvheadend/tvheadend.pre-install
index 73f865ca47..c91e1eda93 100644
--- a/testing/tvheadend/tvheadend.pre-install
+++ b/testing/tvheadend/tvheadend.pre-install
@@ -1,5 +1,4 @@
 #!/bin/sh
-groupadd tvheadend 2>/dev/null
-adduser -H -h /home/tvheadend -g tvheadend -D -s /bin/false tvheadend 2>/dev/null
-gpasswd -a tvheadend video 2>/dev/null
+adduser -H -h /usr/share/tvheadend -g tvheadend -D -s /bin/false tvheadend 2>/dev/null
+addgroup tvheadend video 2>/dev/null
 exit 0