Merge branch 'master' into next

config/rootfiles/packages/mc

@@ -1,25 +1,20 @@
 usr/bin/mc
 usr/bin/mcdiff
 usr/bin/mcedit
-usr/bin/mcmfmt
 usr/bin/mcview
 usr/etc
 usr/etc/mc
-usr/etc/mc/Syntax
 usr/etc/mc/cedit.menu
 usr/etc/mc/edit.indent.rc
 usr/etc/mc/edit.spell.rc
 usr/etc/mc/filehighlight.ini
-usr/etc/mc/mc.charsets
 usr/etc/mc/mc.ext
 usr/etc/mc/mc.keymap
 usr/etc/mc/mc.keymap.default
 usr/etc/mc/mc.keymap.emacs
-usr/etc/mc/mc.lib
 usr/etc/mc/mc.menu
 usr/etc/mc/mc.menu.sr
 usr/etc/mc/sfs.ini
-#usr/libexec
 #usr/libexec/mc
 usr/libexec/mc/cons.saver
 #usr/libexec/mc/extfs.d
@@ -79,27 +74,24 @@ usr/libexec/mc/mc.sh
 #usr/share/man/man1/mcedit.1
 #usr/share/man/man1/mcview.1
 #usr/share/mc
-usr/share/mc/mc.hint
-#usr/share/mc/mc.hint.cs
-#usr/share/mc/mc.hint.es
-#usr/share/mc/mc.hint.hu
-#usr/share/mc/mc.hint.it
-#usr/share/mc/mc.hint.nl
-#usr/share/mc/mc.hint.pl
-#usr/share/mc/mc.hint.ru
-#usr/share/mc/mc.hint.sr
-#usr/share/mc/mc.hint.uk
-#usr/share/mc/mc.hint.zh
-usr/share/mc/mc.hlp
-usr/share/mc/skins
+#usr/share/mc/help
+usr/share/mc/help/mc.hlp
+#usr/share/mc/hints
+usr/share/mc/hints/mc.hint
+usr/share/mc/mc.charsets
+usr/share/mc/mc.lib
+#usr/share/mc/skins
+usr/share/mc/skins/dark.ini
 usr/share/mc/skins/darkfar.ini
 usr/share/mc/skins/default.ini
 usr/share/mc/skins/double-lines.ini
 usr/share/mc/skins/featured.ini
 usr/share/mc/skins/gotar.ini
+usr/share/mc/skins/mc46.ini
 usr/share/mc/skins/nicedark.ini
 #usr/share/mc/syntax
 usr/share/mc/syntax/PKGBUILD.syntax
+usr/share/mc/syntax/Syntax
 usr/share/mc/syntax/ada95.syntax
 usr/share/mc/syntax/aspx.syntax
 usr/share/mc/syntax/assembler.syntax
@@ -110,6 +102,7 @@ usr/share/mc/syntax/changelog.syntax
 usr/share/mc/syntax/cs.syntax
 usr/share/mc/syntax/css.syntax
 usr/share/mc/syntax/cxx.syntax
+usr/share/mc/syntax/cython.syntax
 usr/share/mc/syntax/d.syntax
 usr/share/mc/syntax/debian-changelog.syntax
 usr/share/mc/syntax/debian-control.syntax

config/rootfiles/packages/vdradmin

@@ -180,5 +180,6 @@ etc/rc.d/rc6.d/K01vdradmin
 etc/rc.d/rc3.d/S99vdradmin
 #usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
+var/cache/vdradmin
 var/log/vdradmin
 var/run/vdradmin

lfs/mc

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.7.3
+VER        = 4.7.5.2
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.lzma
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = "glib"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 15b017b370668683aa8cbf6730667510
+$(DL_FILE)_MD5 = 9fede28ed63ced53f1beeba2f95473da
 
 install : $(TARGET)
 

lfs/perl

@@ -88,7 +88,7 @@ ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 else
-	cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO POSIX'
+	cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO'
 	cd $(DIR_APP) && sed -i 's/^0$$//' makefile
 	cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
 	cd $(DIR_APP) && make perl utilities

lfs/vdradmin

@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "perl-gettext vdr"
 
@@ -85,5 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		 /etc/vdradmin/vdradmind.conf
 	mkdir /var/log/vdradmin
 	mkdir /var/run/vdradmin
+	mkdir /var/cache/vdradmin
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)