From ac42995e79002b00ae3c119a4d06e8b77108c620 Mon Sep 17 00:00:00 2001
From: Joerg Bornkessel <hd_brummy@gentoo.org>
Date: Wed, 11 Feb 2015 15:49:50 +0100
Subject: cleanup; add handling new command line --chartab

---
 ChangeLog                                        |  5 +++++
 usr/share/vdr/rcscript/post-start-50-svdrp.sh    |  8 ++------
 usr/share/vdr/rcscript/pre-start-30-parameter.sh | 11 +++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a9115f..bedbda8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo-vdr-scripts
 # $Id$
 
+  11 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  usr/share/vdr/rcscript/pre-start-30-parameter.sh,
+  usr/share/vdr/rcscript/post-start-50-svdrp.sh:
+  cleanup; adde handling new command line --chartab
+
 *gentoo-vdr-scripts-2.6 (06 Feb 2015)
 
   05 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +README.x11-setup,
diff --git a/usr/share/vdr/rcscript/post-start-50-svdrp.sh b/usr/share/vdr/rcscript/post-start-50-svdrp.sh
index c21588e..d6038f2 100644
--- a/usr/share/vdr/rcscript/post-start-50-svdrp.sh
+++ b/usr/share/vdr/rcscript/post-start-50-svdrp.sh
@@ -9,12 +9,8 @@ addon_main() {
 	# we already know vdr failed
 	[ "${vdr_start_failed}" = "1" ] && return 0
 
-#	if [ "${VDRVERSNUM}" -ge "10715" ]; then
-		SVDRP_PORT="${SVDRP_PORT:-6419}"
-		logger -t vdr "New default svdrp port 6419!"
-#	else
-#		SVDRP_PORT="${SVDRP_PORT:-2001}"
-#	fi
+	SVDRP_PORT="${SVDRP_PORT:-6419}"
+	logger -t vdr "New default svdrp port 6419!"
 
 	SVDRP_HOSTNAME="${SVDRP_HOSTNAME:-localhost}"
 	[ "${SVDRP_PORT}" = "0" ] && return 0
diff --git a/usr/share/vdr/rcscript/pre-start-30-parameter.sh b/usr/share/vdr/rcscript/pre-start-30-parameter.sh
index 0444635..5cbb5c9 100644
--- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh
+++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh
@@ -1,10 +1,17 @@
 # $Id$
+include rc-functions
+
 addon_main() {
 	# parameters of start-stop-daemon
 	[ -n "${VDR_NICENESS}" ] && add_daemonctrl_param --nicelevel "${VDR_NICENESS}"
 
-	# Set environment
-	[ -n "${VDR_CHARSET_OVERRIDE}" ] && export VDR_CHARSET_OVERRIDE
+	if [ "${VDRVERSNUM}" -ge "20110" ]; then
+		# Set command line option
+		[ -n "${VDR_CHARSET_OVERRIDE}" ] && add_param "--chartab=${VDR_CHARSET_OVERRIDE}"
+	else
+		# Set environment
+		[ -n "${VDR_CHARSET_OVERRIDE}" ] && export VDR_CHARSET_OVERRIDE
+	fi
 
 	# parameters of vdr
 	add_param "--watchdog=${INTERNAL_WATCHDOG:-60}"
-- 
cgit v1.2.3-65-gdbad