Habe IPFire auf LFS 6.2 gebracht.

[people/teissler/ipfire-2.x.git] / lfs / ncurses

diff --git a/lfs/ncurses b/lfs/ncurses
index e5ccea68126ca16085c2e4cf25bd7fd6c9d7089b..ea14faef8245f4dbe9313ea9deed53e8ccb8e16c 100644 (file)
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -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: ncurses,v 1.3.2.5 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 5.4
+VER        = 5.5
 
 THISAPP    = ncurses-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/ncurses
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
@@ -44,7 +38,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --with-shared \
-    --without-debug --disable-nls
+       --without-debug --enable-widec --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
@@ -64,7 +58,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 069c8880072060373290a4fefff43520
+$(DL_FILE)_MD5 = e73c1ac10b4bfc46db43b2ddfd6244ef
 
 install : $(TARGET)
 
@@ -94,15 +88,25 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ncurses-5.5-fixes-1.patch
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(EXTRA_MAKE)
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
-       chmod 755 /usr/lib/*.$(VER)
-       chmod 644 /usr/lib/libncurses++.a
-       mv /usr/lib/libncurses.so.5* /lib
-       ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
-       ln -sf libncurses.so /usr/lib/libcurses.so
+       chmod -v 755 /usr/lib/*.5.5
+       chmod -v 644 /usr/lib/libncurses++w.a
+       mv -v /usr/lib/libncursesw.so.5* /lib
+       ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
+       cd $(DIR_APP) && for lib in curses ncurses form panel menu ; do \
+           rm -vf /usr/lib/lib${lib}.so ; \
+           echo "INPUT(-l${lib}w)" >/usr/lib/lib${lib}.so ; \
+           ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
+       done
+       ln -sfv libncurses++w.a /usr/lib/libncurses++.a4
+       echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so &&
+       ln -sfv libncurses.so /usr/lib/libcurses.so &&
+       ln -sfv libncursesw.a /usr/lib/libcursesw.a &&
+       ln -sfv libncurses.a /usr/lib/libcurses.a
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)