X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fncurses%2FMakefile;fp=package%2Fncurses%2FMakefile;h=6b2f7b63001fbe966168e6e07a39d3b2ca18faad;hb=a359ac175af9bce66746f39d58548bf54fa40f96;hp=8043588508db6faef334d1cf1b1600bfb3f9176a;hpb=eb4eae8a884b4da4813fac0b8d733139d727f2c6;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 8043588508..6b2f7b6300 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=5.7
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -26,6 +26,15 @@ define Package/libncurses
   CATEGORY:=Libraries
   TITLE:=Terminal handling library
   URL:=http://www.gnu.org/software/ncurses/
+  DEPENDS:= +terminfo
+  VARIANT:=libncurses
+endef
+
+define Package/terminfo
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Terminal Info Database (ncurses)
+  URL:=http://www.gnu.org/software/ncurses/
   VARIANT:=libncurses
 endef
 
@@ -82,9 +91,8 @@ define Build/Install/Default
 		$(1) install.libs install.data;
 endef
 
-define Package/libncurses/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
+define Package/terminfo/install
+	echo ""
 ifneq ($(HOST_OS),FreeBSD)
 	$(INSTALL_DIR) $(1)/usr/share/terminfo
 	(cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
@@ -101,6 +109,11 @@ ifneq ($(HOST_OS),FreeBSD)
 endif
 endef
 
+define Package/libncurses/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
+endef
+
 define Package/libncursesw/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/
@@ -124,5 +137,6 @@ define Build/InstallDev
 endef
 endif
 
+$(eval $(call BuildPackage,terminfo))
 $(eval $(call BuildPackage,libncurses))
 $(eval $(call BuildPackage,libncursesw))