From decc01bc9c013146664bd670632adf9b356e2fb1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 15 Oct 2015 09:04:27 +0200
Subject: [PATCH] ncurses: update to 6.0.

No ABI bumps because we were using ABI 6 already for a long time.
---
 common/shlibs                          |  7 ++-----
 srcpkgs/ncurses/patches/no-xopen.patch | 19 -------------------
 srcpkgs/ncurses/template               | 21 +++++++++------------
 3 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/ncurses/patches/no-xopen.patch

diff --git a/common/shlibs b/common/shlibs
index 6d2a9107065..95ce9095d85 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -66,11 +66,8 @@ libppl.so.13 ppl-1.1_1
 libppl_c.so.4 ppl-0.11_1
 libstdc++.so.6 libstdc++-4.4.0_1
 libssp.so.0 libssp-4.4.0_1
-libcurses.so ncurses-libs-5.8_1
-libncurses.so.5 ncurses-libs-5.8_1
-libform.so ncurses-libs-5.8_1
-libpanel.so ncurses-libs-5.8_1
-libmenu.so ncurses-libs-5.8_1
+libncurses.so.6 ncurses-libs-6.0_1 ignore
+libncurses.so.5 ncurses-libs-6.0_1 ignore
 libncursesw.so.6 ncurses-libs-5.8_1 ignore
 libncursesw.so.5 ncurses-libs-5.8_1 ignore
 libformw.so.5 ncurses-libs-5.9_13 ignore
diff --git a/srcpkgs/ncurses/patches/no-xopen.patch b/srcpkgs/ncurses/patches/no-xopen.patch
deleted file mode 100644
index 2c4e20f1fb4..00000000000
--- a/srcpkgs/ncurses/patches/no-xopen.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/curses.h.in	2015-03-17 14:53:23.966261378 +0100
-+++ include/curses.h.in	2015-03-17 14:57:43.902100942 +0100
-@@ -149,14 +149,10 @@
-  */
- #include <stdio.h>
- 
--/*
-- * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or
-- * conflicting) when _XOPEN_SOURCE is 500 or greater.
-- */
-+/* Enable wide char without consideration of _XOPEN_SOURCE.
-+ * We only support ncursesw anyway.  */
- #undef NCURSES_WIDECHAR
--#if defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)
- #define NCURSES_WIDECHAR
--#endif
- 
- #include <stdarg.h>	/* we need va_list */
- #ifdef NCURSES_WIDECHAR
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 0dda854e07f..2fcdb4d11c5 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,13 +1,13 @@
 # Template build file for 'ncurses'.
 pkgname=ncurses
-version=5.9
-revision=14
+version=6.0
+revision=1
 short_desc="A System V Release 4.0 curses emulation library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/ncurses/"
 license="MIT"
 distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz"
-checksum=9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
+checksum=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
 
 bootstrap=yes
 
@@ -21,9 +21,6 @@ do_configure() {
 	mkdir -p ncurses-build ncursesw-build
 	cd ${wrksrc}/ncursesw-build
 
-	# Make sure .pc files are generated
-	mkdir -p /usr/lib/pkgconfig || true
-
 	# widec build
 	export CFLAGS="$CFLAGS -fPIC"
 	../configure ${configure_args} \
@@ -31,13 +28,15 @@ do_configure() {
 		--with-manpage-symlinks --with-manpage-format=normal \
 		--without-ada --enable-ext-colors \
 		--without-tests --enable-pc-files \
-		PKG_CONFIG=/usr/bin/pkg-config
+		--with-pkg-config-libdir=/usr/lib/pkgconfig \
+		ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
 
 	cd ${wrksrc}/ncurses-build
 	# non-widec build
 	../configure ${configure_args} --with-shared \
 		--without-debug --without-ada --without-tests \
-		--enable-pc-files PKG_CONFIG=/usr/bin/pkg-config
+		--enable-pc-files --with-pkg-config-libdir=/usr/lib/pkgconfig \
+		ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
 }
 
 do_build() {
@@ -83,10 +82,8 @@ do_install() {
 	# Remove broken symlink.
 	rm -f ${DESTDIR}/usr/lib/terminfo
 
-        ln -sfr ${DESTDIR}/usr/bin/ncursesw6-config \
-                ${DESTDIR}/usr/bin/ncursesw5-config
-        ln -sfr ${DESTDIR}/usr/bin/ncursesw6-config \
-                ${DESTDIR}/usr/bin/ncurses5-config
+        ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
+        ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
 }
 
 ncurses-libs_package() {