From 4881da11df564c8c989ade4e223b31ee8a993776 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 3 Jan 2014 17:55:30 +0100
Subject: another bunch of musl fixes, and some libtinfo fixes

---
 package/nano/Makefile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'package/nano/Makefile')

diff --git a/package/nano/Makefile b/package/nano/Makefile
index 42bb647df..b351ab73e 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nano
-PKG_VERSION:=		2.2.4
+PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6304308afb1f7ef4a5e93eb99206632a
+PKG_MD5SUM:=		03233ae480689a008eb98feb1b599807
 PKG_DESCR:=		An enhanced clone of the Pico editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
@@ -14,30 +14,24 @@ PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.nano-editor.org/
 PKG_SITES:=		http://www.nano-editor.org/dist/v2.2/
 
-PKG_FLAVOURS_NANO:=	TINY
-PKGFD_TINY:=		tiny nano
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_cv_header_regex_h=no
 CONFIGURE_ARGS+=	--enable-nanorc \
-			--disable-glibtest \
+			--enable-tiny \
 			--disable-utf8 \
+			--disable-glibtest \
 			--disable-color \
-			--without-slang
-ifeq (${ADK_PACKAGE_NANO_TINY},y)
-CONFIGURE_ARGS+=	--enable-tiny
-else
-CONFIGURE_ARGS+=	--disable-browser \
+			--without-slang \
+			--disable-browser \
 			--disable-help \
 			--disable-mouse \
-			--disable-nls \
 			--disable-speller \
 			--disable-operatingdir \
 			--enable-multibuffer
-endif
+TARGET_LDFLAGS+=	-ltinfo
 
 nano-install:
 	${INSTALL_DIR} ${IDIR_NANO}/usr/bin
-- 
cgit v1.2.3