From a7d53b0004f9b23147acb47c15f961eedf5e4efd Mon Sep 17 00:00:00 2001
From: cvh <namerp@googlemail.com>
Date: Fri, 18 Aug 2017 19:25:45 +0200
Subject: [PATCH] readline: update to 7.0 and change to ncurses

---
 packages/devel/readline/package.mk            | 11 +++---
 .../patches/readline-6.2-shlib_libs.patch.bk  | 36 -------------------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 packages/devel/readline/patches/readline-6.2-shlib_libs.patch.bk

diff --git a/packages/devel/readline/package.mk b/packages/devel/readline/package.mk
index add03d0152..7130550ea8 100644
--- a/packages/devel/readline/package.mk
+++ b/packages/devel/readline/package.mk
@@ -17,25 +17,22 @@
 ################################################################################
 
 PKG_NAME="readline"
-PKG_VERSION="6.3"
-PKG_SHA256="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43"
+PKG_VERSION="7.0"
+PKG_SHA256="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/readline/"
 PKG_URL="http://ftpmirror.gnu.org/readline/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain netbsd-curses"
+PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_SECTION="devel"
 PKG_SHORTDESC="readline: The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
 PKG_LONGDESC="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
-PKG_IS_ADDON="no"
-
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="bash_cv_wcwidth_broken=no \
                            --disable-shared \
                            --enable-static \
-                           --with-curses \
-                           --without-purify"
+                           --with-curses"
 
 pre_configure_target() {
   CFLAGS="$CFLAGS -fPIC"
diff --git a/packages/devel/readline/patches/readline-6.2-shlib_libs.patch.bk b/packages/devel/readline/patches/readline-6.2-shlib_libs.patch.bk
deleted file mode 100644
index 6bc7cc2330..0000000000
--- a/packages/devel/readline/patches/readline-6.2-shlib_libs.patch.bk
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur readline-6.2-old/configure readline-6.2-new/configure
---- a/configure	2010-11-14 14:48:06.000000000 -0800
-+++ b/configure	2012-05-02 19:38:49.000000000 -0700
-@@ -10450,10 +10450,10 @@
- $as_echo_n "checking configuration for building shared libraries... " >&6; }
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 
- 
- 
-diff -Naur readline-6.2-old/configure.in readline-6.2-new/configure.in
---- a/configure.in	2010-11-14 14:41:48.000000000 -0800
-+++ b/configure.in	2012-05-02 19:38:41.000000000 -0700
-@@ -214,10 +214,10 @@
-         AC_MSG_CHECKING(configuration for building shared libraries)
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 	
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)