community/vdr: modernise

1 files changed, 61 insertions, 38 deletions

diff --git a/community/vdr/APKBUILD b/community/vdr/APKBUILD
index 301f751a0a8..d92b5fb99c6 100644
--- a/community/vdr/APKBUILD
+++ b/community/vdr/APKBUILD
@@ -3,15 +3,34 @@
 # Maintainer: Taner Tas <taner76@gmail.com>
 pkgname=vdr
 pkgver=2.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Video Disk Recorder"
 url="http://www.tvdr.de/"
 arch="all"
 license="GPL-2.0-or-later"
-depends_dev="fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev fribidi-dev
-	libcap-dev alsa-lib-dev libvdpau-dev libva-dev libx11-dev xcb-util-dev xcb-util-wm-dev
-	ffmpeg-dev libcdio-dev mpv-dev libdvbcsa-dev ncurses-dev libwebsockets-dev libexif-dev
-	jansson-dev openssl-dev>3 tinyxml2-dev"
+depends_dev="
+	alsa-lib-dev
+	fontconfig-dev
+	freetype-dev
+	fribidi-dev
+	gettext-dev
+	jansson-dev
+	libcap-dev
+	libcdio-dev
+	libdvbcsa-dev
+	libexif-dev
+	libjpeg-turbo-dev
+	libva-dev
+	libvdpau-dev
+	libwebsockets-dev
+	libx11-dev
+	mpv-dev
+	ncurses-dev
+	openssl-dev
+	tinyxml2-dev
+	xcb-util-dev
+	xcb-util-wm-dev
+	"
 makedepends="$depends_dev bash coreutils groff perl util-linux"
 install="$pkgname.pre-install"
 pkgusers="$pkgname"
@@ -79,20 +98,20 @@ source="$pkgname-$pkgver.tar.bz2::http://git.tvdr.de/?p=vdr.git;a=snapshot;h=ref
 	"
 
 prepare() {
-	cp -aP $srcdir/vdr-plugin-femon-$_femon_ver $builddir/PLUGINS/src/femon
-	cp -aP $srcdir/vdr-plugin-mpv-$_mpv_ver $builddir/PLUGINS/src/mpv
-	cp -aP $srcdir/vdr-plugin-vnsiserver-$_vnsiserver_ver $builddir/PLUGINS/src/vnsiserver
-	cp -aP $srcdir/vdr-plugin-streamdev-$_streamdev_ver $builddir/PLUGINS/src/streamdev
-	cp -aP $srcdir/vdr-plugin-epgsearch-$_epgsearch_ver $builddir/PLUGINS/src/epgsearch
-	cp -aP $srcdir/vdr-plugin-dvbapi-$_dvbapi_ver $builddir/PLUGINS/src/dvbapi
-	cp -aP $srcdir/vdr-plugin-svdrpservice-$_svdrpservice_ver $builddir/PLUGINS/src/svdrpservice
-	cp -aP $srcdir/vdr-plugin-vdrmanager-$_vdrmanager_ver/vdr-vdrmanager $builddir/PLUGINS/src/vdrmanager
-	cp -aP $srcdir/vdr-plugin-osd2web-$_osd2web_ver $builddir/PLUGINS/src/osd2web
+	cp -aP "$srcdir"/vdr-plugin-femon-$_femon_ver "$builddir"/PLUGINS/src/femon
+	cp -aP "$srcdir"/vdr-plugin-mpv-$_mpv_ver "$builddir"/PLUGINS/src/mpv
+	cp -aP "$srcdir"/vdr-plugin-vnsiserver-$_vnsiserver_ver "$builddir"/PLUGINS/src/vnsiserver
+	cp -aP "$srcdir"/vdr-plugin-streamdev-$_streamdev_ver "$builddir"/PLUGINS/src/streamdev
+	cp -aP "$srcdir"/vdr-plugin-epgsearch-$_epgsearch_ver "$builddir"/PLUGINS/src/epgsearch
+	cp -aP "$srcdir"/vdr-plugin-dvbapi-$_dvbapi_ver "$builddir"/PLUGINS/src/dvbapi
+	cp -aP "$srcdir"/vdr-plugin-svdrpservice-$_svdrpservice_ver "$builddir"/PLUGINS/src/svdrpservice
+	cp -aP "$srcdir"/vdr-plugin-vdrmanager-$_vdrmanager_ver/vdr-vdrmanager "$builddir"/PLUGINS/src/vdrmanager
+	cp -aP "$srcdir"/vdr-plugin-osd2web-$_osd2web_ver "$builddir"/PLUGINS/src/osd2web
 	default_prepare
 }
 
 build() {
-	cp $srcdir/Make.config $builddir
+	cp "$srcdir"/Make.config "$builddir"
 	case "$CARCH" in
 		x86*) make ;;
 		*) make LIBDVBCSA=1 ;;
