[package] base-files: fix test experession for sysupgrade

[openwrt.git] / package / ncurses / Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index a35bd80..0f8543b 100644 (file)
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -4,21 +4,17 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
-PKG_VERSION:=5.6
+PKG_VERSION:=5.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses
-PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
+PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6
 
-PKG_BUILD_DEPENDS:=ncurses/host
-
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libncurses
@@ -28,14 +24,6 @@ define Package/libncurses
   URL:=http://www.gnu.org/software/ncurses/
 endef
 
-define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR) libs
-endef
-
-define Host/Install
-       $(MAKE) -C $(HOST_BUILD_DIR) install.progs
-endef
-
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
@@ -55,13 +43,9 @@ CONFIGURE_ARGS += \
        --with-default-terminfo-dir=/usr/share/terminfo
 
 define Build/Compile
-       cp \
-               $(HOST_BUILD_DIR)/ncurses/make_keys \
-               $(HOST_BUILD_DIR)/ncurses/make_hash \
-               $(PKG_BUILD_DIR)/ncurses/
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               BUILD_CC="$(TARGET_CC)" \
+               BUILD_CC="$(HOSTCC)" \
                HOSTCC="$(HOSTCC)" \
                HOSTCCFLAGS="" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -78,7 +62,7 @@ define Package/libncurses/install
                        mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
                done \
        )
-       for file in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
+       for file in a/ansi d/dumb l/linux r/rxvt r/rxvt-unicode s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
                $(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
                $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
                        $(1)/usr/share/terminfo/$$$$file; \
@@ -101,5 +85,4 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
 endef
 
-$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libncurses))