X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/78202d191b1e0332bd03740e83a3e8c07819810d..3ed308ebba9166e3238b4a96c68d89a662342800:/package/ncurses/Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index a27334b3e..0f8543bc7 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -4,17 +4,16 @@
 # 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
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,99 +24,28 @@ define Package/libncurses
   URL:=http://www.gnu.org/software/ncurses/
 endef
 
-define Build/Configure
-endef
-
 TARGET_CFLAGS += $(FPIC)
 
+CONFIGURE_ARGS += \
+	--enable-echo \
+	--enable-const \
+	--enable-overwrite \
+	--disable-rpath \
+	--without-ada \
+	--without-cxx \
+	--without-cxx-binding \
+	--without-debug \
+	--without-profile \
+	--without-progs \
+	--with-normal \
+	--with-shared \
+	--with-terminfo-dirs=/usr/share/terminfo \
+	--with-default-terminfo-dir=/usr/share/terminfo
+
 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) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-echo \
-			--enable-const \
-			--enable-overwrite \
-			--disable-rpath \
-			--without-ada \
-			--without-cxx \
-			--without-cxx-binding \
-			--without-debug \
-			--without-profile \
-			--with-progs \
-			--with-normal \
-			--without-shared \
-			--with-terminfo-dirs=/usr/share/terminfo \
-			--with-default-terminfo-dir=/usr/share/terminfo \
-	);
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		libs install.progs
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-echo \
-			--enable-const \
-			--enable-overwrite \
-			--disable-rpath \
-			--without-ada \
-			--without-cxx \
-			--without-cxx-binding \
-			--without-debug \
-			--without-profile \
-			--without-progs \
-			--with-normal \
-			--with-shared \
-			--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)" \
+		BUILD_CC="$(HOSTCC)" \
 		HOSTCC="$(HOSTCC)" \
 		HOSTCCFLAGS="" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -134,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; \