X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fncurses%2FMakefile;h=d9fc45a718546bd365d957ade03f600599fcd5c9;hp=28b1e4e692a1aa7e9c4061eda852adfcb234b180;hb=00d72e57c46fdb15321d5df112d095f4c169ca28;hpb=2a71159af7dd8c2da9cea993e869465d4eb3e2f0

diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile
index 28b1e4e692..d9fc45a718 100644
--- a/libs/ncurses/Makefile
+++ b/libs/ncurses/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
-PKG_VERSION:=5.2
-PKG_RELEASE:=8
+PKG_VERSION:=5.6
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses
-PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47
+PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -36,7 +36,9 @@ endef
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
+	-$(MAKE) -C $(PKG_BUILD_DIR) distclean
 	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+		CONFIG_SITE="" \
 		./configure \
 			--target=$(GNU_HOST_NAME) \
 			--host=$(GNU_HOST_NAME) \
@@ -80,7 +82,6 @@ define Build/Compile
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		ac_cv_linux_vers="2" \
 		./configure \
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
@@ -116,6 +117,7 @@ define Build/Compile
 			--with-terminfo-dirs=/usr/share/terminfo \
 			--with-default-terminfo-dir=/usr/share/terminfo \
 	);
+	rm -f $(PKG_BUILD_DIR)/lib/lib*
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		BUILD_CC="$(TARGET_CC)" \
@@ -126,11 +128,17 @@ define Build/Compile
 endef
 
 define Package/libncurses/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(1)/usr/lib/
-	install -d -m0755 $(1)/usr/share/terminfo
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}*.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/share/terminfo
+	(cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
+		for dir in ??; do \
+			[ -d "$$$$dir" ] || continue; \
+			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 \
-		install -d -m0755 $(1)/usr/share/terminfo/`dirname $$$$file`; \
+		$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
 		$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
 			$(1)/usr/share/terminfo/$$$$file; \
 	done
@@ -140,6 +148,7 @@ define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(STAGING_DIR)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/
@@ -155,12 +164,15 @@ define Build/UninstallDev
 	rm -rf \
 		$(STAGING_DIR)/usr/include/curses.h \
 		$(STAGING_DIR)/usr/include/ncurses.h \
+		$(STAGING_DIR)/usr/include/ncurses_dll.h \
 		$(STAGING_DIR)/usr/include/menu.h \
 		$(STAGING_DIR)/usr/include/panel.h \
 		$(STAGING_DIR)/usr/include/term{,cap}.h \
 		$(STAGING_DIR)/usr/include/unctrl.h \
+		$(STAGING_DIR)/usr/include/form.h \
+		$(STAGING_DIR)/usr/include/eti.h \
 		$(STAGING_DIR)/usr/lib/libcurses.so \
-		$(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*}
+		$(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*}
 endef
 
 $(eval $(call BuildPackage,libncurses))