Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / lfs / mldonkey

diff --git a/lfs/mldonkey b/lfs/mldonkey
index bef1215ea8128d359bc6c424efe1efff9064f524..62375841a47d0f4d22e66054eeb297f756ab020a 100644 (file)
--- a/lfs/mldonkey
+++ b/lfs/mldonkey
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.2
+VER        = 2.9.6
 
 THISAPP    = mldonkey-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mldonkey
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 457564a0baedabe262254de660420c1c
+$(DL_FILE)_MD5 = 5da87678449bf87ce0c78f37e7871eb9
 
 install : $(TARGET)
 
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/opt/mldonkey --enable-pthread-lib \
                                --disable-gnutella --disable-gnutella2 --disable-fasttrack
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make #$(MAKETUNING) $(EXTRA_MAKE)
        -mkdir -p /opt/mldonkey
        -mkdir -p /opt/mldonkey/.mldonkey
        cd $(DIR_APP) && cp -f mlnet /opt/mldonkey
@@ -89,5 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -p /var/log/mldonkey/{incoming,temp}
        -mkdir -p /var/log/mldonkey/incoming/{directories,files}
        chown -Rv mldonkey.mldonkey /var/log/mldonkey/{incoming,temp}
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/mldonkey \
+                        /var/ipfire/backup/addons/includes/mldonkey
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)