@@ -109,20 +128,20 @@ mpv() {
 
 vnsiserver() {
 	_plugin_defaults vnsiserver
-	mkdir -p $subpkgdir/$_plugins_conf_dir
-	cp -a $builddir/PLUGINS/src/vnsiserver/vnsiserver $subpkgdir/$_plugins_conf_dir
+	mkdir -p "$subpkgdir/$_plugins_conf_dir"
+	cp -a "$builddir"/PLUGINS/src/vnsiserver/vnsiserver "$subpkgdir/$_plugins_conf_dir"
 }
 
 streamdev() {
 	_plugin_defaults streamdev-client streamdev-server
-	mkdir -p $subpkgdir/$_plugins_conf_dir
-	cp -a $builddir/PLUGINS/src/streamdev/streamdev-server $subpkgdir/$_plugins_conf_dir
+	mkdir -p "$subpkgdir/$_plugins_conf_dir"
+	cp -a "$builddir"/PLUGINS/src/streamdev/streamdev-server "$subpkgdir/$_plugins_conf_dir"
 }
 
 epgsearch() {
 	_plugin_defaults conflictcheckonly epgsearch epgsearchonly quickepgsearch
-	mkdir -p $subpkgdir/$_plugins_conf_dir
-	mv $_plugins_conf_dir/epgsearch $subpkgdir/$_plugins_conf_dir
+	mkdir -p "$subpkgdir/$_plugins_conf_dir"
+	mv "$_plugins_conf_dir"/epgsearch "$subpkgdir/$_plugins_conf_dir"
 }
 
 dvbapi() {
@@ -135,16 +154,16 @@ svdrpservice() {
 
 vdrmanager() {
 	_plugin_defaults vdrmanager
-	mkdir -p $subpkgdir/$_confd_dir
-	sed '1s/^/[vdrmanager]\n/' $srcdir/vdr-plugin-vdrmanager-$_vdrmanager_ver/vdr-vdrmanager/examples/plugin.vdrmanager.conf \
-		> $subpkgdir/$_confd_dir/vdrmanager.conf
+	mkdir -p "$subpkgdir/$_confd_dir"
+	sed '1s/^/[vdrmanager]\n/' "$srcdir"/vdr-plugin-vdrmanager-$_vdrmanager_ver/vdr-vdrmanager/examples/plugin.vdrmanager.conf \
+		> "$subpkgdir/$_confd_dir"/vdrmanager.conf
 }
 
 osd2web() {
 	_plugin_defaults osd2web
-	mkdir -p $subpkgdir/$_confd_dir
-	mkdir -p $subpkgdir/$_plugins_conf_dir
-	mv $_plugins_conf_dir/osd2web $subpkgdir/$_plugins_conf_dir
+	mkdir -p "$subpkgdir/$_confd_dir"
+	mkdir -p "$subpkgdir/$_plugins_conf_dir"
+	mv "$_plugins_conf_dir"/osd2web "$subpkgdir/$_plugins_conf_dir"
 }
 
 skincurses() {
@@ -157,25 +176,29 @@ package() {
 		*) make -j1 LIBDVBCSA=1 DESTDIR="$pkgdir" install ;;
 	esac
 	install -D -m755 "$srcdir"/$pkgname.initd \
-		$pkgdir/etc/init.d/$pkgname
+		"$pkgdir"/etc/init.d/$pkgname
 	install -m644 $srcdir/00-vdr.conf \
-		$pkgdir/$_confd_dir/00-vdr.conf
-	chown -R $pkgusers:$pkggroups $pkgdir/etc/vdr \
-		$pkgdir/var/cache/vdr $pkgdir/var/lib/vdr/video
+		"$pkgdir"/$_confd_dir/00-vdr.conf
+	chown -R $pkgusers:$pkggroups "$pkgdir"/etc/vdr \
+		"$pkgdir"/var/cache/vdr "$pkgdir"/var/lib/vdr/video
 }
 
 _plugin_defaults() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 	cd "$pkgdir"
-	mkdir -p $subpkgdir/usr/lib/vdr
+	mkdir -p "$subpkgdir"/usr/lib/vdr
 	local plugin_name
 	for plugin_name in "$@"; do
-		[ -f $srcdir/$plugin_name.conf ] && \
-			install -D -m644 $srcdir/$plugin_name.conf \
-				$subpkgdir/$_confd_dir/$plugin_name.conf
-		[ -f usr/lib/vdr/libvdr-$plugin_name.so.* ] && \
-			mv usr/lib/vdr/libvdr-$plugin_name.so.* \
-				$subpkgdir/usr/lib/vdr
+		if [ -f "$srcdir"/$plugin_name.conf ]; then
+			install -D -m644 "$srcdir"/$plugin_name.conf \
+				"$subpkgdir"/$_confd_dir/$plugin_name.conf
+		fi
+		local x
+		for x in $plugin_name; do
+			if [ -e "$x" ]; then
+				mv "$x" "$subpkgdir"/usr/lib/vdr/
+			fi
+		done
 	done
 }