X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fslang;h=e6c8cc88d3d2f90d746240c120067f8ebdb65f60;hp=214ae403ed653aff445070f9b659a8fb69d086b4;hb=3ebf8d1b011d7b4346306e150b2cda21c28ceea5;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/slang b/lfs/slang
index 214ae403e..e6c8cc88d 100644
--- a/lfs/slang
+++ b/lfs/slang
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# 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 $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,17 +24,13 @@
 
 include Config
 
-VER        = 1.4.5
+VER        = 1.4.9
 
-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
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -52,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6c893e52347533225866242700a3cd07
+$(DL_FILE)_MD5 = 4fbb1a7f1257e065ca830deefe13d350
 
 install : $(TARGET)
 
@@ -82,21 +70,16 @@ $(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
-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
-endif
+	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
+	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
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)