X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fslang;h=371218b809da1ebfd23f354dcb98c6050764c88f;hb=786f2c8a296f053a6db934993a0611f1dadb8db5;hp=214ae403ed653aff445070f9b659a8fb69d086b4;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/slang b/lfs/slang
index 214ae403ed..371218b809 100644
--- a/lfs/slang
+++ b/lfs/slang
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: slang,v 1.7.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 1.4.5
+VER        = 2.0.6
 
-THISAPP    = slang-$(VER)-mini
+THISAPP    = slang-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://www.uclibc.org
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(LFS_PASS)" "install"
   TARGET     = $(DIR_INFO)/$(THISAPP)-install
@@ -52,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6c893e52347533225866242700a3cd07
+$(DL_FILE)_MD5 = efb055000636f312d5c3de56f3c70d12
 
 install : $(TARGET)
 
@@ -82,21 +76,17 @@ $(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) && sed -i 's/^#undef UTF8.*$$/#define UTF8 1/' slang.h
-	cd $(DIR_APP) && sed -i 's/^#undef UTF8.*$$/#define UTF8 1/' config.h
-
 ifeq "$(LFS_PASS)" "install"
-	-mkdir -p /install/lib
-	cd $(DIR_APP) && sed -i -e 's/libslang.a:/libslang.a:\ $$(OBJS)/' Makefile
-	cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer -Wall -fPIC" make -e libslang.a
-	cd $(DIR_APP) && install -m 0644 libslang.a /install/lib
-	-mkdir -p /install/include/slang
-	cd $(DIR_APP) && install -m 0644 slang.h slcurses.h /install/include/slang
+	cd $(DIR_APP) && ./configure --prefix=""
+	cd $(DIR_APP)/src && patch < $(DIR_SRC)/src/patches/slang-$(VER)-uclibc.patch
+	cd $(DIR_APP)/src && make $(MAKETUNING)
+	cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
 else
-	cd $(DIR_APP) && DESTDIR=/usr/lib CFLAGS="-Wall -fPIC $(CFLAGS)" make -e
-	cd $(DIR_APP) && install -m 0644 libslang.a /usr/lib
-	-mkdir -p /usr/include/slang
-	cd $(DIR_APP) && install -m 0644 slang.h slcurses.h /usr/include/slang
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make elf $(MAKETUNING)
+	cd $(DIR_APP) && make install-elf
+	cd $(DIR_APP) && chmod -v 755 /usr/lib/libslang.so.2.0.6
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)