Merge remote-tracking branch 'origin/next' into thirteen

[ipfire-2.x.git] / lfs / vdradmin

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 00e00f46a289184ebd2bd3852dac733151470b24..3bd788f0e2a2a4b31e597e03f286383d0ea3d91a 100644 (file)
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 3.6.4
+VER        = 3.6.7
 
 THISAPP    = vdradmin-am-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
-PAK_VER    = 1
+PAK_VER    = 4
 
-DEPS       = perl-gettext vdr
+DEPS       = "perl-gettext vdr"
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ae3efed3f803d8524098f15a365c7838
+$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1
 
 install : $(TARGET)
 
@@ -78,7 +78,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_SRC) && mv -vf vdradmin-am-$(VER) vdradmin && mv -vf vdradmin /opt
-       cp src/initscripts/init.d/vdradmin /etc/init.d
+       export "LANG=de_DE"
+       cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
+       cd $(DIR_APP) && ./install-ipfire.sh
+       install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
+                /etc/vdradmin/vdradmind.conf
+       mkdir /var/log/vdradmin
+       mkdir /var/run/vdradmin
+       mkdir /var/cache/vdradmin
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)