X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fslang;h=d6e68585554a2a22bcefd115719d71ddcdf64abe;hp=efe67b22d890e4ed9363628e480f8d35effd5350;hb=39d43c5b99720c31e4423e3668ea77679954c184;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/slang b/lfs/slang
index efe67b22d8..d6e6858555 100644
--- a/lfs/slang
+++ b/lfs/slang
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,13 @@
 
 include Config
 
-VER        = 1.4.9
+VER        = 2.3.0
 
 THISAPP    = slang-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4fbb1a7f1257e065ca830deefe13d350
+$(DL_FILE)_MD5 = 80f4e64189b6f28fd420b829b44a6723
 
 install : $(TARGET)
 
@@ -73,25 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-debian-utf8.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-utf8-acs.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.5-utf8-segv.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-utf8-fix.patch
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.9-uclibc.patch
-	cd $(DIR_APP) && ./configure --prefix=""
-	cd $(DIR_APP)/src && make
-	cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
-	ln -sf libslang-utf8.a /opt/$(MACHINE)-uClibc/lib/libslang.a
-else
-	perl -p -i -e 's/(ELF_CFLAGS=\"[^\"]*)-O2([^\"]*\".*)/$1'"$(CFLAGS)"' $2/gs' configure
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make elf all
-	cd $(DIR_APP) && make install-elf
-	ln -sf libslang-utf8.so.1.4.9 /usr/lib/libslang-utf8.so.1
-	ln -sf libslang-utf8.so /usr/lib/libslang.so
-	ln -sf libslang-utf8.a /usr/lib/libslang.a
-endif
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+	cd $(DIR_APP) && make #$(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)