X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fncurses;h=3c7be4d0e85b3637949aec567eaf0273d7df2dde;hb=af0c24aac260632be703e0eb91d0c882e27ecc7a;hp=e5ccea68126ca16085c2e4cf25bd7fd6c9d7089b;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/ncurses b/lfs/ncurses
index e5ccea6812..3c7be4d0e8 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -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: ncurses,v 1.3.2.5 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,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 +36,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 +56,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 069c8880072060373290a4fefff43520
+$(DL_FILE)_MD5 = e73c1ac10b4bfc46db43b2ddfd6244ef
 
 install : $(TARGET)
 
@@ -94,15 +86,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 $(EXTRA_MAKE)  #$(MAKETUNING) # Causes an error!
 	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)