X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e8a4e0d67c875d45d4afd9b22a884d1ebd32d410..dfba2f5fb19c96511b4f389a65492be66b908f07:/package/ncurses/Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 8fac06eca..69a204136 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
 
@@ -51,11 +60,18 @@ CONFIGURE_ARGS += \
 	--without-debug \
 	--without-profile \
 	--without-progs \
+	--disable-big-core \
+	--disable-home-terminfo \
 	--with-normal \
 	--with-shared \
 	--with-terminfo-dirs=/usr/share/terminfo \
 	--with-default-terminfo-dir=/usr/share/terminfo
 
+ifeq ($(HOST_OS),FreeBSD)
+	CONFIGURE_ARGS +=
+		--with-terminfo=/usr/share/terminfo.db 
+endif
+
 ifeq ($(BUILD_VARIANT),libncursesw)
 	CONFIGURE_ARGS += \
 		--enable-widec \
@@ -75,9 +91,9 @@ 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; \
 		for dir in ??; do \
@@ -90,6 +106,12 @@ define Package/libncurses/install
 		$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
 			$(1)/usr/share/terminfo/$$$$file; \
 	done
+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
@@ -104,6 +126,12 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/
+	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+	$(2)/bin/ncursesw5-config
+	ln -sf $(STAGING_DIR)/host/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config
 endef
 else
 define Build/InstallDev
@@ -112,8 +140,15 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncurses5-config $(2)/bin/
+	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+		$(2)/bin/ncurses5-config
+	ln -sf $(STAGING_DIR)/host/bin/ncurses5-config $(1)/usr/bin/ncurses5-config
 endef
 endif
 
+$(eval $(call BuildPackage,terminfo))
 $(eval $(call BuildPackage,libncurses))
 $(eval $(call BuildPackage,libncursesw))